Some more fixes for tests

shmuelhanoch · shmuelhanoch · commit 6239d5b5448d · 2025-10-11T04:29:05.000+03:00
diff --git a/server/src/main/resources/transport/definitions/referable/esql_date_range_created_version.csv b/server/src/main/resources/transport/definitions/referable/esql_date_range_created_version.csv
@@ -1 +1 @@
-9192000
+9194000
diff --git a/server/src/main/resources/transport/upper_bounds/9.3.csv b/server/src/main/resources/transport/upper_bounds/9.3.csv
@@ -1 +1 @@
-available_processors_in_os_stats,9193000
+esql_date_range_created_version,9194000
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockFactory.java b/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) {
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DateRangeArrayBlock.java b/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;
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DateRangeBlockBuilder.java b/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;
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/ResultBuilderForDateRange.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/ResultBuilderForDateRange.java
@@ -11,9 +11,6 @@
 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;
 
 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();
+            }
         }
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/ValueExtractorForDateRange.java b/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);
         }
     }
 
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/topn/ExtractorTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/topn/ExtractorTests.java
@@ -115,7 +115,7 @@ public static Iterable<Object[]> parameters() {
                     );
                 }
                 case DOC -> cases.add(
-                    new Object[] {
+                    new Object[]{
                         new TestCase(
                             "doc",
                             e,
@@ -128,7 +128,7 @@ public static Iterable<Object[]> parameters() {
                                 blockFactory.newConstantIntBlockWith(randomInt(), 1).asVector(),
                                 randomBoolean() ? null : randomBoolean()
                             ).asBlock()
-                        ) }
+                        )}
                 );
                 case NULL -> {
                 }
@@ -152,13 +152,13 @@ public static Iterable<Object[]> parameters() {
     }
 
     static Object[] valueTestCase(String name, ElementType type, TopNEncoder encoder, Supplier<Object> value) {
-        return new Object[] {
+        return new Object[]{
             new TestCase(
                 name,
                 type,
                 encoder,
                 () -> BlockUtils.fromListRow(TestBlockFactory.getNonBreakingInstance(), Arrays.asList(value.get()))[0]
-            ) };
+            )};
     }
 
     static class TestCase {
@@ -192,6 +192,7 @@ static BreakingBytesRefBuilder nonBreakingBytesRefBuilder() {
 
     public void testNotInKey() {
         Block value = testCase.value.get();
+        System.out.println(testCase.type);
 
         BreakingBytesRefBuilder valuesBuilder = nonBreakingBytesRefBuilder();
         ValueExtractor.extractorFor(testCase.type, testCase.encoder.toUnsortable(), false, value).writeValue(valuesBuilder, 0);
@@ -211,7 +212,12 @@ public void testNotInKey() {
         result.decodeValue(values);
         assertThat(values.length, equalTo(0));
 
-        assertThat(result.build(), equalTo(value));
+        var res = result.build();
+        if (equalTo(value).matches(res)) {
+            System.out.println("value matches");
+        }
+
+        assertThat(res, equalTo(value));
     }
 
     public void testInKey() {
@@ -263,9 +269,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);
     }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Present.java b/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"
         );
     }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/PresentErrorTests.java b/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));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-available_processors_in_os_stats,9193000`
	`1`	`+esql_date_range_created_version,9194000`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public long ramBytesUsed() {`
`205`	`205`
`206`	`206`	`@Override`
`207`	`207`	`public boolean equals(Object obj) {`
`208`		`- if (obj instanceof DateRangeArrayBlock that) {`
	`208`	`+ if (obj instanceof DateRangeBlock that) {`
`209`	`209`	`return DateRangeBlock.equals(this, that);`
`210`	`210`	`}`
`211`	`211`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ protected TypeResolution resolveType() {`
`138`	`138`	`dt -> dt.isCounter() == false && dt != DataType.DENSE_VECTOR && dt != DataType.DATE_RANGE,`
`139`	`139`	`sourceText(),`
`140`	`140`	`DEFAULT,`
`141`		`- "any type except counter types or dense_vector / date_range"`
	`141`	`+ "any type except counter types, dense_vector or date_range"`
`142`	`142`	`);`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerP`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`protected void assertNumberOfCheckedSignatures(int checked) {`
`46`		`- assertThat(checked, equalTo(1));`
	`46`	`+ assertThat(checked, equalTo(2));`
`47`	`47`	`}`
`48`	`48`	`}`