Review fixes

Author: shmuelhanoch

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

@@ -52,6 +52,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import static org.elasticsearch.index.mapper.MappedFieldType.FieldExtractPreference.DOC_VALUES;
 import static org.elasticsearch.index.query.RangeQueryBuilder.GTE_FIELD;
 import static org.elasticsearch.index.query.RangeQueryBuilder.GT_FIELD;
 import static org.elasticsearch.index.query.RangeQueryBuilder.LTE_FIELD;
@@ -369,7 +370,10 @@ public AllReader reader(LeafReaderContext context) throws IOException {
 
         @Override
         public BlockLoader blockLoader(BlockLoaderContext blContext) {
-            if (hasDocValues()) {
+            if (rangeType != RangeType.DATE) {
+                throw new UnsupportedOperationException("loading blocks is only supported for date fields");
+            }
+            if (blContext.fieldExtractPreference() == DOC_VALUES && hasDocValues()) {
                 return new DateRangeDocValuesLoader(name());
             }
             throw new IllegalStateException("Cannot load blocks without doc values");

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

@@ -93,7 +93,7 @@ public static TypeResolution isRepresentableExceptCountersDenseVectorAndAggregat
         );
     }
 
-    public static TypeResolution isRepresentableExceptCountersSpatialDenseVectorAndAggregateMetricDouble(
+    public static TypeResolution isRepresentableExceptUnsortableTypes(
         Expression e,
         String operationName,
         ParamOrdinal paramOrd

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

@@ -503,12 +503,6 @@ public LongRangeBlock newConstantLongRangeBlock(LongRangeBlockBuilder.LongRange
         }
     }
 
-    public LongRangeBlock newLongRangeBlock(long[] fromValues, long[] toValues, int positions) {
-        var from = newLongArrayVector(fromValues, positions).asBlock();
-        var to = newLongArrayVector(toValues, positions).asBlock();
-        return new LongRangeArrayBlock(from, to);
-    }
-
     /**
      * Returns the maximum number of bytes that a Block should be backed by a primitive array before switching to using BigArrays.
      */

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

@@ -11,7 +11,7 @@
 import org.elasticsearch.core.ReleasableIterator;
 
 /**
- * Block that stores aggregate_metric_double values.
+ * Block that stores long ranges.
  */
 public sealed interface LongRangeBlock extends Block permits LongRangeArrayBlock, ConstantNullBlock {
     @Override
@@ -30,7 +30,7 @@ public sealed interface LongRangeBlock extends Block permits LongRangeArrayBlock
      * Returns {@code true} if the given blocks are equal to each other, otherwise {@code false}.
      * Two blocks are considered equal if they have the same position count, and contain the same
      * values (including absent null values) in the same order. This definition ensures that the
-     * equals method works properly across different implementations of the AggregateMetricDoubleBlock interface.
+     * equals method works properly across different implementations of the LongRangeBlock interface.
      */
     static boolean equals(LongRangeBlock lhs, LongRangeBlock rhs) {
         if (lhs == rhs) {

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

@@ -165,7 +165,7 @@ public record LongRange(Long from, Long to) implements GenericNamedWriteable {
         );
 
         public LongRange(StreamInput in) throws IOException {
-            this(in.readOptionalLong(), in.readOptionalLong());
+            this(in.readLong(), in.readLong());
         }
 
         @Override

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

@@ -472,9 +472,7 @@ private static boolean supportedInIndex(DataType t) {
                 // You can't index these - they are just constants.
                 DATE_PERIOD, TIME_DURATION, GEOTILE, GEOHASH, GEOHEX,
                 // TODO fix geo
-                CARTESIAN_POINT, CARTESIAN_SHAPE,
-                // Excluded for now, until a proper workaround
-                DATE_RANGE -> false;
+                CARTESIAN_POINT, CARTESIAN_SHAPE -> false;
             default -> true;
         };
     }

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ages.csv

@@ -1,11 +1,11 @@
 age_range:integer_range, description:keyword
-0..2, Baby
-2..4, Toddler
-3..5, Preschooler
-5..12, Child
-13..20, Adolescent
-20..40, Young Adult
-40..60, Middle-aged
-60..80, Senior
-80..100, Elderly
-100..200, Incredible
+                 0..2  , Baby
+                 2..4  , Toddler
+                 3..5  , Preschooler
+                 5..12 , Child
+                13..20 , Adolescent
+                20..40 , Young Adult
+                40..60 , Middle-aged
+                60..80 , Senior
+                80..100, Elderly
+               100..200, Incredible

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/decades.csv

@@ -1,14 +1,14 @@
-date_range:date_range, decade:integer, description:keyword
-1900-01-01..1910-01-01, 1900, Edwardian Era
-1910-01-01..1920-01-01, 1910, Ragtime Era
-1920-01-01..1930-01-01, 1920, Roaring Twenties
-1930-01-01..1940-01-01, 1930, Dirty Thirties
-1940-01-01..1950-01-01, 1940, Fabulous Forties
-1950-01-01..1960-01-01, 1950, Nifty Fifties
-1960-01-01..1970-01-01, 1960, Swinging Sixties
-1970-01-01..1980-01-01, 1970, Groovy Seventies
-1980-01-01..1990-01-01, 1980, Radical Eighties
-1990-01-01..2000-01-01, 1990, Nineties Nostalgia
-2000-01-01..2010-01-01, 2000, Innovation Explosion Decade
-2010-01-01..2020-01-01, 2010, Renaissance Decade
-2020-01-01..2030-01-01, 2020, Empowerment Era
+ date_range:date_range, decade:integer, description:keyword
+1900-01-01..1910-01-01,           1900, Edwardian Era
+1910-01-01..1920-01-01,           1910, Ragtime Era
+1920-01-01..1930-01-01,           1920, Roaring Twenties
+1930-01-01..1940-01-01,           1930, Dirty Thirties
+1940-01-01..1950-01-01,           1940, Fabulous Forties
+1950-01-01..1960-01-01,           1950, Nifty Fifties
+1960-01-01..1970-01-01,           1960, Swinging Sixties
+1970-01-01..1980-01-01,           1970, Groovy Seventies
+1980-01-01..1990-01-01,           1980, Radical Eighties
+1990-01-01..2000-01-01,           1990, Nineties Nostalgia
+2000-01-01..2010-01-01,           2000, Innovation Explosion Decade
+2010-01-01..2020-01-01,           2010, Renaissance Decade
+2020-01-01..2030-01-01,           2020, Empowerment Era

x-pack/plugin/esql/qa/testFixtures/src/main/resources/date.csv-spec

@@ -2031,7 +2031,7 @@ emp_no:integer | birth_date:date                     | hire_date:date
 
 dateRange
 required_capability: date_range_field_type
-from date_ranges;
+FROM date_ranges;
 
 date_range:date_range  | decade:integer | description:keyword
 1900-01-01..1910-01-01 | 1900           | Edwardian Era

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMax.java

@@ -26,7 +26,7 @@
 import java.util.List;
 
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCountersSpatialDenseVectorAndAggregateMetricDouble;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptUnsortableTypes;
 
 /**
  * Reduce a multivalued field to a single valued field containing the maximum value.
@@ -68,7 +68,7 @@ public String getWriteableName() {
 
     @Override
     protected TypeResolution resolveFieldType() {
-        return isRepresentableExceptCountersSpatialDenseVectorAndAggregateMetricDouble(field(), sourceText(), DEFAULT);
+        return isRepresentableExceptUnsortableTypes(field(), sourceText(), DEFAULT);
     }
 
     @Override