refactor

Author: CascadingRadium

search/query/boolean.go

@@ -15,6 +15,7 @@
 package query
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -183,7 +184,7 @@ func (q *BooleanQuery) Searcher(ctx context.Context, i index.IndexReader, m mapp
 		}
 	}
 
-	var filterSearcher search.Searcher
+	var filterFunc searcher.FilterFunc
 	if q.Filter != nil {
 		// create a new searcher options with disabled scoring, since filter should not affect scoring
 		// and we don't want to pay the cost of scoring if we don't need it, also disable term vectors
@@ -193,13 +194,25 @@ func (q *BooleanQuery) Searcher(ctx context.Context, i index.IndexReader, m mapp
 			IncludeTermVectors: false,
 			Score:              "none",
 		}
-		filterSearcher, err = q.Filter.Searcher(ctx, i, m, filterOptions)
+		filterSearcher, err := q.Filter.Searcher(ctx, i, m, filterOptions)
 		if err != nil {
 			return nil, err
 		}
+		filterFunc = func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
+			// Attempt to advance the filter searcher to the document identified by
+			// the base searcher's (unfiltered boolean) current result (d.IndexInternalID).
+			//
+			// If the filter searcher successfully finds a document with the same
+			// internal ID, it means the document satisfies the filter and should be kept.
+			//
+			// If the filter searcher returns an error, does not find a matching document,
+			// or finds a document with a different internal ID, the document should be discarded.
+			dm, err := filterSearcher.Advance(sctx, d.IndexInternalID)
+			return err == nil && dm != nil && bytes.Equal(dm.IndexInternalID, d.IndexInternalID)
+		}
 	}
 	// optimization, if only should searcher, just return it instead
