Update docs/changelog/133309.yaml

Author: shmuelhanoch

docs/changelog/133309.yaml

@@ -0,0 +1,5 @@
+pr: 133309
+summary: support DATE_RANGE field type 
+area: ES|QL
+type: enhancement
+issues: []

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypeResolutions.java

@@ -21,6 +21,7 @@
 import static org.elasticsearch.xpack.esql.core.type.DataType.AGGREGATE_METRIC_DOUBLE;
 import static org.elasticsearch.xpack.esql.core.type.DataType.BOOLEAN;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DATETIME;
+import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_RANGE;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DENSE_VECTOR;
 import static org.elasticsearch.xpack.esql.core.type.DataType.IP;
 import static org.elasticsearch.xpack.esql.core.type.DataType.NULL;
@@ -85,10 +86,10 @@ public static TypeResolution isRepresentableExceptCountersDenseVectorAndAggregat
     ) {
         return isType(
             e,
-            dt -> isRepresentable(dt) && dt != DENSE_VECTOR && dt != AGGREGATE_METRIC_DOUBLE,
+            dt -> isRepresentable(dt) && dt != DENSE_VECTOR && dt != AGGREGATE_METRIC_DOUBLE && dt != DATE_RANGE,
             operationName,
             paramOrd,
-            "any type except counter types, dense_vector, or aggregate_metric_double"
+            "any type except counter types, dense_vector, aggregate_metric_double or date_range"
         );
     }
 
@@ -99,10 +100,14 @@ public static TypeResolution isRepresentableExceptCountersSpatialDenseVectorAndA
     ) {
         return isType(
             e,
-            (t) -> isSpatialOrGrid(t) == false && DataType.isRepresentable(t) && t != DENSE_VECTOR && t != AGGREGATE_METRIC_DOUBLE,
+            (t) -> isSpatialOrGrid(t) == false
+                && DataType.isRepresentable(t)
+                && t != DENSE_VECTOR
+                && t != AGGREGATE_METRIC_DOUBLE
+                && t != DATE_RANGE,
             operationName,
             paramOrd,
-            "any type except counter, spatial types, dense_vector, or aggregate_metric_double"
+            "any type except counter, spatial types, dense_vector, aggregate_metric_double or date_range"
         );
     }
 

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

@@ -33,8 +33,12 @@ public sealed interface DateRangeBlock extends Block permits DateRangeArrayBlock
      * equals method works properly across different implementations of the AggregateMetricDoubleBlock interface.
      */
     static boolean equals(DateRangeBlock lhs, DateRangeBlock rhs) {
-        if (lhs == rhs) return true;
-        if (lhs.getPositionCount() != rhs.getPositionCount()) return false;
+        if (lhs == rhs) {
+            return true;
+        }
+        if (lhs.getPositionCount() != rhs.getPositionCount()) {
+            return false;
+        }
         return LongBlock.equals(lhs.getFromBlock(), rhs.getFromBlock()) && LongBlock.equals(lhs.getToBlock(), rhs.getToBlock());
     }
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolver.java

@@ -289,7 +289,9 @@ private Tuple<ResolvedEnrichPolicy, String> mergeLookupResults(
     // field and then added as a first-class ESQL field type. So in enrichment over clusters it may appear as
     // DATE_RANGE VS UNSUPPORTED, even though it's still the same type.
     private boolean typeMismatch(DataType old, DataType field) {
-        if (old == DataType.DATE_RANGE && field == DataType.UNSUPPORTED) return false;
+        if (old == DataType.DATE_RANGE && field == DataType.UNSUPPORTED) {
+            return false;
+        }
         return old.equals(field) == false;
     }
 

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

@@ -132,7 +132,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/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Count.java

@@ -149,7 +149,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/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDateRangeEvaluator.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.compute.operator.EvalOperator;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter;
 
 public class ToStringFromDateRangeEvaluator extends AbstractConvertFunction.AbstractEvaluator {
     private static final long BASE_RAM_BYTES_USED = RamUsageEstimator.shallowSizeOfInstance(ToStringFromDateRangeEvaluator.class);
@@ -39,7 +40,11 @@ protected Block evalVector(Vector v) {
     }
 
     private static BytesRef evalValue(DateRangeBlock block, int idx) {
-        return new BytesRef((block.getFromBlock().getLong(idx) + ".." + block.getToBlock().getLong(idx)));
+        return new BytesRef(
+            (EsqlDataTypeConverter.dateTimeToString(block.getFromBlock().getLong(idx))
+                + ".."
+                + EsqlDataTypeConverter.dateTimeToString(block.getToBlock().getLong(idx)))
+        );
     }
 
     @Override

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryResponseTests.java

@@ -196,7 +196,8 @@ private ColumnInfoImpl randomColumnInfo() {
                 || t == DataType.TIME_DURATION
                 || t == DataType.PARTIAL_AGG
                 || t == DataType.AGGREGATE_METRIC_DOUBLE
-                || t == DataType.TSID_DATA_TYPE,
+                || t == DataType.TSID_DATA_TYPE
+                || t == DataType.DATE_RANGE,
             () -> randomFrom(DataType.types())
         ).widenSmallNumeric();
         return new ColumnInfoImpl(randomAlphaOfLength(10), type.esType(), randomOriginalTypes());

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -1133,7 +1133,7 @@ public void testAggregateOnCounter() {
         assertThat(
             error("FROM tests | STATS count(network.bytes_out)", tsdb),
             equalTo(
-                "1:20: argument of [count(network.bytes_out)] must be [any type except counter types or dense_vector],"
+                "1:20: argument of [count(network.bytes_out)] must be [any type except counter types, dense_vector or date_range],"
                     + " found value [network.bytes_out] type [counter_long]"
             )
         );

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

@@ -560,6 +560,7 @@ protected static String standardAggregatorName(String prefix, DataType type) {
             case IP -> "Ip";
             case DATETIME, DATE_NANOS, LONG, COUNTER_LONG, UNSIGNED_LONG, GEOHASH, GEOTILE, GEOHEX -> "Long";
             case AGGREGATE_METRIC_DOUBLE -> "AggregateMetricDouble";
+            case DATE_RANGE -> "DateRange";
             case NULL -> "Null";
             default -> throw new UnsupportedOperationException("name for [" + type + "]");
         };