Apache Lucene open-source search software
Route doc-values queries through ConstantScoreScorerSupplier (#16294)
Costin Leau754b4e344068
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex ce98146da8a..c4f1dd54a00 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -436,6 +436,12 @@ Optimizationsmissing value cannot displace one already in the queue, so the rest can be skipped.(Serhiy Bzhezytskyy)+* GITHUB#16294: Route constant-score doc-values queries through+ ConstantScoreScorerSupplier so they can benefit from batch scoring.+ Affects BinaryRangeFieldRangeQuery, LatLonDocValuesBoxQuery,+ LatLonDocValuesQuery, XYDocValuesPointInGeometryQuery, and+ SortedNumericDocValuesSetQuery. (Costin Leau)+Bug Fixes---------------------diff --git a/lucene/core/src/java/org/apache/lucene/document/BinaryRangeFieldRangeQuery.java b/lucene/core/src/java/org/apache/lucene/document/BinaryRangeFieldRangeQuery.javaindex 140227746f0..f7d5d19ea89 100644--- a/lucene/core/src/java/org/apache/lucene/document/BinaryRangeFieldRangeQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/BinaryRangeFieldRangeQuery.java@@ -23,7 +23,7 @@ import java.util.Objects;import org.apache.lucene.index.DocValues;import org.apache.lucene.index.LeafReader;import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreScorerSupplier;import org.apache.lucene.search.ConstantScoreWeight;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;@@ -135,8 +135,11 @@ abstract class BinaryRangeFieldRangeQuery extends Query {}};- final var scorer = new ConstantScoreScorer(score(), scoreMode, iterator);- return new DefaultScorerSupplier(scorer);+ return ConstantScoreScorerSupplier.fromIterator(+ TwoPhaseIterator.asDocIdSetIterator(iterator),+ score(),+ scoreMode,+ context.reader().maxDoc());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesBoxQuery.java b/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesBoxQuery.javaindex ac01e4c74f3..d6593fda51e 100644--- a/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesBoxQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesBoxQuery.java@@ -22,7 +22,7 @@ import org.apache.lucene.geo.GeoUtils;import org.apache.lucene.index.DocValues;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.SortedNumericDocValues;-import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreScorerSupplier;import org.apache.lucene.search.ConstantScoreWeight;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;@@ -153,8 +153,11 @@ final class LatLonDocValuesBoxQuery extends Query {return 5; // 5 comparisons}};- final var scorer = new ConstantScoreScorer(boost, scoreMode, iterator);- return new DefaultScorerSupplier(scorer);+ return ConstantScoreScorerSupplier.fromIterator(+ TwoPhaseIterator.asDocIdSetIterator(iterator),+ boost,+ scoreMode,+ context.reader().maxDoc());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesQuery.java b/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesQuery.javaindex 45a7bc0eb52..65fc6b664d1 100644--- a/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesQuery.java@@ -29,7 +29,7 @@ import org.apache.lucene.geo.Point;import org.apache.lucene.index.DocValues;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.SortedNumericDocValues;-import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreScorerSupplier;import org.apache.lucene.search.ConstantScoreWeight;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;@@ -158,8 +158,11 @@ class LatLonDocValuesQuery extends Query {throw new IllegalArgumentException("Invalid query relationship:[" + queryRelation + "]");}- final var scorer = new ConstantScoreScorer(boost, scoreMode, iterator);- return new DefaultScorerSupplier(scorer);+ return ConstantScoreScorerSupplier.fromIterator(+ TwoPhaseIterator.asDocIdSetIterator(iterator),+ boost,+ scoreMode,+ context.reader().maxDoc());}@Overridediff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.javaindex 53966bb02c3..7b7028d5be5 100644--- a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java@@ -23,7 +23,7 @@ import org.apache.lucene.index.DocValues;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.NumericDocValues;import org.apache.lucene.index.SortedNumericDocValues;-import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreScorerSupplier;import org.apache.lucene.search.ConstantScoreWeight;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.MatchNoDocsQuery;@@ -150,8 +150,11 @@ final class SortedNumericDocValuesSetQuery extends Query implements Accountable}};}- final var scorer = new ConstantScoreScorer(score(), scoreMode, iterator);- return new DefaultScorerSupplier(scorer);+ return ConstantScoreScorerSupplier.fromIterator(+ TwoPhaseIterator.asDocIdSetIterator(iterator),+ score(),+ scoreMode,+ context.reader().maxDoc());}};}diff --git a/lucene/core/src/java/org/apache/lucene/document/XYDocValuesPointInGeometryQuery.java b/lucene/core/src/java/org/apache/lucene/document/XYDocValuesPointInGeometryQuery.javaindex 132a3a36308..c6e0b41d048 100644--- a/lucene/core/src/java/org/apache/lucene/document/XYDocValuesPointInGeometryQuery.java+++ b/lucene/core/src/java/org/apache/lucene/document/XYDocValuesPointInGeometryQuery.java@@ -25,7 +25,7 @@ import org.apache.lucene.geo.XYGeometry;import org.apache.lucene.index.DocValues;import org.apache.lucene.index.LeafReaderContext;import org.apache.lucene.index.SortedNumericDocValues;-import org.apache.lucene.search.ConstantScoreScorer;+import org.apache.lucene.search.ConstantScoreScorerSupplier;import org.apache.lucene.search.ConstantScoreWeight;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;@@ -130,8 +130,11 @@ public class XYDocValuesPointInGeometryQuery extends Query {return 1000f; // TODO: what should it be?}};- final var scorer = new ConstantScoreScorer(boost, scoreMode, iterator);- return new DefaultScorerSupplier(scorer);+ return ConstantScoreScorerSupplier.fromIterator(+ TwoPhaseIterator.asDocIdSetIterator(iterator),+ boost,+ scoreMode,+ context.reader().maxDoc());}@Override