save

Author: AskAlexSharov

db/recsplit/multiencseq/sequence_builder.go

@@ -31,6 +31,8 @@ const SIMPLE_SEQUENCE_MAX_THRESHOLD = 16
 type SequenceBuilder struct {
 	baseNum uint64
 	ef      *eliasfano32.EliasFano
+	it1     SequenceIterator
+	it2     SequenceIterator
 }
 
 // Creates a new builder. The builder is not meant to be reused. The construction
@@ -109,19 +111,19 @@ func (b *SequenceBuilder) simpleEncoding(buf []byte) []byte {
 // Merge merges s1 and s2 into this builder, resetting it first.
 // s1 and s2 must be pre-sorted with s1.Max() <= s2.Min().
 // Call AppendBytes on the builder to serialize.
-func (b *SequenceBuilder) Merge(s1, s2 *SequenceReader, outBaseNum uint64, it1, it2 *SequenceIterator) error {
+func (b *SequenceBuilder) Merge(s1, s2 *SequenceReader, outBaseNum uint64) error {
 	b.Reset(outBaseNum, s1.Count()+s2.Count(), s2.Max())
-	it1.Reset(s1, 0)
-	it2.Reset(s2, 0)
-	for it1.HasNext() {
-		v, err := it1.Next()
+	b.it1.Reset(s1, 0)
+	b.it2.Reset(s2, 0)
+	for b.it1.HasNext() {
+		v, err := b.it1.Next()
 		if err != nil {
 			return err
 		}
 		b.AddOffset(v)
 	}
-	for it2.HasNext() {
-		v, err := it2.Next()
+	for b.it2.HasNext() {
+		v, err := b.it2.Next()
 		if err != nil {
 			return err
 		}

db/state/merge.go

@@ -645,7 +645,7 @@ func (iit *InvertedIndexRoTx) mergeFiles(ctx context.Context, files []*FilesItem
 	var keyBuf, valBuf []byte
 	var lastKey, lastVal []byte
 	preSeq, mergeSeq := &multiencseq.SequenceReader{}, &multiencseq.SequenceReader{}
-	preIt, mergeIt := &multiencseq.SequenceIterator{}, &multiencseq.SequenceIterator{}
+	preIt := &multiencseq.SequenceIterator{}
 	builder := &multiencseq.SequenceBuilder{}
 	for cp.Len() > 0 {
 		lastKey = append(lastKey[:0], cp[0].key...)
@@ -672,7 +672,7 @@ func (iit *InvertedIndexRoTx) mergeFiles(ctx context.Context, files []*FilesItem
 			if mergedOnce {
 				mergeSeq.Reset(ci1.startTxNum, ci1.val)
 				preSeq.Reset(startTxNum, lastVal)
-				if mergeErr := builder.Merge(mergeSeq, preSeq, startTxNum, mergeIt, preIt); mergeErr != nil {
+				if mergeErr := builder.Merge(mergeSeq, preSeq, startTxNum); mergeErr != nil {
 					return nil, fmt.Errorf("merge %s inverted index: %w", iit.ii.FilenameBase, mergeErr)
 				}
 				lastVal = builder.AppendBytes(lastVal[:0])

db/state/merge_test.go

@@ -748,11 +748,10 @@ func Test_mergeEliasFano(t *testing.T) {
 	}
 
 	var seq1, seq2 multiencseq.SequenceReader
-	var it1, it2 multiencseq.SequenceIterator
 	seq1.Reset(0, firstBytes)
 	seq2.Reset(0, secondBytes)
 	var mergedSeq multiencseq.SequenceBuilder
-	err := mergedSeq.Merge(&seq1, &seq2, 0, &it1, &it2)
+	err := mergedSeq.Merge(&seq1, &seq2, 0)
 	require.NoError(t, err)
 	menc := mergedSeq.AppendBytes(nil)