Some more fixes for tests

Author: shmuelhanoch

server/src/main/resources/transport/definitions/referable/esql_date_range_created_version.csv

@@ -1 +1 @@
-9192000
+9194000

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

@@ -486,9 +486,21 @@ public DateRangeBlockBuilder newDateRangeBlockBuilder(int estimatedSize) {
     }
 
     public DateRangeBlock newConstantDateRangeBlock(DateRangeBlockBuilder.DateRangeLiteral value, int positions) {
-        var fromBuilder = newConstantLongBlockWith(value.from(), positions);
-        var toBuilder = newConstantLongBlockWith(value.to(), positions);
-        return new DateRangeArrayBlock(fromBuilder, toBuilder);
+        try (var builder = newDateRangeBlockBuilder(positions)) {
+            for (int i = 0; i < positions; i++) {
+                if (value.from() == null) {
+                    builder.from().appendNull();
+                } else {
+                    builder.from().appendLong(value.from());
+                }
+                if (value.to() == null) {
+                    builder.to().appendNull();
+                } else {
+                    builder.to().appendLong(value.to());
+                }
+            }
+            return builder.build();
+        }
     }
 
     public DateRangeBlock newDateRangeBlock(long[] fromValues, long[] toValues, int positions) {

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

@@ -205,7 +205,7 @@ public long ramBytesUsed() {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof DateRangeArrayBlock that) {
+        if (obj instanceof DateRangeBlock that) {
             return DateRangeBlock.equals(this, that);
         }
         return false;

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

@@ -103,8 +103,16 @@ public DateRangeBlockBuilder appendNull() {
     }
 
     public DateRangeBlockBuilder appendDateRange(DateRangeLiteral lit) {
-        fromBuilder.appendLong(lit.from);
-        toBuilder.appendLong(lit.to);
+        if (lit.from == null) {
+            fromBuilder.appendNull();
+        } else {
+            fromBuilder.appendLong(lit.from);
+        }
+        if (lit.to == null) {
+            toBuilder.appendNull();
+        } else {
+            toBuilder.appendLong(lit.to);
+        }
         return this;
     }
 

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/ResultBuilderForDateRange.java

@@ -8,12 +8,9 @@
 package org.elasticsearch.compute.operator.topn;
 
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.compute.data.DateRangeBlockBuilder;
 import org.elasticsearch.compute.data.Block;
 import org.elasticsearch.compute.data.BlockFactory;
-import org.elasticsearch.index.mapper.BlockLoader;
-
-import java.util.List;
+import org.elasticsearch.compute.data.DateRangeBlockBuilder;
 
 public class ResultBuilderForDateRange implements ResultBuilder {
 
@@ -34,8 +31,16 @@ public void decodeValue(BytesRef values) {
         if (count == 0) {
             builder.appendNull();
         } else {
-            builder.from().appendLong(TopNEncoder.DEFAULT_UNSORTABLE.decodeLong(values));
-            builder.to().appendLong(TopNEncoder.DEFAULT_UNSORTABLE.decodeLong(values));
+            if (TopNEncoder.DEFAULT_UNSORTABLE.decodeBoolean(values)) {
+                builder.from().appendLong(TopNEncoder.DEFAULT_UNSORTABLE.decodeLong(values));
+            } else {
+                builder.from().appendNull();
+            }
+            if (TopNEncoder.DEFAULT_UNSORTABLE.decodeBoolean(values)) {
+                builder.to().appendLong(TopNEncoder.DEFAULT_UNSORTABLE.decodeLong(values));
+            } else {
+                builder.to().appendNull();
+            }
         }
     }
 

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/ValueExtractorForDateRange.java

@@ -21,12 +21,17 @@ public class ValueExtractorForDateRange implements ValueExtractor {
     @Override
     public void writeValue(BreakingBytesRefBuilder values, int position) {
         TopNEncoder.DEFAULT_UNSORTABLE.encodeVInt(1, values);
-        if (block.isNull(position)) {
+        if (block.getFromBlock().isNull(position)) {
             TopNEncoder.DEFAULT_UNSORTABLE.encodeBoolean(false, values);
         } else {
             TopNEncoder.DEFAULT_UNSORTABLE.encodeBoolean(true, values);
-            TopNEncoder.DEFAULT_UNSORTABLE.encodeDouble(block.getFromBlock().getLong(position), values);
-            TopNEncoder.DEFAULT_UNSORTABLE.encodeDouble(block.getToBlock().getLong(position), values);
+            TopNEncoder.DEFAULT_UNSORTABLE.encodeLong(block.getFromBlock().getLong(position), values);
+        }
+        if (block.getToBlock().isNull(position)) {
+            TopNEncoder.DEFAULT_UNSORTABLE.encodeBoolean(false, values);
+        } else {
+            TopNEncoder.DEFAULT_UNSORTABLE.encodeBoolean(true, values);
+            TopNEncoder.DEFAULT_UNSORTABLE.encodeLong(block.getToBlock().getLong(position), values);
         }
     }
 

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/topn/ExtractorTests.java

@@ -259,9 +259,11 @@ public static AggregateMetricDoubleLiteral randomAggregateMetricDouble(boolean a
         );
     }
 
-    private static DateRangeBlockBuilder.DateRangeLiteral randomDateRange(boolean isNull) {
+    private static DateRangeBlockBuilder.DateRangeLiteral randomDateRange(boolean haveNulls) {
         var from = randomMillisUpToYear9999();
         var to = randomLongBetween(from + 1, MAX_MILLIS_BEFORE_9999);
-        return isNull ? null : new DateRangeBlockBuilder.DateRangeLiteral(from, to);
+        return haveNulls
+            ? new DateRangeBlockBuilder.DateRangeLiteral(randomBoolean() ? from : null, randomBoolean() ? to : null)
+            : new DateRangeBlockBuilder.DateRangeLiteral(from, to);
     }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Present.java

@@ -138,7 +138,7 @@ protected TypeResolution resolveType() {
             dt -> dt.isCounter() == false && dt != DataType.DENSE_VECTOR && dt != DataType.DATE_RANGE,
             sourceText(),
             DEFAULT,
-            "any type except counter types or dense_vector / date_range"
+            "any type except counter types, dense_vector or date_range"
         );
     }
 }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/PresentErrorTests.java

@@ -43,6 +43,6 @@ protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerP
 
     @Override
     protected void assertNumberOfCheckedSignatures(int checked) {
-        assertThat(checked, equalTo(1));
+        assertThat(checked, equalTo(2));
     }
 }