DATE_RANGE data type for esql

docs/changelog/133309.yaml

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

docs/reference/query-languages/esql/_snippets/operators/types/is_not_null.md

@@ -13,6 +13,7 @@
 | counter_long | boolean |
 | date | boolean |
 | date_nanos | boolean |
+| date_range | boolean |
 | dense_vector | boolean |
 | double | boolean |
 | geo_point | boolean |

docs/reference/query-languages/esql/_snippets/operators/types/is_null.md

@@ -13,6 +13,7 @@
 | counter_long | boolean |
 | date | boolean |
 | date_nanos | boolean |
+| date_range | boolean |
 | dense_vector | boolean |
 | double | boolean |
 | geo_point | boolean |

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

@@ -672,6 +672,8 @@ interface BlockFactory {
 
         AggregateMetricDoubleBuilder aggregateMetricDoubleBuilder(int count);
 
+        LongRangeBuilder dateRangeBuilder(int count);
+
         Block buildAggregateMetricDoubleDirect(Block minBlock, Block maxBlock, Block sumBlock, Block countBlock);
 
         ExponentialHistogramBuilder exponentialHistogramBlockBuilder(int count);
@@ -840,6 +842,12 @@ interface AggregateMetricDoubleBuilder extends Builder {
         IntBuilder count();
     }
 
+    interface LongRangeBuilder extends Builder {
+        LongBuilder from();
+
+        LongBuilder to();
+    }
+
     interface ExponentialHistogramBuilder extends Builder {
         DoubleBuilder minima();
 

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

@@ -9,10 +9,13 @@
 
 package org.elasticsearch.index.mapper;
 
+import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Query;
 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;
@@ -28,6 +31,7 @@
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.fielddata.plain.BinaryIndexFieldData;
+import org.elasticsearch.index.mapper.blockloader.docvalues.BlockDocValuesReader;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.DocValueFormat;
@@ -61,6 +65,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_LONG_RANGES = TransportVersion.fromName("esql_long_ranges");
+
     public static class Defaults {
         public static final DateFormatter DATE_FORMATTER = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER;
         public static final Locale LOCALE = DateFieldMapper.DEFAULT_LOCALE;
@@ -342,6 +348,97 @@ public Query rangeQuery(
                 context
             );
         }
+
+        public static class DateRangeDocValuesLoader extends BlockDocValuesReader.DocValuesBlockLoader {
+            private final String fieldName;
+
+            public DateRangeDocValuesLoader(String fieldName) {
+                this.fieldName = fieldName;
+            }
+
+            @Override
+            public Builder builder(BlockFactory factory, int expectedCount) {
+                return factory.dateRangeBuilder(expectedCount);
+            }
+
+            @Override
+            public AllReader reader(LeafReaderContext context) throws IOException {
+                var docValues = context.reader().getBinaryDocValues(fieldName);
+                return new DateRangeDocValuesReader(docValues);
+            }
+        }
+
+        @Override
+        public BlockLoader blockLoader(BlockLoaderContext blContext) {
+            if (rangeType != RangeType.DATE) {
+                throw new UnsupportedOperationException("loading blocks is only supported for date fields");
+            }
+            if (hasDocValues()) {
+                return new DateRangeDocValuesLoader(name());
+            }
+            throw new IllegalStateException("Cannot load blocks without doc values");
+        }
+    }
+
+    public static class DateRangeDocValuesReader extends BlockDocValuesReader {
+        private final BinaryDocValues numericDocValues;
+
+        public DateRangeDocValuesReader(BinaryDocValues numericDocValues) {
+            this.numericDocValues = numericDocValues;
+        }
+
+        private int docId = -1;
+
+        @Override
+        protected int docId() {
+            return docId;
+        }
+
+        @Override
+        public String toString() {
+            return "BlockDocValuesReader.DateRangeDocValuesReader";
+        }
+
+        @Override
+        public BlockLoader.Block read(BlockLoader.BlockFactory factory, BlockLoader.Docs docs, int offset, boolean nullsFiltered)
+            throws IOException {
+            try (BlockLoader.LongRangeBuilder builder = factory.dateRangeBuilder(docs.count() - offset)) {
+                int lastDoc = -1;
+                for (int i = offset; i < docs.count(); i++) {
+                    int doc = docs.get(i);
+                    if (doc < lastDoc) {
+                        throw new IllegalStateException("docs within same block must be in order");
+                    }
+                    if (false == numericDocValues.advanceExact(doc)) {
+                        builder.appendNull();
+                    } else {
+                        BytesRef ref = numericDocValues.binaryValue();
+                        var ranges = BinaryRangeUtil.decodeLongRanges(ref);
+                        for (var range : ranges) {
+                            lastDoc = doc;
+                            this.docId = doc;
+                            builder.from().appendLong((long) range.from);
+                            builder.to().appendLong((long) range.to);
+                        }
+                    }
+                }
+                return builder.build();
+            }
+        }
+
+        @Override
+        public void read(int doc, BlockLoader.StoredFields storedFields, BlockLoader.Builder builder) throws IOException {
+            var blockBuilder = (BlockLoader.LongRangeBuilder) builder;
+            this.docId = doc;
+            if (false == numericDocValues.advanceExact(doc)) {
+                blockBuilder.appendNull();
+            } else {
+                var range = BinaryRangeUtil.decodeLongRanges(numericDocValues.binaryValue());
+                assert range.size() == 1 : "stored fields should only have a single range";
+                blockBuilder.from().appendLong((long) range.getFirst().from);
+                blockBuilder.to().appendLong((long) range.getFirst().to);
+            }
+        }
     }
 
     private final RangeType type;

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

@@ -0,0 +1 @@
+9232000

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

@@ -1 +1 @@
-esql_use_minimum_version_for_enrich_resolution,9231000
+esql_long_ranges,9232000

test/framework/src/main/java/org/elasticsearch/index/mapper/TestBlock.java

@@ -479,6 +479,11 @@ public BlockLoader.AggregateMetricDoubleBuilder aggregateMetricDoubleBuilder(int
                 return new AggregateMetricDoubleBlockBuilder(expectedSize);
             }
 
+            @Override
+            public BlockLoader.LongRangeBuilder dateRangeBuilder(int expectedSize) {
+                return new LongRangeBuilder(expectedSize);
+            }
+
             @Override
             public BlockLoader.Block buildAggregateMetricDoubleDirect(
                 BlockLoader.Block minBlock,
@@ -901,4 +906,68 @@ public BlockLoader.BytesRefBuilder encodedHistograms() {
             return encodedHistograms;
         }
     }
+
+    public static class LongRangeBuilder implements BlockLoader.LongRangeBuilder {
+        private final LongBuilder from;
+        private final LongBuilder to;
+
+        LongRangeBuilder(int expectedSize) {
+            from = new LongBuilder(expectedSize);
+            to = new LongBuilder(expectedSize);
+        }
+
+        @Override
+        public BlockLoader.LongBuilder from() {
+            return from;
+        }
+
+        @Override
+        public BlockLoader.LongBuilder to() {
+            return to;
+        }
+
+        @Override
+        public BlockLoader.Block build() {
+            var fromBlock = from.build();
+            var toBlock = to.build();
+            assert fromBlock.size() == toBlock.size();
+            var values = new ArrayList<>(fromBlock.size());
+            for (int i = 0; i < fromBlock.size(); i++) {
+                values.add(List.of(fromBlock.values.get(i), toBlock.values.get(i)));
+            }
+            return new TestBlock(values);
+        }
+
+        @Override
+        public BlockLoader.Builder appendNull() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BlockLoader.Builder beginPositionEntry() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public BlockLoader.Builder endPositionEntry() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void close() {
+
+        }
+
+        private static class LongBuilder extends TestBlock.Builder implements BlockLoader.LongBuilder {
+            private LongBuilder(int expectedSize) {
+                super(expectedSize);
+            }
+
+            @Override
+            public BlockLoader.LongBuilder appendLong(long value) {
+                add(value);
+                return this;
+            }
+        }
+    };
 }

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;
@@ -86,24 +87,24 @@ 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"
         );
     }
 
