finally

Author: CascadingRadium

search/collector/knn.go

@@ -136,11 +136,8 @@ type KNNCollector struct {
 	took     time.Duration
 	results  search.DocumentMatchCollection
 	maxScore float64
-
-	nestedStore *collectStoreNested
 }
 
-// NewKNNCollector creates a new KNNCollector for the given K values and size.
 func NewKNNCollector(kArray []int64, size int64) *KNNCollector {
 	return &KNNCollector{
 		knnStore: GetNewKNNCollectorStore(kArray),

search/collector/topn.go

@@ -140,7 +140,19 @@ func newTopNCollector(size int, skip int, sort search.SortOrder, nr index.Nested
 			// merge field term locations
 			parent.FieldTermLocations = search.MergeFieldTermLocationsFromMatch(parent.FieldTermLocations, child)
 			// add child's ID to parent's Descendants
-			parent.AddDescendantID(child.IndexInternalID)
+			// add other as descendant only if it is not the same document
+			if !parent.IndexInternalID.Equals(child.IndexInternalID) {
+				// Add a copy of child.IndexInternalID to descendants, because
+				// child.IndexInternalID will be reset when 'child' is recycled.
+				var descendantID index.IndexInternalID
+				// first check if parent's descendants slice has capacity to reuse
+				if len(parent.Descendants) < cap(parent.Descendants) {
+					// reuse the buffer element at len(parent.Descendants)
+					descendantID = parent.Descendants[:len(parent.Descendants)+1][len(parent.Descendants)]
+				}
+				// copy the contents of id into descendantID, allocating if needed
+				parent.Descendants = append(parent.Descendants, index.NewIndexInternalIDFrom(descendantID, child.IndexInternalID))
+			}
 			return nil
 		}
 		hc.nestedStore = newStoreNested(nr, search.DescendantAdderCallbackFn(descAdder))

search/search.go

@@ -382,21 +382,6 @@ func (dm *DocumentMatch) String() string {
 	return fmt.Sprintf("[%s-%f]", dm.ID, dm.Score)
 }
 
-func (dm *DocumentMatch) AddDescendantID(id index.IndexInternalID) {
-	// add other as descendant only if it is not the same document
-	if !dm.IndexInternalID.Equals(id) {
-		// Add a copy of id to descendants
-		var descendantID index.IndexInternalID
-		// first check if dm's descendants slice has capacity to reuse
-		if len(dm.Descendants) < cap(dm.Descendants) {
-			// reuse the buffer element at len(dm.Descendants)
-			descendantID = dm.Descendants[:len(dm.Descendants)+1][len(dm.Descendants)]
-		}
-		// copy the contents of id into descendantID, allocating if needed
-		dm.Descendants = append(dm.Descendants, index.NewIndexInternalIDFrom(descendantID, id))
-	}
-}
-
 type DocumentMatchCollection []*DocumentMatch
 
 func (c DocumentMatchCollection) Len() int           { return len(c) }

search_knn.go

@@ -24,7 +24,6 @@ import (
 	"sort"
 
 	"github.com/blevesearch/bleve/v2/document"
-	"github.com/blevesearch/bleve/v2/mapping"
 	"github.com/blevesearch/bleve/v2/search"
 	"github.com/blevesearch/bleve/v2/search/collector"
 	"github.com/blevesearch/bleve/v2/search/query"
@@ -452,10 +451,7 @@ func (i *indexImpl) runKnnCollector(ctx context.Context, req *SearchRequest, rea
 			err = serr
 		}
 	}()
-	knnCollector, err := i.buildKNNCollector(ctx, KNNQuery, reader, kArray, sumOfK)
-	if err != nil {
-		return nil, err
-	}
+	knnCollector := collector.NewKNNCollector(kArray, sumOfK)
 	err = knnCollector.Collect(ctx, knnSearcher, reader)
 	if err != nil {
 		return nil, err
@@ -485,9 +481,6 @@ func setKnnHitsInCollector(knnHits []*search.DocumentMatch, coll *collector.TopN
 			ftsMatch.Score += knnMatch.Score
 			// Combine the FTS explanation with the KNN explanation, if present
 			ftsMatch.Expl.MergeWith(knnMatch.Expl)
-			// Add the Descendants from the KNN match to the FTS match, deduplicating them on the way
-			// The Descendants of a DocumentMatch is always sorted, and we must maintain that invariant
-			ftsMatch.Descendants = search.SortedUnion(ftsMatch.Descendants, knnMatch.Descendants)
 		}
 		coll.SetKNNHits(knnHits, search.HybridMergeCallbackFn(mergeFn))
 	}
@@ -688,26 +681,3 @@ func (r *rescorer) restoreKnnRequest() {
 		r.req.KNN[i].Boost = &b
 	}
 }
-
-func (i *indexImpl) buildKNNCollector(ctx context.Context, KNNQuery query.Query, reader index.IndexReader, kArray []int64, sumOfK int64) (*collector.KNNCollector, error) {
-	// check if we are in nested mode
-	if nestedMode, ok := ctx.Value(search.NestedSearchKey).(bool); ok && nestedMode {
-		// get the nested reader from the index reader
-		if nr, ok := reader.(index.NestedReader); ok {
-			// check if the KNN query intersects with the nested mapping
-			if nm, ok := i.m.(mapping.NestedMapping); ok {
-				var fs search.FieldSet
-				var err error
-				fs, err = query.ExtractFields(KNNQuery, i.m, fs)
-				if err != nil {
-					return nil, err
-				}
-				if nm.IntersectsPrefix(fs) {
-					return collector.NewNestedKNNCollector(kArray, sumOfK, nr), nil
-				}
-			}
-		}
-	}
-
-	return collector.NewKNNCollector(kArray, sumOfK), nil
-}