-	if mustSearcher == nil && shouldSearcher != nil && mustNotSearcher == nil && filterSearcher == nil {
+	if mustSearcher == nil && shouldSearcher != nil && mustNotSearcher == nil && filterFunc == nil {
 		return shouldSearcher, nil
 	}
 
@@ -208,8 +221,8 @@ func (q *BooleanQuery) Searcher(ctx context.Context, i index.IndexReader, m mapp
 		return nil, err
 	}
 
-	if filterSearcher != nil {
-		return searcher.NewConstrainedSearcher(ctx, bs, filterSearcher), nil
+	if filterFunc != nil {
+		return searcher.NewFilteringSearcher(ctx, bs, filterFunc), nil
 	}
 	return bs, nil
 }

search/searcher/search_filter.go

@@ -15,7 +15,6 @@
 package searcher
 
 import (
-	"bytes"
 	"context"
 	"reflect"
 
@@ -34,20 +33,13 @@ func init() {
 // FilterFunc defines a function which can filter documents
 // returning true means keep the document
 // returning false means do not keep the document
-type FilterFunc func(d *search.DocumentMatch) bool
-
-// ConstraintFunc defines a function which can constrain documents
-// returning true means keep the document
-// returning false means do not keep the document
-// This is similar to FilterFunc, but takes a SearchContext
-type ConstraintFunc func(sctx *search.SearchContext, d *search.DocumentMatch) bool
+type FilterFunc func(sctx *search.SearchContext, d *search.DocumentMatch) bool
 
 // FilteringSearcher wraps any other searcher, but checks any Next/Advance
 // call against the supplied FilterFunc
 type FilteringSearcher struct {
-	child      search.Searcher
-	accept     FilterFunc
-	constraint ConstraintFunc
+	child  search.Searcher
+	accept FilterFunc
 }
 
 func NewFilteringSearcher(ctx context.Context, s search.Searcher, filter FilterFunc) *FilteringSearcher {
@@ -56,24 +48,6 @@ func NewFilteringSearcher(ctx context.Context, s search.Searcher, filter FilterF
 		accept: filter,
 	}
 }
-func NewConstrainedSearcher(ctx context.Context, baseSearcher search.Searcher, constraint search.Searcher) *FilteringSearcher {
-	constraintFunc := func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
-		// Attempt to advance the constraint searcher to the document identified by
-		// the base searcher's current result (d.IndexInternalID).
-		//
-		// If the constraint searcher successfully finds a document with the same
-		// internal ID, it means the document satisfies the constraint and should be kept.
-		//
-		// If the constraint searcher returns an error, does not find a matching document,
-		// or finds a document with a different internal ID, the document should be discarded.
-		dm, err := constraint.Advance(sctx, d.IndexInternalID)
-		return err == nil && dm != nil && bytes.Equal(dm.IndexInternalID, d.IndexInternalID)
-	}
-	return &FilteringSearcher{
-		child:      baseSearcher,
-		constraint: constraintFunc,
-	}
-}
 
 func (f *FilteringSearcher) Size() int {
 	return reflectStaticSizeFilteringSearcher + size.SizeOfPtr +
@@ -83,18 +57,14 @@ func (f *FilteringSearcher) Size() int {
 func (f *FilteringSearcher) Next(ctx *search.SearchContext) (*search.DocumentMatch, error) {
 	next, err := f.child.Next(ctx)
 	for next != nil && err == nil {
-		if f.passesFilter(ctx, next) {
+		if f.accept(ctx, next) {
 			return next, nil
 		}
 		next, err = f.child.Next(ctx)
 	}
 	return nil, err
 }
 
-func (f *FilteringSearcher) passesFilter(ctx *search.SearchContext, d *search.DocumentMatch) bool {
-	return (f.accept == nil || f.accept(d)) && (f.constraint == nil || f.constraint(ctx, d))
-}
-
 func (f *FilteringSearcher) Advance(ctx *search.SearchContext, ID index.IndexInternalID) (*search.DocumentMatch, error) {
 	adv, err := f.child.Advance(ctx, ID)
 	if err != nil {
@@ -103,7 +73,7 @@ func (f *FilteringSearcher) Advance(ctx *search.SearchContext, ID index.IndexInt
 	if adv == nil {
 		return nil, nil
 	}
-	if f.passesFilter(ctx, adv) {
+	if f.accept(ctx, adv) {
 		return adv, nil
 	}
 	return f.Next(ctx)

search/searcher/search_geoboundingbox.go

@@ -203,7 +203,7 @@ func buildIsIndexedFunc(ctx context.Context, indexReader index.IndexReader, fiel
 
 func buildRectFilter(ctx context.Context, dvReader index.DocValueReader, field string,
 	minLon, minLat, maxLon, maxLat float64) FilterFunc {
-	return func(d *search.DocumentMatch) bool {
+	return func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
 		// check geo matches against all numeric type terms indexed
 		var lons, lats []float64
 		var found bool

search/searcher/search_geopointdistance.go

@@ -115,7 +115,7 @@ func boxSearcher(ctx context.Context, indexReader index.IndexReader,
 
 func buildDistFilter(ctx context.Context, dvReader index.DocValueReader, field string,
 	centerLon, centerLat, maxDist float64) FilterFunc {
-	return func(d *search.DocumentMatch) bool {
+	return func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
 		// check geo matches against all numeric type terms indexed
 		var lons, lats []float64
 		var found bool

search/searcher/search_geopolygon.go

@@ -85,7 +85,7 @@ func almostEqual(a, b float64) bool {
 // here: https://wrf.ecse.rpi.edu/nikola/pubdetails/pnpoly.html
 func buildPolygonFilter(ctx context.Context, dvReader index.DocValueReader, field string,
 	coordinates []geo.Point) FilterFunc {
-	return func(d *search.DocumentMatch) bool {
+	return func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
 		// check geo matches against all numeric type terms indexed
 		var lons, lats []float64
 		var found bool

search/searcher/search_geoshape.go

@@ -77,7 +77,7 @@ func buildRelationFilterOnShapes(ctx context.Context, dvReader index.DocValueRea
 		bufPool = ctx.Value(search.GeoBufferPoolCallbackKey).(search.GeoBufferPoolCallbackFunc)()
 	}
 
-	return func(d *search.DocumentMatch) bool {
+	return func(sctx *search.SearchContext, d *search.DocumentMatch) bool {
 		var found bool
 
 		err := dvReader.VisitDocValues(d.IndexInternalID,