Skip to content

Refactor DocValuesSkipper stat methods to accept IndexReader instead of IndexSearcher #15514

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

Merged
bugmakerrrrrr merged 3 commits into from
Dec 26, 2025
Merged

Refactor DocValuesSkipper stat methods to accept IndexReader instead of IndexSearcher #15514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e387006
Refactor DocValuesSkipper stat methods to accept IndexReader instead …
bugmakerrrrrr Dec 22, 2025
7994ba6
changelog
bugmakerrrrrr Dec 22, 2025
d5f93a1
apply comments
bugmakerrrrrr Dec 23, 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
2 changes: 2 additions & 0 deletions lucene/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ API Changes

* GITHUB#15501: Introduce optional access to backing vector values from the scorer (Chris Hegarty)

* GITHUB#15514: Refactor DocValuesSkipper stat methods to accept IndexReader instead of IndexSearcher (Pan Guixin)

New Features
---------------------
* GITHUB#15328: VectorSimilarityFunction.getValues() now implements doubleVal allowing its
Expand Down
6 changes: 3 additions & 3 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 @@ -93,14 +93,14 @@ public Query rewrite(IndexSearcher indexSearcher) throws IOException {
if (lowerValue > upperValue) {
return MatchNoDocsQuery.INSTANCE;
}
long globalMin = DocValuesSkipper.globalMinValue(indexSearcher, field);
long globalMax = DocValuesSkipper.globalMaxValue(indexSearcher, field);
long globalMin = DocValuesSkipper.globalMinValue(indexSearcher.getIndexReader(), field);
long globalMax = DocValuesSkipper.globalMaxValue(indexSearcher.getIndexReader(), field);
if (lowerValue > globalMax || upperValue < globalMin) {
return MatchNoDocsQuery.INSTANCE;
}
if (lowerValue <= globalMin
&& upperValue >= globalMax
&& DocValuesSkipper.globalDocCount(indexSearcher, field)
&& DocValuesSkipper.globalDocCount(indexSearcher.getIndexReader(), field)
== indexSearcher.getIndexReader().maxDoc()) {
return MatchAllDocsQuery.INSTANCE;
}
Expand Down
19 changes: 9 additions & 10 deletions lucene/core/src/java/org/apache/lucene/index/DocValuesSkipper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import java.io.IOException;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;

/**
* Skipper for {@link DocValues}.
Expand Down Expand Up @@ -128,12 +127,12 @@ public final void advance(long minValue, long maxValue) throws IOException {
* Returns the minimum value for a field across all segments, or {@link Long#MIN_VALUE} if not
* available
*
* @param searcher a searcher over the index
* @param reader the index reader to be queried
* @param field the field to retrieve values for
*/
public static long globalMinValue(IndexSearcher searcher, String field) throws IOException {
public static long globalMinValue(IndexReader reader, String field) throws IOException {
long minValue = Long.MAX_VALUE;
for (LeafReaderContext ctx : searcher.getLeafContexts()) {
for (LeafReaderContext ctx : reader.leaves()) {
if (ctx.reader().getFieldInfos().fieldInfo(field) == null) {
continue; // no field values in this segment, so we can ignore it
}
Expand All @@ -152,12 +151,12 @@ public static long globalMinValue(IndexSearcher searcher, String field) throws I
* Returns the maximum value for a field across all segments, or {@link Long#MIN_VALUE} if not
* available
*
* @param searcher a searcher over the index
* @param reader the index reader to be queried
* @param field the field to retrieve values for
*/
public static long globalMaxValue(IndexSearcher searcher, String field) throws IOException {
public static long globalMaxValue(IndexReader reader, String field) throws IOException {
long maxValue = Long.MIN_VALUE;
for (LeafReaderContext ctx : searcher.getLeafContexts()) {
for (LeafReaderContext ctx : reader.leaves()) {
if (ctx.reader().getFieldInfos().fieldInfo(field) == null) {
continue; // no field values in this segment, so we can ignore it
}
Expand All @@ -175,12 +174,12 @@ public static long globalMaxValue(IndexSearcher searcher, String field) throws I
/**
* Returns the total skipper document count for a field across all segments
*
* @param searcher a searcher over the index
* @param reader the index reader to be queried
* @param field the field to retrieve values for
*/
public static int globalDocCount(IndexSearcher searcher, String field) throws IOException {
public static int globalDocCount(IndexReader reader, String field) throws IOException {
int docCount = 0;
for (LeafReaderContext ctx : searcher.getLeafContexts()) {
for (LeafReaderContext ctx : reader.leaves()) {
DocValuesSkipper skipper = ctx.reader().getDocValuesSkipper(field);
if (skipper != null) {
docCount += skipper.docCount();
Expand Down