Skip to content

Reusing count() for minor refactor in SortedNumericDocValuesRangeQuery #15123

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+28 −22
Open

Reusing count() for minor refactor in SortedNumericDocValuesRangeQuery #15123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba45f6
Reusing count for minor refactor in SortedNumericDocValuesRangeQuery
jainankitk Aug 25, 2025
92e76a6
Addressing review comments
jainankitk Aug 25, 2025
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
50 changes: 28 additions & 22 deletions lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,16 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
}

int maxDoc = context.reader().maxDoc();
DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
if (skipper != null) {
if (skipper.minValue() > upperValue || skipper.maxValue() < lowerValue) {
return null;
}
if (skipper.docCount() == maxDoc
&& skipper.minValue() >= lowerValue
&& skipper.maxValue() <= upperValue) {

return ConstantScoreScorerSupplier.matchAll(score(), scoreMode, maxDoc);
}
int count = docCount(context);
if (count == 0) {
return null;
} else if (count == 1) {
return ConstantScoreScorerSupplier.matchAll(score(), scoreMode, maxDoc);
}

SortedNumericDocValues values = DocValues.getSortedNumeric(context.reader(), field);
final NumericDocValues singleton = DocValues.unwrapSingleton(values);
final DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
TwoPhaseIterator iterator;
if (singleton != null) {
if (skipper != null) {
Expand Down Expand Up @@ -199,19 +194,30 @@ public float matchCost() {

@Override
public int count(LeafReaderContext context) throws IOException {
DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
if (skipper == null) {
return -1;
}
if (skipper.minValue() > upperValue || skipper.maxValue() < lowerValue) {
return 0;
}
if (skipper.docCount() == context.reader().maxDoc()
&& skipper.minValue() >= lowerValue
&& skipper.maxValue() <= upperValue) {
int cnt = docCount(context);
return switch (cnt) {
case 1 -> context.reader().numDocs();
default -> cnt;
};
}

return context.reader().numDocs();
/* Returning 1 instead of LeafReader#numDocs as it may run in O(maxDoc)
* which is unnecessary when docCount is invoked from ScorerSupplier
*/
private int docCount(LeafReaderContext context) throws IOException {
final DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
if (skipper != null) {
if (skipper.minValue() > upperValue || skipper.maxValue() < lowerValue) {
return 0;
}
if (skipper.docCount() == context.reader().maxDoc()
&& skipper.minValue() >= lowerValue
&& skipper.maxValue() <= upperValue) {

return 1;
}
}

return -1;
}
};
Expand Down
Loading