internal/manifest: remove base.Compare from B-Tree

The base.Compare is now passed in the only only site that requires it.

Author: jbowens

internal/manifest/annotator.go

@@ -280,14 +280,16 @@ func (a *Annotator[T]) MultiLevelAnnotation(lms []LevelMetadata) *T {
 // [lowerBound, upperBound). A pointer to the Annotator is used as the key for
 // pre-calculated values, so the same Annotator must be used to avoid duplicate
 // computation.
-func (a *Annotator[T]) LevelRangeAnnotation(lm LevelMetadata, bounds base.UserKeyBounds) *T {
+func (a *Annotator[T]) LevelRangeAnnotation(
+	cmp base.Compare, lm LevelMetadata, bounds base.UserKeyBounds,
+) *T {
 	if lm.Empty() {
 		return a.Aggregator.Zero(nil)
 	}
 
 	var dst *T
 	dst = a.Aggregator.Zero(dst)
-	dst = a.accumulateRangeAnnotation(lm.tree.root, lm.tree.cmp, bounds, false, false, dst)
+	dst = a.accumulateRangeAnnotation(lm.tree.root, cmp, bounds, false, false, dst)
 	return dst
 }
 

internal/manifest/annotator_test.go

@@ -88,7 +88,7 @@ func randomBounds(rng *rand.Rand, count int) base.UserKeyBounds {
 
 func requireMatchOverlaps(t *testing.T, v *Version, bounds base.UserKeyBounds) {
 	overlaps := v.Overlaps(6, bounds)
-	numFiles := *NumFilesAnnotator.LevelRangeAnnotation(v.Levels[6], bounds)
+	numFiles := *NumFilesAnnotator.LevelRangeAnnotation(v.cmp.Compare, v.Levels[6], bounds)
 	require.EqualValues(t, overlaps.length, numFiles)
 }
 
@@ -150,7 +150,7 @@ func BenchmarkNumFilesRangeAnnotation(b *testing.B) {
 			toDelete := rng.IntN(count)
 			v.Levels[6].tree.Delete(files[toDelete], ignoreObsoleteFiles{})
 
-			NumFilesAnnotator.LevelRangeAnnotation(v.Levels[6], b)
+			NumFilesAnnotator.LevelRangeAnnotation(v.cmp.Compare, v.Levels[6], b)
 
 			v.Levels[6].tree.Insert(files[toDelete])
 		}

internal/manifest/btree.go

@@ -14,7 +14,6 @@ import (
 	"unsafe"
 
 	"github.com/cockroachdb/errors"
-	"github.com/cockroachdb/pebble/internal/base"
 	"github.com/cockroachdb/pebble/internal/invariants"
 )
 
@@ -690,7 +689,6 @@ func (n *node[M]) verifyInvariants() {
 // goroutines, but Read operations are.
 type btree[M fileMetadata] struct {
 	root *node[M]
-	cmp  base.Compare
 	bcmp btreeCmp[M]
 }
 

internal/manifest/l0_sublevels.go

@@ -321,7 +321,7 @@ func newL0Sublevels(
 	// Construct a parallel slice of sublevel B-Trees.
 	// TODO(jackson): Consolidate and only use the B-Trees.
 	for _, sublevelFiles := range s.levelFiles {
-		ls := makeLevelSlice(cmp, btreeCmpSmallestKey(cmp), sublevelFiles)
+		ls := makeLevelSlice(btreeCmpSmallestKey(cmp), sublevelFiles)
 		s.Levels = append(s.Levels, ls)
 	}
 
@@ -635,7 +635,7 @@ func (s *l0Sublevels) addL0Files(
 	// Construct a parallel slice of sublevel B-Trees.
 	// TODO(jackson): Consolidate and only use the B-Trees.
 	for _, sublevel := range updatedSublevels {
-		ls := makeLevelSlice(newVal.cmp, btreeCmpSmallestKey(newVal.cmp), newVal.levelFiles[sublevel])
+		ls := makeLevelSlice(btreeCmpSmallestKey(newVal.cmp), newVal.levelFiles[sublevel])
 		if sublevel == len(newVal.Levels) {
 			newVal.Levels = append(newVal.Levels, ls)
 		} else {

internal/manifest/level_metadata.go

@@ -52,7 +52,7 @@ func MakeLevelMetadata(cmp Compare, level int, files []*TableMetadata) LevelMeta
 	}
 	var lm LevelMetadata
 	lm.level = level
-	lm.tree = makeBTree(cmp, bcmp, files)
+	lm.tree = makeBTree(bcmp, files)
 	for _, f := range files {
 		lm.totalTableSize += f.Size
 		lm.totalRefSize += f.EstimatedReferenceSize()
@@ -64,10 +64,8 @@ func MakeLevelMetadata(cmp Compare, level int, files []*TableMetadata) LevelMeta
 	return lm
 }
 
-func makeBTree(
-	cmp base.Compare, bcmp btreeCmp[*TableMetadata], files []*TableMetadata,
-) btree[*TableMetadata] {
-	t := btree[*TableMetadata]{cmp: cmp, bcmp: bcmp}
+func makeBTree(bcmp btreeCmp[*TableMetadata], files []*TableMetadata) btree[*TableMetadata] {
+	t := btree[*TableMetadata]{bcmp: bcmp}
 	for _, f := range files {
 		if err := t.Insert(f); err != nil {
 			panic(err)
@@ -76,10 +74,8 @@ func makeBTree(
 	return t
 }
 
-func makeLevelSlice(
-	cmp base.Compare, bcmp btreeCmp[*TableMetadata], files []*TableMetadata,
-) LevelSlice {
-	t := makeBTree(cmp, bcmp, files)
+func makeLevelSlice(bcmp btreeCmp[*TableMetadata], files []*TableMetadata) LevelSlice {
+	t := makeBTree(bcmp, files)
 	slice := newLevelSlice(tableMetadataIter(&t))
 	slice.verifyInvariants()
 	// We can release the tree because the nodes that are referenced by the
@@ -190,23 +186,23 @@ func (lf LevelFile) Slice() LevelSlice {
 // TODO(jackson): Can we improve this interface or avoid needing to export
 // a slice constructor like this?
 func NewLevelSliceSeqSorted(files []*TableMetadata) LevelSlice {
-	return makeLevelSlice(nil, btreeCmpSeqNum, files)
+	return makeLevelSlice(btreeCmpSeqNum, files)
 }
 
 // NewLevelSliceKeySorted constructs a LevelSlice over the provided files,
 // sorted by the files smallest keys.
 // TODO(jackson): Can we improve this interface or avoid needing to export
 // a slice constructor like this?
 func NewLevelSliceKeySorted(cmp base.Compare, files []*TableMetadata) LevelSlice {
-	return makeLevelSlice(cmp, btreeCmpSmallestKey(cmp), files)
+	return makeLevelSlice(btreeCmpSmallestKey(cmp), files)
 }
 
 // NewLevelSliceSpecificOrder constructs a LevelSlice over the provided files,
 // ordering the files by their order in the provided slice. It's used in
 // tests.
 // TODO(jackson): Update tests to avoid requiring this and remove it.
 func NewLevelSliceSpecificOrder(files []*TableMetadata) LevelSlice {
-	slice := makeLevelSlice(nil, btreeCmpSpecificOrder(files), files)
+	slice := makeLevelSlice(btreeCmpSpecificOrder(files), files)
 	slice.verifyInvariants()
 	return slice
 }

internal/manifest/version.go

@@ -1334,7 +1334,7 @@ func NewVersionForTesting(
 		// order to test consistency checking, etc. Once we've constructed the
 		// initial B-Tree, we swap out the btreeCmp for the correct one.
 		// TODO(jackson): Adjust or remove the tests and remove this.
-		v.Levels[l].tree = makeBTree(comparer.Compare, btreeCmpSpecificOrder(files[l]), files[l])
+		v.Levels[l].tree = makeBTree(btreeCmpSpecificOrder(files[l]), files[l])
 		v.Levels[l].level = l
 		if l == 0 {
 			v.Levels[l].tree.bcmp = btreeCmpSeqNum