MB-69881: Improved APIs and perf optimizations for vector search (#2270)

CascadingRadium · abhinavdangeti · CascadingRadium · commit 96e7fbd3ad69 · 2026-01-20T13:44:56.000+05:30
- Use a `bitset` to track eligible documents instead of a slice of `N
uint64s`, reducing memory usage from `8N bytes` to `N/8 bytes` per
segment (up to `64×` reduction) and improving cache locality.
- Pass an iterator over eligible documents that iterates the bitset
directly, allowing direct translation into a bitset of eligible vector
IDs in the storage layer and eliminating the need for a separate slice
intermediary.
- Fix garbage creation in the `UnadornedPostingsIterator`, which
previously allocated a temporary struct per Next() call to wrap a doc
number and satisfy the `Postings` interface; the iterator now returns a
single reusable struct (one-time allocation) consistent with the working
of the `PostingsIterator` in the storage-layer.
- Avoid unnecessary `BytesRead` statistics computation when executing
searches in no-scoring mode, removing redundant work as a
micro-optimization.

---------

Co-authored-by: Abhinav Dangeti &lt;abhinav@couchbase.com&gt;
diff --git a/analysis/analyzer/custom/custom.go b/analysis/analyzer/custom/custom.go
@@ -140,7 +140,7 @@ func convertInterfaceSliceToStringSlice(interfaceSlice []interface{}, objType st
 		if ok {
 			stringSlice[i] = stringObj
 		} else {
-			return nil, fmt.Errorf(objType + " name must be a string")
+			return nil, fmt.Errorf("%s name must be a string", objType)
 		}
 	}
 
diff --git a/analysis/datetime/iso/iso.go b/analysis/datetime/iso/iso.go
@@ -118,7 +118,7 @@ func letterCounter(layout string, idx int) int {
 }
 
 func invalidFormatError(character byte, count int) error {
-	return fmt.Errorf("invalid format string, unknown format specifier: " + strings.Repeat(string(character), count))
+	return fmt.Errorf("invalid format string, unknown format specifier: %s", strings.Repeat(string(character), count))
 }
 
 func parseISOString(layout string) (string, error) {
@@ -146,7 +146,7 @@ func parseISOString(layout string) (string, error) {
 			// second text literal delimiter
 			if idx == len(layout) {
 				// text literal delimiter not found error
-				return "", fmt.Errorf("invalid format string, expected text literal delimiter: " + string(textLiteralDelimiter))
+				return "", fmt.Errorf("invalid format string, expected text literal delimiter: %s", string(textLiteralDelimiter))
 			}
 			// increment idx to skip the second text literal delimiter
 			idx++
diff --git a/cmd/bleve/cmd/registry.go b/cmd/bleve/cmd/registry.go
@@ -71,12 +71,12 @@ var registryCmd = &cobra.Command{
 func printType(label string, types, instances []string) {
 	sort.Strings(types)
 	sort.Strings(instances)
-	fmt.Printf(label + " Types:\n")
+	fmt.Printf("%s Types:\n", label)
 	for _, name := range types {
 		fmt.Printf("\t%s\n", name)
 	}
 	fmt.Println()
-	fmt.Printf(label + " Instances:\n")
+	fmt.Printf("%s Instances:\n", label)
 	for _, name := range instances {
 		fmt.Printf("\t%s\n", name)
 	}
diff --git a/go.mod b/go.mod
@@ -1,20 +1,18 @@
 module github.com/blevesearch/bleve/v2
 
-go 1.23
-
-toolchain go1.23.9
+go 1.24
 
 require (
 	github.com/RoaringBitmap/roaring/v2 v2.4.5
 	github.com/bits-and-blooms/bitset v1.22.0
-	github.com/blevesearch/bleve_index_api v1.2.9-0.20250929185838-e1be6a8cc229
+	github.com/blevesearch/bleve_index_api v1.2.12-0.20260109154621-f19a6d6af728
 	github.com/blevesearch/geo v0.2.4
-	github.com/blevesearch/go-faiss v1.0.25
+	github.com/blevesearch/go-faiss v1.0.27
 	github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/blevesearch/go-porterstemmer v1.0.3
 	github.com/blevesearch/goleveldb v1.0.1
 	github.com/blevesearch/gtreap v0.1.1
-	github.com/blevesearch/scorch_segment_api/v2 v2.3.10
+	github.com/blevesearch/scorch_segment_api/v2 v2.3.14-0.20260109154938-b56b54c737df
 	github.com/blevesearch/segment v0.9.1
 	github.com/blevesearch/snowball v0.6.1
 	github.com/blevesearch/snowballstem v0.9.0
@@ -26,7 +24,8 @@ require (
 	github.com/blevesearch/zapx/v13 v13.4.2
 	github.com/blevesearch/zapx/v14 v14.4.2
 	github.com/blevesearch/zapx/v15 v15.4.2
-	github.com/blevesearch/zapx/v16 v16.2.5-0.20251215174251-3f2bc83c91c0
+	github.com/blevesearch/zapx/v16 v16.2.8
+	github.com/blevesearch/zapx/v17 v17.0.0-20260112205515-7d8cac80436c
 	github.com/couchbase/moss v0.2.0
 	github.com/golang/protobuf v1.3.2
 	github.com/spf13/cobra v1.8.1
diff --git a/go.sum b/go.sum
@@ -3,12 +3,12 @@ github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/
 github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4=
 github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
-github.com/blevesearch/bleve_index_api v1.2.9-0.20250929185838-e1be6a8cc229 h1:q0hzsKqukWjLO5MEahNWP994XvbY1B2ZSzuM/Vfhx/A=
-github.com/blevesearch/bleve_index_api v1.2.9-0.20250929185838-e1be6a8cc229/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/bleve_index_api v1.2.12-0.20260109154621-f19a6d6af728 h1:qFnvr+SqVOCbhMl5sVynhuwVkv1yrc7Vhrn8lVdw1nU=
+github.com/blevesearch/bleve_index_api v1.2.12-0.20260109154621-f19a6d6af728/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
 github.com/blevesearch/geo v0.2.4 h1:ECIGQhw+QALCZaDcogRTNSJYQXRtC8/m8IKiA706cqk=
 github.com/blevesearch/geo v0.2.4/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
-github.com/blevesearch/go-faiss v1.0.25 h1:lel1rkOUGbT1CJ0YgzKwC7k+XH0XVBHnCVWahdCXk4U=
-github.com/blevesearch/go-faiss v1.0.25/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
+github.com/blevesearch/go-faiss v1.0.27 h1:7cBImYDDQ82WJd5RUZ1ie6zXztCsC73W94ZzwOjkatk=
+github.com/blevesearch/go-faiss v1.0.27/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:kDy+zgJFJJoJYBvdfBSiZYBbdsUL0XcjHYWezpQBGPA=
 github.com/blevesearch/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:9eJDeqxJ3E7WnLebQUlPD7ZjSce7AnDb9vjGmMCbD0A=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
@@ -20,8 +20,8 @@ github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgY
 github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA=
 github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
 github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.10 h1:Yqk0XD1mE0fDZAJXTjawJ8If/85JxnLd8v5vG/jWE/s=
-github.com/blevesearch/scorch_segment_api/v2 v2.3.10/go.mod h1:Z3e6ChN3qyN35yaQpl00MfI5s8AxUJbpTR/DL8QOQ+8=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.14-0.20260109154938-b56b54c737df h1:gBuVkzZLUpGJGnCBRgY0ruZVjppD7WaQLeHZei7QQnU=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.14-0.20260109154938-b56b54c737df/go.mod h1:f8fXitmMpzgNziIMqUlpTrfPxVVDN8at9k7POEohvJU=
 github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
 github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
 github.com/blevesearch/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A=
@@ -44,8 +44,10 @@ github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT
 github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
 github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
 github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
-github.com/blevesearch/zapx/v16 v16.2.5-0.20251215174251-3f2bc83c91c0 h1:HZssgO3JqQFBTrrBTb5LWkfGlOhUdPzUjsPHQoKEjhg=
-github.com/blevesearch/zapx/v16 v16.2.5-0.20251215174251-3f2bc83c91c0/go.mod h1:Rti/REtuuMmzwsI8/C/qIzRaEoSK/wiFYw5e5ctUKKs=
+github.com/blevesearch/zapx/v16 v16.2.8 h1:SlnzF0YGtSlrsOE3oE7EgEX6BIepGpeqxs1IjMbHLQI=
+github.com/blevesearch/zapx/v16 v16.2.8/go.mod h1:murSoCJPCk25MqURrcJaBQ1RekuqSCSfMjXH4rHyA14=
+github.com/blevesearch/zapx/v17 v17.0.0-20260112205515-7d8cac80436c h1:OfYh0noLbJmt6k2tqYlnSU3zMZEJbFfbSClSGG59A/M=
+github.com/blevesearch/zapx/v17 v17.0.0-20260112205515-7d8cac80436c/go.mod h1:ybWwo00MGrNJuFDnl9smEBVUCZmNANf0+E/QVBmfBTs=
 github.com/couchbase/ghistogram v0.1.0 h1:b95QcQTCzjTUocDXp/uMgSNQi8oj1tGwnJ4bODWZnps=
 github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k=
 github.com/couchbase/moss v0.2.0 h1:VCYrMzFwEryyhRSeI+/b3tRBSeTpi/8gn5Kf6dxqn+o=
diff --git a/index/scorch/optimize.go b/index/scorch/optimize.go
@@ -395,5 +395,7 @@ func (i *IndexSnapshot) unadornedTermFieldReader(
 		recycle:            false,
 		// signal downstream that this is a special unadorned termFieldReader
 		unadorned: true,
+		// unadorned TFRs do not require bytes read tracking
+		updateBytesRead: false,
 	}
 }
diff --git a/index/scorch/optimize_knn.go b/index/scorch/optimize_knn.go
@@ -34,8 +34,6 @@ type OptimizeVR struct {
 	totalCost uint64
 	// maps field to vector readers
 	vrs map[string][]*IndexSnapshotVectorReader
-	// if at least one of the vector readers requires filtered kNN.
-	requiresFiltering bool
 }
 
 // This setting _MUST_ only be changed during init and not after.
@@ -79,8 +77,7 @@ func (o *OptimizeVR) Finish() error {
 					wg.Done()
 				}()
 				for field, vrs := range o.vrs {
-					vecIndex, err := segment.InterpretVectorIndex(field,
-						o.requiresFiltering, origSeg.deleted)
+					vecIndex, err := segment.InterpretVectorIndex(field, origSeg.deleted)
 					if err != nil {
 						errorsM.Lock()
 						errors = append(errors, err)
@@ -103,7 +100,7 @@ func (o *OptimizeVR) Finish() error {
 						// kNN search.
 						if vr.eligibleSelector != nil {
 							pl, err = vecIndex.SearchWithFilter(vr.vector, vr.k,
-								vr.eligibleSelector.SegmentEligibleDocs(index), vr.searchParams)
+								vr.eligibleSelector.SegmentEligibleDocuments(index), vr.searchParams)
 						} else {
 							pl, err = vecIndex.Search(vr.vector, vr.k, vr.searchParams)
 						}
@@ -157,9 +154,6 @@ func (s *IndexSnapshotVectorReader) VectorOptimize(ctx context.Context,
 		return octx, nil
 	}
 	o.ctx = ctx
-	if !o.requiresFiltering {
-		o.requiresFiltering = s.eligibleSelector != nil
-	}
 
 	if o.snapshot != s.snapshot {
 		o.invokeSearcherEndCallback()
diff --git a/index/scorch/segment_plugin.go b/index/scorch/segment_plugin.go
@@ -28,6 +28,7 @@ import (
 	zapv14 "github.com/blevesearch/zapx/v14"
 	zapv15 "github.com/blevesearch/zapx/v15"
 	zapv16 "github.com/blevesearch/zapx/v16"
+	zapv17 "github.com/blevesearch/zapx/v17"
 )
 
 // SegmentPlugin represents the essential functions required by a package to plug in
@@ -73,7 +74,8 @@ var defaultSegmentPlugin SegmentPlugin
 
 func init() {
 	ResetSegmentPlugins()
-	RegisterSegmentPlugin(&zapv16.ZapPlugin{}, true)
+	RegisterSegmentPlugin(&zapv17.ZapPlugin{}, true)
+	RegisterSegmentPlugin(&zapv16.ZapPlugin{}, false)
 	RegisterSegmentPlugin(&zapv15.ZapPlugin{}, false)
 	RegisterSegmentPlugin(&zapv14.ZapPlugin{}, false)
 	RegisterSegmentPlugin(&zapv13.ZapPlugin{}, false)
diff --git a/index/scorch/snapshot_index.go b/index/scorch/snapshot_index.go
@@ -671,6 +671,8 @@ func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field
 			rv.incrementBytesRead(bytesRead - prevBytesReadItr)
 		}
 	}
+	// ONLY update the bytes read value beyond this point for this TFR if scoring is enabled
+	rv.updateBytesRead = rv.includeFreq || rv.includeNorm || rv.includeTermVectors
 	atomic.AddUint64(&is.parent.stats.TotTermSearchersStarted, uint64(1))
 	return rv, nil
 }
diff --git a/index/scorch/snapshot_index_tfr.go b/index/scorch/snapshot_index_tfr.go
@@ -51,6 +51,10 @@ type IndexSnapshotTermFieldReader struct {
 	bytesRead          uint64
 	ctx                context.Context
 	unadorned          bool
+	// flag to indicate whether to increment our bytesRead
+	// value after creation of the TFR while iterating our postings
+	// lists
+	updateBytesRead bool
 }
 
 func (i *IndexSnapshotTermFieldReader) incrementBytesRead(val uint64) {
@@ -83,10 +87,15 @@ func (i *IndexSnapshotTermFieldReader) Next(preAlloced *index.TermFieldDoc) (*in
 	if rv == nil {
 		rv = &index.TermFieldDoc{}
 	}
+	var prevBytesRead uint64
 	// find the next hit
 	for i.segmentOffset < len(i.iterators) {
-		prevBytesRead := i.iterators[i.segmentOffset].BytesRead()
-		next, err := i.iterators[i.segmentOffset].Next()
+		// get our current postings iterator
+		curItr := i.iterators[i.segmentOffset]
+		if i.updateBytesRead {
+			prevBytesRead = curItr.BytesRead()
+		}
+		next, err := curItr.Next()
 		if err != nil {
 			return nil, err
 		}
@@ -99,13 +108,15 @@ func (i *IndexSnapshotTermFieldReader) Next(preAlloced *index.TermFieldDoc) (*in
 
 			i.currID = rv.ID
 			i.currPosting = next
-			// postingsIterators is maintain the bytesRead stat in a cumulative fashion.
-			// this is because there are chances of having a series of loadChunk calls,
-			// and they have to be added together before sending the bytesRead at this point
-			// upstream.
-			bytesRead := i.iterators[i.segmentOffset].BytesRead()
-			if bytesRead > prevBytesRead {
-				i.incrementBytesRead(bytesRead - prevBytesRead)
+			if i.updateBytesRead {
+				// postingsIterators maintains the bytesRead stat in a cumulative fashion.
+				// this is because there are chances of having a series of loadChunk calls,
+				// and they have to be added together before sending the bytesRead at this point
+				// upstream.
+				bytesRead := curItr.BytesRead()
+				if bytesRead > prevBytesRead {
+					i.incrementBytesRead(bytesRead - prevBytesRead)
+				}
 			}
 			return rv, nil
 		}
diff --git a/index/scorch/snapshot_vector_index.go b/index/scorch/snapshot_vector_index.go
@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/bits-and-blooms/bitset"
 	index "github.com/blevesearch/bleve_index_api"
 	segment_api "github.com/blevesearch/scorch_segment_api/v2"
 )
@@ -49,17 +50,82 @@ func (is *IndexSnapshot) VectorReader(ctx context.Context, vector []float32,
 	return rv, nil
 }
 
+// eligibleDocumentList represents the list of eligible documents within a segment.
+type eligibleDocumentList struct {
+	bs *bitset.BitSet
+}
+
+// Iterator returns an iterator for the eligible document IDs.
+func (edl *eligibleDocumentList) Iterator() index.EligibleDocumentIterator {
+	if edl.bs == nil {
+		// no eligible documents
+		return emptyEligibleIterator
+	}
+	// return the iterator
+	return &eligibleDocumentIterator{
+		bs: edl.bs,
+	}
+}
+
+// Count returns the number of eligible document IDs.
+func (edl *eligibleDocumentList) Count() uint64 {
+	if edl.bs == nil {
+		return 0
+	}
+	return uint64(edl.bs.Count())
+}
+
+// emptyEligibleDocumentList is a reusable empty eligible document list.
+var emptyEligibleDocumentList = &eligibleDocumentList{}
+
+// eligibleDocumentIterator iterates over eligible document IDs within a segment.
+type eligibleDocumentIterator struct {
+	bs      *bitset.BitSet
+	current uint
+}
+
+// Next returns the next eligible document ID and whether it exists.
+func (it *eligibleDocumentIterator) Next() (id uint64, ok bool) {
+	next, found := it.bs.NextSet(it.current)
+	if !found {
+		return 0, false
+	}
+	it.current = next + 1
+	return uint64(next), true
+}
+
+// emptyEligibleIterator is a reusable empty eligible document iterator.
+var emptyEligibleIterator = &emptyEligibleDocumentIterator{}
+
+// emptyEligibleDocumentIterator is an iterator that always returns no documents.
+type emptyEligibleDocumentIterator struct{}
+
+// Next always returns false for empty iterator.
+func (it *emptyEligibleDocumentIterator) Next() (id uint64, ok bool) {
+	return 0, false
+}
+
 // eligibleDocumentSelector is used to filter out documents that are eligible for
 // the KNN search from a pre-filter query.
 type eligibleDocumentSelector struct {
-	// segment ID -> segment local doc nums
-	eligibleDocNums map[int][]uint64
+	// segment ID -> segment local doc nums in a bitset
+	eligibleDocNums []*bitset.BitSet
 	is              *IndexSnapshot
 }
 
-// SegmentEligibleDocs returns the list of eligible local doc numbers for the given segment.
-func (eds *eligibleDocumentSelector) SegmentEligibleDocs(segmentID int) []uint64 {
-	return eds.eligibleDocNums[segmentID]
+// SegmentEligibleDocuments returns an EligibleDocumentList for the specified segment ID.
+func (eds *eligibleDocumentSelector) SegmentEligibleDocuments(segmentID int) index.EligibleDocumentList {
+	if eds.eligibleDocNums == nil || segmentID < 0 || segmentID >= len(eds.eligibleDocNums) {
+		return emptyEligibleDocumentList
+	}
+	bs := eds.eligibleDocNums[segmentID]
+	if bs == nil {
+		// no eligible documents for this segment
+		return emptyEligibleDocumentList
+	}
+	return &eligibleDocumentList{
+		bs: bs,
+	}
 }
 
 // AddEligibleDocumentMatch adds a document match to the list of eligible documents.
@@ -72,14 +138,19 @@ func (eds *eligibleDocumentSelector) AddEligibleDocumentMatch(id index.IndexInte
 	if err != nil {
 		return err
 	}
+	// allocate a bitset for this segment if needed
+	if eds.eligibleDocNums[segIdx] == nil {
+		// the size of the bitset is the full size of the segment (which is the max local doc num + 1)
+		eds.eligibleDocNums[segIdx] = bitset.New(uint(eds.is.segment[segIdx].FullSize()))
+	}
 	// Add the local doc number to the list of eligible doc numbers for this segment.
-	eds.eligibleDocNums[segIdx] = append(eds.eligibleDocNums[segIdx], docNum)
+	eds.eligibleDocNums[segIdx].Set(uint(docNum))
 	return nil
 }
 
 func (is *IndexSnapshot) NewEligibleDocumentSelector() index.EligibleDocumentSelector {
 	return &eligibleDocumentSelector{
-		eligibleDocNums: map[int][]uint64{},
+		eligibleDocNums: make([]*bitset.BitSet, len(is.segment)),
 		is:              is,
 	}
 }
diff --git a/index/scorch/unadorned.go b/index/scorch/unadorned.go
diff --git a/index_test.go b/index_test.go
diff --git a/search/query/query_string_parser.go b/search/query/query_string_parser.go

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func convertInterfaceSliceToStringSlice(interfaceSlice []interface{}, objType st`
`140`	`140`	`if ok {`
`141`	`141`	`stringSlice[i] = stringObj`
`142`	`142`	`} else {`
`143`		`- return nil, fmt.Errorf(objType + " name must be a string")`
	`143`	`+ return nil, fmt.Errorf("%s name must be a string", objType)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func letterCounter(layout string, idx int) int {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func invalidFormatError(character byte, count int) error {`
`121`		`- return fmt.Errorf("invalid format string, unknown format specifier: " + strings.Repeat(string(character), count))`
	`121`	`+ return fmt.Errorf("invalid format string, unknown format specifier: %s", strings.Repeat(string(character), count))`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func parseISOString(layout string) (string, error) {`
`@@ -146,7 +146,7 @@ func parseISOString(layout string) (string, error) {`
`146`	`146`	`// second text literal delimiter`
`147`	`147`	`if idx == len(layout) {`
`148`	`148`	`// text literal delimiter not found error`
`149`		`- return "", fmt.Errorf("invalid format string, expected text literal delimiter: " + string(textLiteralDelimiter))`
	`149`	`+ return "", fmt.Errorf("invalid format string, expected text literal delimiter: %s", string(textLiteralDelimiter))`
`150`	`150`	`}`
`151`	`151`	`// increment idx to skip the second text literal delimiter`
`152`	`152`	`idx++`
Original file line number	Diff line number	Diff line change
`@@ -395,5 +395,7 @@ func (i *IndexSnapshot) unadornedTermFieldReader(`
`395`	`395`	`recycle: false,`
`396`	`396`	`// signal downstream that this is a special unadorned termFieldReader`
`397`	`397`	`unadorned: true,`
	`398`	`+ // unadorned TFRs do not require bytes read tracking`
	`399`	`+ updateBytesRead: false,`
`398`	`400`	`}`
`399`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -671,6 +671,8 @@ func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field`
`671`	`671`	`rv.incrementBytesRead(bytesRead - prevBytesReadItr)`
`672`	`672`	`}`
`673`	`673`	`}`
	`674`	`+ // ONLY update the bytes read value beyond this point for this TFR if scoring is enabled`
	`675`	`+ rv.updateBytesRead = rv.includeFreq \|\| rv.includeNorm \|\| rv.includeTermVectors`
`674`	`676`	`atomic.AddUint64(&is.parent.stats.TotTermSearchersStarted, uint64(1))`
`675`	`677`	`return rv, nil`
`676`	`678`	`}`