From 34fcc2ca325f139f2e5db4744f38631fb8510ab0 Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Thu, 5 Jun 2025 14:30:30 +0100 Subject: [PATCH 1/2] Fix lucene_snapshot build - remove XIndexSortSortedNumericDocValuesRangeQuery --- .../java/org/elasticsearch/index/mapper/DateFieldMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java index 9100b11c0026b..b45f99af8309a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -868,7 +868,7 @@ public Query rangeQuery( query = SortedNumericDocValuesField.newSlowRangeQuery(name(), l, u); } if (hasDocValues() && context.indexSortedOnField(name())) { - query = new XIndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query); + query = new IndexSortSortedNumericDocValuesRangeQuery(name(), l, u, query); } return query; } From 1cbfd3637a52a60cc8869220d02aabf9ae4d771e Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Thu, 5 Jun 2025 15:35:54 +0100 Subject: [PATCH 2/2] fix test --- .../org/elasticsearch/index/mapper/DateFieldTypeTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java index 454da5c88e59d..53880ebcef011 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java @@ -412,7 +412,7 @@ public void testRangeQuerySubseconds() throws IOException { Query expected = new IndexOrDocValuesQuery( LongPoint.newRangeQuery("field", instant1, instant2), SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2) - ); + ).rewrite(newSearcher(new MultiReader())); assertEquals(expected, ft.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(newSearcher(new MultiReader()))); MappedFieldType ft2 = new DateFieldType("field", false); @@ -454,7 +454,7 @@ public void testRangeQueryMillis() throws IOException { Query expected = new IndexOrDocValuesQuery( LongPoint.newRangeQuery("field", instant1, instant2), SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2) - ); + ).rewrite(newSearcher(new MultiReader())); assertEquals(expected, ft.rangeQuery(instant1, instant2, true, true, context).rewrite(newSearcher(new MultiReader()))); DateFieldType ft2 = new DateFieldType("field", false); @@ -480,7 +480,7 @@ public void testRangeQueryNanos() throws IOException { Query expected = new IndexOrDocValuesQuery( LongPoint.newRangeQuery("field", instant1, instant2), SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2) - ); + ).rewrite(newSearcher(new MultiReader())); assertEquals(expected, ft.rangeQuery(instant1, instant2, true, true, context).rewrite(newSearcher(new MultiReader()))); DateFieldType ft2 = new DateFieldType("field", false, Resolution.NANOSECONDS);