-    public static TypeResolution isRepresentableExceptCountersSpatialDenseVectorAndAggregateMetricDouble(
-        Expression e,
-        String operationName,
-        ParamOrdinal paramOrd
-    ) {
+    public static TypeResolution isRepresentableExceptUnsortableTypes(Expression e, String operationName, ParamOrdinal paramOrd) {
         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-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataType.java

@@ -272,6 +272,10 @@ 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()),
+    /**
+     * Represents a half-inclusive range between two dates.
+     */
+    DATE_RANGE(builder().esType("date_range").estimatedSize(2 * Long.BYTES).docValues().underConstruction()),
     /**
      * IP addresses. IPv4 address are always
      * <a href="https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5">embedded</a>
@@ -997,5 +1001,6 @@ public static class DataTypesTransportVersions {
         public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_CREATED_VERSION = TransportVersion.fromName(
             "esql_aggregate_metric_double_created_version"
         );
+
     }
 }

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

@@ -535,6 +535,28 @@ public final AggregateMetricDoubleBlock newAggregateMetricDoubleBlock(
         return new AggregateMetricDoubleArrayBlock(min, max, sum, count);
     }
 
+    public LongRangeBlockBuilder newLongRangeBlockBuilder(int estimatedSize) {
+        return new LongRangeBlockBuilder(estimatedSize, this);
+    }
+
+    public LongRangeBlock newConstantLongRangeBlock(LongRangeBlockBuilder.LongRange value, int positions) {
+        try (var builder = newLongRangeBlockBuilder(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();
+        }
+    }
+
     /**
      * Returns the maximum number of bytes that a Block should be backed by a primitive array before switching to using BigArrays.
      */