bug fixes

index_alias_impl.go

@@ -16,6 +16,7 @@ package bleve
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"time"
 
@@ -657,8 +658,8 @@ func requestSatisfiedByPreSearch(req *SearchRequest, flags *preSearchFlags) bool
 func constructBM25PreSearchData(rv map[string]map[string]interface{}, sr *SearchResult, indexes []Index) map[string]map[string]interface{} {
 	for _, index := range indexes {
 		rv[index.Name()][search.BM25PreSearchDataKey] = map[string]interface{}{
-			"docCount":         sr.docCount,
-			"fieldCardinality": sr.fieldCardinality,
+			"docCount":         sr.DocCount,
+			"fieldCardinality": sr.FieldCardinality,
 		}
 	}
 	return rv
@@ -854,6 +855,7 @@ func MultiSearch(ctx context.Context, req *SearchRequest, preSearchData map[stri
 		var payload map[string]interface{}
 		if preSearchData != nil {
 			payload = preSearchData[in.Name()]
+			fmt.Println("the payload", payload)
 		}
 		go searchChildIndex(in, createChildSearchRequest(req, payload))
 	}

index_impl.go

@@ -460,7 +460,10 @@ func (i *indexImpl) preSearch(ctx context.Context, req *SearchRequest, reader in
 			}
 
 			fs := make(query.FieldSet)
-			fs = query.ExtractFields(req.Query, i.m, fs)
+			fs, err = query.ExtractFields(req.Query, i.m, fs)
+			if err != nil {
+				return nil, err
+			}
 
 			for field := range fs {
 				dict, err := reader.FieldDict(field)
@@ -478,8 +481,8 @@ func (i *indexImpl) preSearch(ctx context.Context, req *SearchRequest, reader in
 			Successful: 1,
 		},
 		Hits:             knnHits,
-		docCount:         count,
-		fieldCardinality: fieldCardinality,
+		DocCount:         count,
+		FieldCardinality: fieldCardinality,
 	}, nil
 }
 

pre_search.go

@@ -59,15 +59,15 @@ func newBM25PreSearchResultProcessor() *bm25PreSearchResultProcessor {
 
 // TODO How will this work for queries other than term queries?
 func (b *bm25PreSearchResultProcessor) add(sr *SearchResult, indexName string) {
-	b.docCount += (sr.docCount)
-	for field, cardinality := range sr.fieldCardinality {
+	b.docCount += (sr.DocCount)
+	for field, cardinality := range sr.FieldCardinality {
 		b.fieldCardinality[field] += cardinality
 	}
 }
 
 func (b *bm25PreSearchResultProcessor) finalize(sr *SearchResult) {
-	sr.docCount = b.docCount
-	sr.fieldCardinality = b.fieldCardinality
+	sr.DocCount = b.docCount
+	sr.FieldCardinality = b.fieldCardinality
 }
 
 // -----------------------------------------------------------------------------

search.go

@@ -446,8 +446,8 @@ type SearchResult struct {
 	Facets   search.FacetResults            `json:"facets"`
 
 	// The following fields are applicable to BM25 preSearch
-	docCount         uint64
-	fieldCardinality map[string]int // search_field -> cardinality
+	DocCount         uint64
+	FieldCardinality map[string]int // search_field -> cardinality
 }
 
 func (sr *SearchResult) Size() int {

search/searcher/search_term.go

@@ -17,6 +17,7 @@ package searcher
 import (
 	"context"
 	"fmt"
+	"math"
 	"reflect"
 
 	"github.com/blevesearch/bleve/v2/search"
@@ -65,10 +66,6 @@ func tfTDFScoreMetrics(indexReader index.IndexReader) (uint64, float64, error) {
 	}
 	fieldCardinality := 0
 
-	fmt.Println("----------tf-idf stats--------")
-	fmt.Println("docCount: ", count)
-	fmt.Println("fieldCardinality: ", fieldCardinality)
-
 	if count == 0 && fieldCardinality == 0 {
 		return 0, 0, nil
 	}
@@ -100,22 +97,17 @@ func bm25ScoreMetrics(ctx context.Context, field string,
 		if !ok {
 			return 0, 0, fmt.Errorf("field stat for bm25 not present %s", field)
 		}
-
-		fmt.Println("----------bm25 stats--------")
-		fmt.Println("docCount: ", count)
-		fmt.Println("fieldCardinality: ", fieldCardinality)
-		fmt.Println("avgDocLength: ", fieldCardinality/int(count))
 	}
 
 	fmt.Println("----------bm25 stats--------")
 	fmt.Println("docCount: ", count)
 	fmt.Println("fieldCardinality: ", fieldCardinality)
-	fmt.Println("avgDocLength: ", fieldCardinality/int(count))
+	fmt.Println("avgDocLength: ", math.Ceil(float64(fieldCardinality)/float64(count)))
 
 	if count == 0 && fieldCardinality == 0 {
 		return 0, 0, nil
 	}
-	return count, float64(fieldCardinality / int(count)), nil
+	return count, math.Ceil(float64(fieldCardinality) / float64(count)), nil
 }
 
 func newTermSearcherFromReader(ctx context.Context, indexReader index.IndexReader,