MB-65473: Adapt to change in bleve_index_api interface for VectorReader

go.mod

@@ -3,7 +3,7 @@ module github.com/blevesearch/sear
 go 1.21
 
 require (
-	github.com/blevesearch/bleve_index_api v1.2.4
+	github.com/blevesearch/bleve_index_api v1.2.7
 	github.com/blevesearch/vellum v1.1.0
 )
 

go.sum

@@ -1,7 +1,7 @@
 github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
 github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/blevesearch/bleve_index_api v1.2.4 h1:XRk+wWtbNZSxKvW2bNg4fUpoc3XQDD63krBzB45fJDY=
-github.com/blevesearch/bleve_index_api v1.2.4/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/bleve_index_api v1.2.7 h1:c8r9vmbaYQroAMSGag7zq5gEVPiuXrUQDqfnj7uYZSY=
+github.com/blevesearch/bleve_index_api v1.2.7/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
 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/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=

vector.go

@@ -33,8 +33,36 @@ func (d *Document) interpretVectorIfApplicable(field index.Field) int {
 	return 0
 }
 
+type eligibleDocumentSelector struct {
+	docNums []uint64
+}
+
+func (eds *eligibleDocumentSelector) SegmentEligibleDocs(segmentID int) []uint64 {
+	// segmentID not applicable for single doc index
+	return eds.docNums
+}
+
+func (eds *eligibleDocumentSelector) AddEligibleDocumentMatch(id index.IndexInternalID) error {
+	if len(id) > 0 {
+		eds.docNums = append(eds.docNums, 0)
+	}
+
+	return nil
+}
+
+func (r *Reader) NewEligibleDocumentSelector() index.EligibleDocumentSelector {
+	return &eligibleDocumentSelector{}
+}
+
 func (r *Reader) VectorReader(ctx context.Context, vector []float32,
-	field string, k int64, searchParams json.RawMessage) (index.VectorReader, error) {
+	field string, k int64, searchParams json.RawMessage,
+	selector index.EligibleDocumentSelector) (index.VectorReader, error) {
+	if selector != nil && len(selector.SegmentEligibleDocs(0)) == 0 {
+		// if selector/filter is applicable but no eligible docs,
+		// then current document does not qualify
+		return NewVectorFieldReaderEmpty(), nil
+	}
+
 	if r.s.doc == nil {
 		return NewVectorFieldReaderEmpty(), nil
 	}
@@ -55,18 +83,6 @@ func (r *Reader) VectorReader(ctx context.Context, vector []float32,
 	return NewVectorFieldReaderMatch(dims), nil
 }
 
-func (r *Reader) VectorReaderWithFilter(ctx context.Context, vector []float32,
-	field string, k int64, searchParams json.RawMessage,
-	filterIDs []index.IndexInternalID) (index.VectorReader, error) {
-	// if no filterIDs, current document does not qualify (in the
-	// single document index scenario)
-	if len(filterIDs) == 0 {
-		return NewVectorFieldReaderEmpty(), nil
-	}
-
-	return r.VectorReader(ctx, vector, field, k, searchParams)
-}
-
 // -----------------------------------------------------------------------------
 
 type VectorFieldReader struct {