Skip to content

Commit 724f287

Browse files
authored
Fix lucene_snapshot build - remove XIndexSortSortedNumericDocValuesRangeQuery (#128988)
Remove usage of XIndexSortSortedNumericDocValuesRangeQuery - since we don't need it with Lucene 10.3, and it has been removed from the ES codebase.
1 parent a32bebf commit 724f287

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ public Query rangeQuery(
868868
query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u);
869869
}
870870
if (hasDocValues() && context.indexSortedOnField(name())) {
871-
query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
871+
query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query);
872872
}
873873
return query;
874874
}

server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public void testRangeQuerySubseconds() throws IOException {
412412
Query expected = new IndexOrDocValuesQuery(
413413
LongPoint.newRangeQuery("field", instant1, instant2),
414414
SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2)
415-
);
415+
).rewrite(newSearcher(new MultiReader()));
416416
assertEquals(expected, ft.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(newSearcher(new MultiReader())));
417417

418418
MappedFieldType ft2 = new DateFieldType("field", false);
@@ -454,7 +454,7 @@ public void testRangeQueryMillis() throws IOException {
454454
Query expected = new IndexOrDocValuesQuery(
455455
LongPoint.newRangeQuery("field", instant1, instant2),
456456
SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2)
457-
);
457+
).rewrite(newSearcher(new MultiReader()));
458458
assertEquals(expected, ft.rangeQuery(instant1, instant2, true, true, context).rewrite(newSearcher(new MultiReader())));
459459

460460
DateFieldType ft2 = new DateFieldType("field", false);
@@ -480,7 +480,7 @@ public void testRangeQueryNanos() throws IOException {
480480
Query expected = new IndexOrDocValuesQuery(
481481
LongPoint.newRangeQuery("field", instant1, instant2),
482482
SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2)
483-
);
483+
).rewrite(newSearcher(new MultiReader()));
484484
assertEquals(expected, ft.rangeQuery(instant1, instant2, true, true, context).rewrite(newSearcher(new MultiReader())));
485485

486486
DateFieldType ft2 = new DateFieldType("field", false, Resolution.NANOSECONDS);

0 commit comments

Comments
 (0)