Implement docIDRunEnd on new DocValues implementations; fix expectations in range query rewrites

Author: romseygeek

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java

@@ -1304,6 +1304,11 @@ long lookAheadValueAt(int targetDoc) throws IOException {
                     public long longValue() throws IOException {
                         return 0L;  // Only one ordinal!
                     }
+
+                    @Override
+                    public int docIDRunEnd() throws IOException {
+                        return disi.docIDRunEnd();
+                    }
                 };
             }
         } else if (entry.sortedOrdinals != null) {
@@ -1326,6 +1331,11 @@ long lookAheadValueAt(int targetDoc) {
                     public long longValue() {
                         return ordinalsReader.readValueAndAdvance(doc);
                     }
+
+                    @Override
+                    public int docIDRunEnd() throws IOException {
+                        return maxDoc;
+                    }
                 };
             } else {
                 final var disi = new IndexedDISI(

server/src/test/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesFormatTests.java

@@ -34,13 +34,13 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.SortedNumericSortField;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.util.TestUtil;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.index.codec.Elasticsearch900Lucene101Codec;
+import org.elasticsearch.index.codec.Elasticsearch92Lucene103Codec;
 import org.elasticsearch.index.codec.tsdb.ES87TSDBDocValuesFormatTests;
 import org.elasticsearch.index.codec.tsdb.es819.ES819TSDBDocValuesProducer.BaseDenseNumericValues;
 import org.elasticsearch.index.codec.tsdb.es819.ES819TSDBDocValuesProducer.BaseSortedDocValues;
@@ -66,10 +66,7 @@
 
 public class ES819TSDBDocValuesFormatTests extends ES87TSDBDocValuesFormatTests {
 
-<<<<<<< HEAD
-    final Codec codec = TestUtil.alwaysDocValuesFormat(new ES819TSDBDocValuesFormat());
-=======
-    private final Codec codec = new Elasticsearch900Lucene101Codec() {
+    private final Codec codec = new Elasticsearch92Lucene103Codec() {
 
         final ES819TSDBDocValuesFormat docValuesFormat = new ES819TSDBDocValuesFormat(
             ESTestCase.randomIntBetween(1, 4096),
@@ -82,7 +79,6 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
             return docValuesFormat;
         }
     };
->>>>>>> origin/main
 
     @Override
     protected Codec getCodec() {

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

@@ -376,7 +376,7 @@ public void testRangeQuery() throws IOException {
         Query expected2 = SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2);
         assertEquals(
             expected2,
-            ft2.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(newSearcher(new MultiReader()))
+            ft2.rangeQuery(date1, date2, true, true, null, null, null, context)
         );
 
         instant1 = nowInMillis;
@@ -419,7 +419,7 @@ public void testRangeQuerySubseconds() throws IOException {
         Query expected2 = SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2);
         assertEquals(
             expected2,
-            ft2.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(newSearcher(new MultiReader()))
+            ft2.rangeQuery(date1, date2, true, true, null, null, null, context)
         );
 
         instant1 = nowInMillis;
@@ -459,7 +459,7 @@ public void testRangeQueryMillis() throws IOException {
 
         DateFieldType ft2 = new DateFieldType("field", false);
         Query expected2 = SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2);
-        assertEquals(expected2, ft2.rangeQuery(instant1, instant2, true, true, context).rewrite(newSearcher(new MultiReader())));
+        assertEquals(expected2, ft2.rangeQuery(instant1, instant2, true, true, context));
 
         assertIndexUnsearchable(
             Resolution.MILLISECONDS,
@@ -487,7 +487,7 @@ public void testRangeQueryNanos() throws IOException {
         Query expected2 = SortedNumericDocValuesField.newSlowRangeQuery("field", instant1, instant2);
         assertEquals(
             expected2,
-            ft2.rangeQuery(date1, date2, true, true, null, null, null, context).rewrite(newSearcher(new MultiReader()))
+            ft2.rangeQuery(date1, date2, true, true, null, null, null, context)
         );
 
         assertIndexUnsearchable(Resolution.NANOSECONDS, (unsearchable) -> unsearchable.rangeQuery(instant1, instant2, true, true, context));