Skip to content

Route doc-values queries through ConstantScoreScorerSupplier #16294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
costin wants to merge 6 commits into
base: main
Choose a base branch
from
+37 −15
Open

Route doc-values queries through ConstantScoreScorerSupplier #16294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd7873c
Route doc-values queries through ConstantScoreScorerSupplier
costin Jun 24, 2026
34f81c8
Update CHANGES.txt
costin Jun 26, 2026
be06d19
Merge branch 'main' into lucene/trivial-scorer-supplier-swaps
costin Jul 2, 2026
1cf3446
Merge branch 'main' into lucene/trivial-scorer-supplier-swaps
costin Jul 4, 2026
5e10431
Merge branch 'main' into lucene/trivial-scorer-supplier-swaps
costin Jul 9, 2026
853029e
Update CHANGES.txt
costin Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lucene/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ Improvements

Optimizations
---------------------

* GITHUG#16280: Single-pass writeString fast path for short strings in ByteBuffersDataOutput (neoremind)

* GITHUB#16146: Speed up no-score filtered-optional Boolean queries by routing dense conjunctions with cached FixedBitSet filters
Expand Down Expand Up @@ -352,6 +353,12 @@ Optimizations
* GITHUB#16370: Sort two-phase iterators by matchCost in DenseConjunctionBulkScorer.
(Alan Woodward)

* 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
---------------------
* GITHUB#16350: Disable bulk-scoring in monitor queries. (Alan Woodward)
Expand Down
9 changes: 6 additions & 3 deletions lucene/core/src/java/org/apache/lucene/document/BinaryRangeFieldRangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
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;
Expand Down Expand Up @@ -135,8 +135,11 @@ public float matchCost() {
}
};

final var scorer = new ConstantScoreScorer(score(), scoreMode, iterator);
return new DefaultScorerSupplier(scorer);
return ConstantScoreScorerSupplier.fromIterator(
TwoPhaseIterator.asDocIdSetIterator(iterator),
score(),
scoreMode,
context.reader().maxDoc());
}

@Override
Expand Down
9 changes: 6 additions & 3 deletions lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesBoxQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
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;
Expand Down Expand Up @@ -153,8 +153,11 @@ public float matchCost() {
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());
}

@Override
Expand Down
9 changes: 6 additions & 3 deletions lucene/core/src/java/org/apache/lucene/document/LatLonDocValuesQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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;
Expand Down Expand Up @@ -158,8 +158,11 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
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());
}

@Override
Expand Down
9 changes: 6 additions & 3 deletions lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesSetQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
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;
Expand Down Expand Up @@ -150,8 +150,11 @@ public float matchCost() {
}
};
}
final var scorer = new ConstantScoreScorer(score(), scoreMode, iterator);
return new DefaultScorerSupplier(scorer);
return ConstantScoreScorerSupplier.fromIterator(
TwoPhaseIterator.asDocIdSetIterator(iterator),
score(),
scoreMode,
context.reader().maxDoc());
}
};
}
Expand Down
9 changes: 6 additions & 3 deletions lucene/core/src/java/org/apache/lucene/document/XYDocValuesPointInGeometryQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
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;
Expand Down Expand Up @@ -130,8 +130,11 @@ public float matchCost() {
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
Expand Down
Loading