Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,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
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,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
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 @@ -93,6 +94,59 @@ public void testSameHitsAsPointRangeQuery() throws IOException {
}
}

public void testSameHitsAsPointRangeQueryIntSort() throws IOException {
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
Loading