date fields

Author: not-napoleon

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

@@ -20,8 +20,8 @@
  */
 public class DateEsField extends EsField {
 
-    public static DateEsField dateEsField(String name, Map<String, EsField> properties, boolean hasDocValues) {
-        return new DateEsField(name, DataType.DATETIME, properties, hasDocValues, TimeSeriesFieldType.UNKNOWN);
+    public static DateEsField dateEsField(String name, Map<String, EsField> properties, boolean hasDocValues, TimeSeriesFieldType tsType) {
+        return new DateEsField(name, DataType.DATETIME, properties, hasDocValues, tsType);
     }
 
     private DateEsField(

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/LoadMapping.java

@@ -108,7 +108,7 @@ private static void walkMapping(String name, Object value, Map<String, EsField>
                 boolean normalized = Strings.hasText(textSetting(content.get("normalizer"), null));
                 field = new KeywordEsField(name, properties, docValues, length, normalized, false, EsField.TimeSeriesFieldType.NONE);
             } else if (esDataType == DATETIME) {
-                field = DateEsField.dateEsField(name, properties, docValues);
+                field = DateEsField.dateEsField(name, properties, docValues, EsField.TimeSeriesFieldType.NONE);
             } else if (esDataType == UNSUPPORTED) {
                 String type = content.get("type").toString();
                 field = new UnsupportedEsField(name, List.of(type), null, properties);

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

@@ -228,7 +228,7 @@ private static EsField createField(
             return new KeywordEsField(name, new HashMap<>(), aggregatable, length, normalized, isAlias, timeSeriesFieldType);
         }
         if (type == DATETIME) {
-            return DateEsField.dateEsField(name, new HashMap<>(), aggregatable);
+            return DateEsField.dateEsField(name, new HashMap<>(), aggregatable, timeSeriesFieldType);
         }
         if (type == UNSUPPORTED) {
             return unsupported(name, first);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/DateEsFieldTests.java

@@ -14,7 +14,12 @@
 
 public class DateEsFieldTests extends AbstractEsFieldTypeTests<DateEsField> {
     static DateEsField randomDateEsField(int maxPropertiesDepth) {
-        return DateEsField.dateEsField(randomAlphaOfLength(5), randomProperties(maxPropertiesDepth), randomBoolean());
+        return DateEsField.dateEsField(
+            randomAlphaOfLength(5),
+            randomProperties(maxPropertiesDepth),
+            randomBoolean(),
+            randomFrom(EsField.TimeSeriesFieldType.values())
+        );
     }
 
     @Override
@@ -27,12 +32,14 @@ protected DateEsField mutate(DateEsField instance) {
         String name = instance.getName();
         Map<String, EsField> properties = instance.getProperties();
         boolean aggregatable = instance.isAggregatable();
-        switch (between(0, 2)) {
+        EsField.TimeSeriesFieldType tsType = instance.getTimeSeriesFieldType();
+        switch (between(0, 3)) {
             case 0 -> name = randomAlphaOfLength(name.length() + 1);
             case 1 -> properties = randomValueOtherThan(properties, () -> randomProperties(4));
             case 2 -> aggregatable = false == aggregatable;
+            case 3 -> tsType = randomFrom(EsField.TimeSeriesFieldType.values());
             default -> throw new IllegalArgumentException();
         }
-        return DateEsField.dateEsField(name, properties, aggregatable);
+        return DateEsField.dateEsField(name, properties, aggregatable, tsType);
     }
 }