Skip to content

Fix IndexSortSortedNumericDocValuesRangeQuery for int sort #14732

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
mayya-sharipova merged 2 commits into from
May 30, 2025
Merged

Fix IndexSortSortedNumericDocValuesRangeQuery for int sort #14732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eaf3a7
Fix IndexSortSortedNumericDocValuesRangeQuery for int sort
mayya-sharipova May 29, 2025
7f07296
Add change for 9.12 bug fix
mayya-sharipova May 30, 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 @@ -1001,6 +1001,8 @@ Bug Fixes

* GITHUB#13799: Disable intra-merge parallelism for all structures but kNN vectors. (Ben Trent)

* GITHUB##14732: Fix IndexSortSortedNumericDocValuesRangeQuery for int sort (Mayya Sharipova)

Build
---------------------

Expand Down
5 changes: 3 additions & 2 deletions lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ public int count(LeafReaderContext context) throws IOException {
// The index sort optimization is only supported for Type.INT and Type.LONG
if (sortFieldType == Type.INT || sortFieldType == Type.LONG) {
Object missingValue = sortField.getMissingValue();
final long missingLongValue = missingValue == null ? 0L : (long) missingValue;
final long missingLongValue =
missingValue == null ? 0L : ((Number) missingValue).longValue();
// all documents have docValues or missing value falls outside the range
if ((pointValues != null && pointValues.getDocCount() == reader.maxDoc())
|| (missingLongValue < lowerValue || missingLongValue > upperValue)) {
Expand Down Expand Up @@ -612,7 +613,7 @@ private IteratorAndCount getDocIdSetIterator(
Object missingValue = sortField.getMissingValue();
LeafReader reader = context.reader();
PointValues pointValues = reader.getPointValues(field);
final long missingLongValue = missingValue == null ? 0L : (long) missingValue;
final long missingLongValue = missingValue == null ? 0L : ((Number) missingValue).longValue();
// all documents have docValues or missing value falls outside the range
if ((pointValues != null && pointValues.getDocCount() == reader.maxDoc())
|| (missingLongValue < lowerValue || missingLongValue > upperValue)) {
Expand Down
54 changes: 54 additions & 0 deletions ...core/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntPoint;
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.StringField;
Expand Down Expand Up @@ -94,6 +95,59 @@ public void testSameHitsAsPointRangeQuery() throws IOException {
}
}

public void testSameHitsAsPointRangeQueryIntSort() throws IOException {
Copy link
Contributor Author

@mayya-sharipova mayya-sharipova May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy of the previous testSameHitsAsPointRangeQuery() but on Integer sort.

final int iters = atLeast(10);
for (int iter = 0; iter < iters; ++iter) {
Directory dir = newDirectory();

IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
boolean reverse = random().nextBoolean();
SortField sortField = new SortedNumericSortField("dv", SortField.Type.INT, reverse);
boolean enableMissingValue = random().nextBoolean();
if (enableMissingValue) {
int missingValue =
random().nextBoolean()
? TestUtil.nextInt(random(), -100, 10000)
: (random().nextBoolean() ? Integer.MIN_VALUE : Integer.MAX_VALUE);
sortField.setMissingValue(missingValue);
}
iwc.setIndexSort(new Sort(sortField));

RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);

final int numDocs = atLeast(100);
for (int i = 0; i < numDocs; ++i) {
Document doc = new Document();
final int numValues = TestUtil.nextInt(random(), 0, 1);
for (int j = 0; j < numValues; ++j) {
final int value = TestUtil.nextInt(random(), -100, 10000);
doc.add(new SortedNumericDocValuesField("dv", value));
doc.add(new IntPoint("idx", value));
}
iw.addDocument(doc);
}
if (random().nextBoolean()) {
iw.deleteDocuments(IntPoint.newRangeQuery("idx", 0, 10));
}
final IndexReader reader = iw.getReader();
final IndexSearcher searcher = newSearcher(reader);
iw.close();

for (int i = 0; i < 100; ++i) {
final int min =
random().nextBoolean() ? Integer.MIN_VALUE : TestUtil.nextInt(random(), -100, 10000);
final int max =
random().nextBoolean() ? Integer.MAX_VALUE : TestUtil.nextInt(random(), -100, 10000);
final Query q1 = IntPoint.newRangeQuery("idx", min, max);
final Query q2 = createQuery("dv", min, max);
assertSameHits(searcher, q1, q2, false);
}

reader.close();
dir.close();
}
}

private static void assertSameHits(IndexSearcher searcher, Query q1, Query q2, boolean scores)
throws IOException {
final int maxDoc = searcher.getIndexReader().maxDoc();
Expand Down