use ctx in term srch

blevesearch · Dec 6, 2024 · 0abb3e6 · 0abb3e6
1 parent dd4589e
commit 0abb3e6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/search/searcher/search_disjunction.go b/search/searcher/search_disjunction.go
@@ -114,7 +114,7 @@ func optimizeCompositeSearcher(ctx context.Context, optimizationKind string,
 		return nil, nil
 	}
 
-	return newTermSearcherFromReader(indexReader, tfr,
+	return newTermSearcherFromReader(ctx, indexReader, tfr,
 		[]byte(optimizationKind), "*", 1.0, options)
 }
 

diff --git a/search/searcher/search_term.go b/search/searcher/search_term.go
@@ -16,6 +16,7 @@ package searcher
 
 import (
 	"context"
+	"fmt"
 	"reflect"
 
 	"github.com/blevesearch/bleve/v2/search"
@@ -51,17 +52,23 @@ func NewTermSearcherBytes(ctx context.Context, indexReader index.IndexReader, te
 	if err != nil {
 		return nil, err
 	}
-	return newTermSearcherFromReader(indexReader, reader, term, field, boost, options)
+	return newTermSearcherFromReader(ctx, indexReader, reader, term, field, boost, options)
 }
 
-func newTermSearcherFromReader(indexReader index.IndexReader, reader index.TermFieldReader,
+func newTermSearcherFromReader(ctx context.Context, indexReader index.IndexReader, reader index.TermFieldReader,
 	term []byte, field string, boost float64, options search.SearcherOptions) (*TermSearcher, error) {
-	// TODO Instead of passing count from reader here, do it using the presearch phase stats.
-	count, err := indexReader.DocCount()
-	if err != nil {
-		_ = reader.Close()
-		return nil, err
+	count, ok := ctx.Value(search.BM25PreSearchDataKey).(uint64)
+	if !ok {
+		var err error
+		count, err = indexReader.DocCount()
+		if err != nil {
+			_ = reader.Close()
+			return nil, err
+		}
+	} else {
+		fmt.Printf("fetched from ctx \n")
 	}
+
 	scorer := scorer.NewTermQueryScorer(term, field, boost, count, reader.Count(), options)
 	return &TermSearcher{
 		indexReader: indexReader,