Basic support for DATE_RANGE field type in ESQL

Author: shmuelhanoch

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

@@ -15,6 +15,7 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.network.InetAddresses;
@@ -63,6 +64,8 @@ public class RangeFieldMapper extends FieldMapper {
     public static final boolean DEFAULT_INCLUDE_UPPER = true;
     public static final boolean DEFAULT_INCLUDE_LOWER = true;
 
+    public static final TransportVersion ESQL_DATE_RANGE_CREATED_VERSION = TransportVersion.fromName("esql_date_range_created_version");
+
     public static class Defaults {
         public static final DateFormatter DATE_FORMATTER = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER;
         public static final Locale LOCALE = DateFieldMapper.DEFAULT_LOCALE;

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

@@ -1 +1 @@
-9185000
+9187000

server/src/main/resources/transport/upper_bounds/9.3.csv

@@ -1 +1 @@
-esql_plan_with_no_columns,9186000
+esql_date_range_created_version,9187000

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataType.java

@@ -33,6 +33,7 @@
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toMap;
+import static org.elasticsearch.index.mapper.RangeFieldMapper.ESQL_DATE_RANGE_CREATED_VERSION;
 
 /**
  * This enum represents data types the ES|QL query processing layer is able to
@@ -270,12 +271,7 @@ public enum DataType implements Writeable {
      * Nanosecond precision date, stored as a 64-bit signed number.
      */
     DATE_NANOS(builder().esType("date_nanos").estimatedSize(Long.BYTES).docValues().supportedOnAllNodes()),
-    DATE_RANGE(
-        builder().esType("date_range")
-            .estimatedSize(2 * Long.BYTES)
-            .docValues()
-            .supportedOn(DataTypesTransportVersions.ESQL_DATE_RANGE_CREATED_VERSION)
-    ),
+    DATE_RANGE(builder().esType("date_range").estimatedSize(2 * Long.BYTES).docValues().supportedOn(ESQL_DATE_RANGE_CREATED_VERSION)),
     /**
      * IP addresses. IPv4 address are always
      * <a href="https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5">embedded</a>
@@ -989,8 +985,5 @@ private static class DataTypesTransportVersions {
             "esql_aggregate_metric_double_created_version"
         );
 
-        private static final TransportVersion ESQL_DATE_RANGE_CREATED_VERSION = TransportVersion.fromName(
-            "esql_date_range_created_version"
-        );
     }
 }

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

@@ -8,7 +8,6 @@
 package org.elasticsearch.compute.data;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.GenericNamedWriteable;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -18,6 +17,8 @@
 
 import java.io.IOException;
 
+import static org.elasticsearch.index.mapper.RangeFieldMapper.ESQL_DATE_RANGE_CREATED_VERSION;
+
 public class DateRangeBlockBuilder extends AbstractBlockBuilder implements BlockLoader.DateRangeBuilder {
 
     private LongBlockBuilder fromBuilder;
@@ -161,7 +162,7 @@ public String getWriteableName() {
 
         @Override
         public TransportVersion getMinimalSupportedVersion() {
-            return TransportVersions.NEW_SEMANTIC_QUERY_INTERCEPTORS;
+            return ESQL_DATE_RANGE_CREATED_VERSION;
         }
 
         @Override

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/AllSupportedFieldsTestCase.java

@@ -448,11 +448,9 @@ private Matcher<?> expectedValue(DataType type) {
                 yield nullValue();
             }
             case DATE_RANGE -> {
-                if (denseVectorAggMetricDoubleIfFns()) {
-                    yield nullValue();
-                }
-                Matcher<String> expected = equalTo("{\"gte\":\"1989-01-01T00:00:00.000Z\",\"lt\":\"2025-01-01T00:00:00.000Z\"}");
-                yield anyOf(nullValue(), expected);
+                // Currently, we cannot tell if all nodes support it or not so we treat it as unsupported.
+                // TODO: Fix this once we know the node versions.
+                yield nullValue();
             }
             default -> throw new AssertionError("unsupported field type [" + type + "]");
         };

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/IndexResolver.java

@@ -94,13 +94,21 @@ public void resolveAsMergedMapping(
             createFieldCapsRequest(indexWildcard, fieldNames, requestFilter, includeAllDimensions),
             listener.delegateFailureAndWrap(
                 (l, response) -> l.onResponse(
-                    mergedMappings(indexWildcard, new FieldsInfo(response, supportsAggregateMetricDouble, supportsDenseVector, supportsDateRange))
+                    mergedMappings(
+                        indexWildcard,
+                        new FieldsInfo(response, supportsAggregateMetricDouble, supportsDenseVector, supportsDateRange)
+                    )
                 )
             )
         );
     }
 
-    public record FieldsInfo(FieldCapabilitiesResponse caps, boolean supportAggregateMetricDouble, boolean supportDenseVector, boolean supportDateRange) {}
+    public record FieldsInfo(
+        FieldCapabilitiesResponse caps,
+        boolean supportAggregateMetricDouble,
+        boolean supportDenseVector,
+        boolean supportDateRange
+    ) {}
 
     // public for testing only
     public static IndexResolution mergedMappings(String indexPattern, FieldsInfo fieldsInfo) {

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

@@ -3807,7 +3807,12 @@ private static LogicalPlan analyzeWithEmptyFieldCapsResponse(String query) throw
         List<FieldCapabilitiesIndexResponse> idxResponses = List.of(
             new FieldCapabilitiesIndexResponse("idx", "idx", Map.of(), true, IndexMode.STANDARD)
         );
-        IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(new FieldCapabilitiesResponse(idxResponses, List.of()), true, true, true);
+        IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(
+            new FieldCapabilitiesResponse(idxResponses, List.of()),
+            true,
+            true,
+            true
+        );
         IndexResolution resolution = IndexResolver.mergedMappings("test*", caps);
         var analyzer = analyzer(resolution, TEST_VERIFIER, configuration(query));
         return analyze(query, analyzer);