add tests

Author: kkrik-es

docs/changelog/133397.yaml

@@ -1,5 +1,5 @@
 pr: 133397
 summary: Push down loading of singleton dense double based field types to the …
-area: "Compute Engine, Codec"
+area: "Codec"
 type: enhancement
 issues: []

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java

@@ -78,6 +78,11 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         checker.registerUpdateCheck(b -> b.field("coerce", false), m -> assertFalse(((ScaledFloatFieldMapper) m).coerce()));
     }
 
+    @Override
+    protected boolean supportsBulkDoubleBlockReading() {
+        return true;
+    }
+
     public void testExistsQueryDocValuesDisabled() throws IOException {
         MapperService mapperService = createMapperService(fieldMapping(b -> {
             minimalMapping(b);

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

@@ -122,7 +122,12 @@ public AllReader reader(LeafReaderContext context) throws IOException {
         }
     }
 
-    static class SingletonLongs extends BlockDocValuesReader {
+    // Used for testing.
+    interface NumericDocValuesAccessor {
+        NumericDocValues numericDocValues();
+    }
+
+    static class SingletonLongs extends BlockDocValuesReader implements NumericDocValuesAccessor {
         final NumericDocValues numericDocValues;
 
         SingletonLongs(NumericDocValues numericDocValues) {
@@ -169,6 +174,11 @@ public int docId() {
         public String toString() {
             return "BlockDocValuesReader.SingletonLongs";
         }
+
+        @Override
+        public NumericDocValues numericDocValues() {
+            return numericDocValues;
+        }
     }
 
     static class Longs extends BlockDocValuesReader {
@@ -387,7 +397,7 @@ public AllReader reader(LeafReaderContext context) throws IOException {
         }
     }
 
-    private static class SingletonDoubles extends BlockDocValuesReader {
+    static class SingletonDoubles extends BlockDocValuesReader implements NumericDocValuesAccessor {
         private final NumericDocValues docValues;
         private final ToDouble toDouble;
 
@@ -436,9 +446,14 @@ public int docId() {
         public String toString() {
             return "BlockDocValuesReader.SingletonDoubles";
         }
+
+        @Override
+        public NumericDocValues numericDocValues() {
+            return docValues;
+        }
     }
 
-    private static class Doubles extends BlockDocValuesReader {
+    static class Doubles extends BlockDocValuesReader {
         private final SortedNumericDocValues docValues;
         private final ToDouble toDouble;
 

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

@@ -804,7 +804,7 @@ public void testLegacyDateFormatName() {
 
     }
 
-    protected boolean supportsBulkBlockReading() {
+    protected boolean supportsBulkLongBlockReading() {
         return true;
     }
 

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

@@ -74,6 +74,11 @@ protected Number randomNumber() {
         return randomBoolean() ? randomDoubleBetween(-Double.MAX_VALUE, Double.MAX_VALUE, true) : randomFloat();
     }
 
+    @Override
+    protected boolean supportsBulkDoubleBlockReading() {
+        return true;
+    }
+
     public void testScriptAndPrecludedParameters() {
         {
             Exception e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(fieldMapping(b -> {

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

@@ -49,6 +49,11 @@ protected Number randomNumber() {
         return randomBoolean() ? randomDoubleBetween(-Float.MAX_VALUE, Float.MAX_VALUE, true) : randomFloat();
     }
 
+    @Override
+    protected boolean supportsBulkDoubleBlockReading() {
+        return true;
+    }
+
     @Override
     protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed) {
         return new NumberSyntheticSourceSupport(Number::floatValue, ignoreMalformed);

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

@@ -68,4 +68,9 @@ protected SyntheticSourceSupport syntheticSourceSupportForKeepTests(boolean igno
     protected IngestScriptSupport ingestScriptSupport() {
         throw new AssumptionViolatedException("not supported");
     }
+
+    @Override
+    protected boolean supportsBulkDoubleBlockReading() {
+        return true;
+    }
 }

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

@@ -161,7 +161,7 @@ public void execute() {
         };
     }
 
-    protected boolean supportsBulkBlockReading() {
+    protected boolean supportsBulkLongBlockReading() {
         return true;
     }
 

test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java

@@ -1500,7 +1500,11 @@ public void testSyntheticSourceKeepArrays() throws IOException {
         assertThat(actual, equalTo(expected));
     }
 
-    protected boolean supportsBulkBlockReading() {
+    protected boolean supportsBulkLongBlockReading() {
+        return false;
+    }
+
+    protected boolean supportsBulkDoubleBlockReading() {
         return false;
     }
 
@@ -1513,7 +1517,18 @@ protected Object[] getThreeEncodedSampleValues() {
     }
 
     public void testSingletonLongBulkBlockReading() throws IOException {
-        assumeTrue("field type supports bulk singleton long reading", supportsBulkBlockReading());
+        assumeTrue("field type supports bulk singleton long reading", supportsBulkLongBlockReading());
+        testSingletonBulkBlockReading(columnAtATimeReader -> (BlockDocValuesReader.SingletonLongs) columnAtATimeReader);
+    }
+
+    public void testSingletonDoubleBulkBlockReading() throws IOException {
+        assumeTrue("field type supports bulk singleton long reading", supportsBulkDoubleBlockReading());
+        testSingletonBulkBlockReading(columnAtATimeReader -> (BlockDocValuesReader.SingletonDoubles) columnAtATimeReader);
+    }
+
+    private void testSingletonBulkBlockReading(Function<BlockLoader.ColumnAtATimeReader, BlockDocValuesReader> readerCast)
+        throws IOException {
+        assumeTrue("field type supports bulk singleton long reading", supportsBulkLongBlockReading());
         var settings = indexSettings(IndexVersion.current(), 1, 1).put("index.mode", "logsdb").build();
         var mapperService = createMapperService(settings, fieldMapping(this::minimalMapping));
         var mapper = mapperService.documentMapper();
@@ -1539,8 +1554,11 @@ public void testSingletonLongBulkBlockReading() throws IOException {
                 assertThat(reader.numDocs(), equalTo(3));
                 LeafReaderContext context = reader.leaves().get(0);
                 var blockLoader = mapperService.fieldType("field").blockLoader(mockBlockContext);
-                var columnReader = (BlockDocValuesReader.SingletonLongs) blockLoader.columnAtATimeReader(context);
-                assertThat(columnReader.numericDocValues, instanceOf(BlockLoader.OptionalColumnAtATimeReader.class));
+                BlockDocValuesReader columnReader = readerCast.apply(blockLoader.columnAtATimeReader(context));
+                assertThat(
+                    ((BlockDocValuesReader.NumericDocValuesAccessor) columnReader).numericDocValues(),
+                    instanceOf(BlockLoader.OptionalColumnAtATimeReader.class)
+                );
                 var docBlock = TestBlock.docs(IntStream.range(0, 3).toArray());
                 var block = (TestBlock) columnReader.read(TestBlock.factory(), docBlock, 0, false);
                 for (int i = 0; i < block.size(); i++) {
@@ -1564,8 +1582,11 @@ public void testSingletonLongBulkBlockReading() throws IOException {
                 assertThat(reader.numDocs(), equalTo(3));
                 LeafReaderContext context = reader.leaves().get(0);
                 var blockLoader = mapperService.fieldType("field").blockLoader(mockBlockContext);
-                var columnReader = (BlockDocValuesReader.SingletonLongs) blockLoader.columnAtATimeReader(context);
-                assertThat(columnReader.numericDocValues, not(instanceOf(BlockLoader.OptionalColumnAtATimeReader.class)));
+                BlockDocValuesReader columnReader = readerCast.apply(blockLoader.columnAtATimeReader(context));
+                assertThat(
+                    ((BlockDocValuesReader.NumericDocValuesAccessor) columnReader).numericDocValues(),
+                    not(instanceOf(BlockLoader.OptionalColumnAtATimeReader.class))
+                );
                 var docBlock = TestBlock.docs(IntStream.range(0, 3).toArray());
                 var block = (TestBlock) columnReader.read(TestBlock.factory(), docBlock, 0, false);
                 assertThat(block.get(0), equalTo(expectedSampleValues[0]));
@@ -1595,7 +1616,10 @@ public void testSingletonLongBulkBlockReading() throws IOException {
                 LeafReaderContext context = reader.leaves().get(0);
                 var blockLoader = mapperService.fieldType("field").blockLoader(mockBlockContext);
                 var columnReader = blockLoader.columnAtATimeReader(context);
-                assertThat(columnReader, instanceOf(BlockDocValuesReader.Longs.class));
+                assertThat(
+                    columnReader,
+                    anyOf(instanceOf(BlockDocValuesReader.Longs.class), instanceOf(BlockDocValuesReader.Doubles.class))
+                );
                 var docBlock = TestBlock.docs(IntStream.range(0, 3).toArray());
                 var block = (TestBlock) columnReader.read(TestBlock.factory(), docBlock, 0, false);
                 assertThat(block.get(0), equalTo(expectedSampleValues[0]));

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockUtils.java

@@ -254,14 +254,6 @@ private static Block constantBlock(BlockFactory blockFactory, ElementType type,
      */
     public record Doc(int shard, int segment, int doc) {}
 
-    /**
-     * Functional interface to convert a long value to a double.
-     */
-    @FunctionalInterface
-    public interface ToDouble {
-        double convert(long v);
-    }
-
     /**
      * Read all values from a positions into a java object. This is not fast
      * but fine to call in the "fold" path.