more

Author: dnhatn

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

@@ -1403,14 +1403,8 @@ public BlockLoader.Block tryRead(
                     boolean nullsFiltered,
                     BlockDocValuesReader.ToDouble toDouble
                 ) throws IOException {
-                    if (toDouble != null) {
-                        try (BlockLoader.SingletonDoubleBuilder builder = factory.singletonDoubles(docs.count() - offset)) {
-                            SingletonLongToDoubleDelegate delegate = new SingletonLongToDoubleDelegate(builder, toDouble);
-                            return tryRead(delegate, docs, offset);
-                        }
-                    }
-                    try (BlockLoader.SingletonLongBuilder builder = factory.singletonLongs(docs.count() - offset)) {
-                        return tryRead(builder, docs, offset);
+                    try (var longs = singletonLongs(factory, toDouble, docs.count() - offset)) {
+                        return tryRead(longs, docs, offset);
                     }
                 }
 
@@ -1564,9 +1558,8 @@ public BlockLoader.Block tryRead(
                     if (valueCount != docs.count()) {
                         return null;
                     }
-                    try (var doubles = factory.singletonDoubles(valueCount)) {
-                        var longs = new SingletonLongToDoubleDelegate(doubles, toDouble);
-                        for (int i = 0; i < valueCount; ) {
+                    try (var longs = singletonLongs(factory, toDouble, valueCount)) {
+                        for (int i = 0; i < valueCount;) {
                             final int index = firstIndex + i;
                             final int blockIndex = index >>> ES819TSDBDocValuesFormat.NUMERIC_BLOCK_SHIFT;
                             final int blockStartIndex = index & ES819TSDBDocValuesFormat.NUMERIC_BLOCK_MASK;
@@ -1583,7 +1576,7 @@ public BlockLoader.Block tryRead(
                             longs.appendLongs(currentBlock, blockStartIndex, count);
                             i += count;
                         }
-                        return doubles.build();
+                        return longs.build();
                     }
                 }
             };
@@ -1881,6 +1874,18 @@ public BlockLoader.Builder endPositionEntry() {
         public void close() {}
     }
 
+    static BlockLoader.SingletonLongBuilder singletonLongs(
+        BlockLoader.BlockFactory factory,
+        BlockDocValuesReader.ToDouble toDouble,
+        int valueCount
+    ) {
+        if (toDouble != null) {
+            return new SingletonLongToDoubleDelegate(factory.singletonDoubles(valueCount), toDouble);
+        } else {
+            return factory.singletonLongs(valueCount);
+        }
+    }
+
     // Block builder that consumes long values and converts them to double using the provided converter function.
     static final class SingletonLongToDoubleDelegate implements BlockLoader.SingletonLongBuilder {
         private final BlockLoader.SingletonDoubleBuilder doubleBuilder;
@@ -1929,7 +1934,9 @@ public BlockLoader.Builder endPositionEntry() {
         }
 
         @Override
-        public void close() {}
+        public void close() {
+            doubleBuilder.close();
+        }
     }
 
 }

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/SingletonLongBuilder.java

@@ -65,6 +65,9 @@ public long estimatedBytes() {
 
     @Override
     public Block build() {
+        if (values.length != count) {
+            throw new IllegalStateException("expected [" + values.length + "] values but got [" + count + "]");
+        }
         return blockFactory.newLongArrayVector(values, count).asBlock();
     }