keyword fields

Author: not-napoleon

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

@@ -10,7 +10,6 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 
@@ -26,23 +25,16 @@ public class KeywordEsField extends EsField {
     private final int precision;
     private final boolean normalized;
 
-    public KeywordEsField(String name) {
-        this(name, Collections.emptyMap(), true, Short.MAX_VALUE, false);
-    }
-
-    public KeywordEsField(String name, Map<String, EsField> properties, boolean hasDocValues, int precision, boolean normalized) {
-        this(name, properties, hasDocValues, precision, normalized, false);
-    }
-
     public KeywordEsField(
         String name,
         Map<String, EsField> properties,
         boolean hasDocValues,
         int precision,
         boolean normalized,
-        boolean isAlias
+        boolean isAlias,
+        TimeSeriesFieldType timeSeriesFieldType
     ) {
-        this(name, KEYWORD, properties, hasDocValues, precision, normalized, isAlias, TimeSeriesFieldType.UNKNOWN);
+        this(name, KEYWORD, properties, hasDocValues, precision, normalized, isAlias, timeSeriesFieldType);
     }
 
     protected KeywordEsField(

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

@@ -9,6 +9,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 
 import java.io.IOException;
+import java.util.Collections;
 
 /**
  * This class is used as a marker for fields that may be unmapped, where an unmapped field is a field which exists in the _source but is not
@@ -17,7 +18,7 @@
  */
 public class PotentiallyUnmappedKeywordEsField extends KeywordEsField {
     public PotentiallyUnmappedKeywordEsField(String name) {
-        super(name);
+        super(name, Collections.emptyMap(), true, Short.MAX_VALUE, false, false, TimeSeriesFieldType.UNKNOWN);
     }
 
     public PotentiallyUnmappedKeywordEsField(StreamInput in) throws IOException {

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

@@ -106,7 +106,7 @@ private static void walkMapping(String name, Object value, Map<String, EsField>
             } else if (esDataType == KEYWORD) {
                 int length = intSetting(content.get("ignore_above"), Short.MAX_VALUE);
                 boolean normalized = Strings.hasText(textSetting(content.get("normalizer"), null));
-                field = new KeywordEsField(name, properties, docValues, length, normalized);
+                field = new KeywordEsField(name, properties, docValues, length, normalized, false, EsField.TimeSeriesFieldType.NONE);
             } else if (esDataType == DATETIME) {
                 field = DateEsField.dateEsField(name, properties, docValues);
             } else if (esDataType == UNSUPPORTED) {

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

@@ -225,7 +225,7 @@ private static EsField createField(
             int length = Short.MAX_VALUE;
             // TODO: to check whether isSearchable/isAggregateable takes into account the presence of the normalizer
             boolean normalized = false;
-            return new KeywordEsField(name, new HashMap<>(), aggregatable, length, normalized, isAlias);
+            return new KeywordEsField(name, new HashMap<>(), aggregatable, length, normalized, isAlias, timeSeriesFieldType);
         }
         if (type == DATETIME) {
             return DateEsField.dateEsField(name, new HashMap<>(), aggregatable);

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

@@ -21,7 +21,8 @@ static KeywordEsField randomKeywordEsField(int maxPropertiesDepth) {
         int precision = randomInt();
         boolean normalized = randomBoolean();
         boolean isAlias = randomBoolean();
-        return new KeywordEsField(name, properties, hasDocValues, precision, normalized, isAlias);
+        EsField.TimeSeriesFieldType tsType = randomFrom(EsField.TimeSeriesFieldType.values());
+        return new KeywordEsField(name, properties, hasDocValues, precision, normalized, isAlias, tsType);
     }
 
     @Override
@@ -37,15 +38,17 @@ protected KeywordEsField mutate(KeywordEsField instance) {
         int precision = instance.getPrecision();
         boolean normalized = instance.getNormalized();
         boolean isAlias = instance.isAlias();
-        switch (between(0, 5)) {
+        EsField.TimeSeriesFieldType tsType = instance.getTimeSeriesFieldType();
+        switch (between(0, 6)) {
             case 0 -> name = randomAlphaOfLength(name.length() + 1);
             case 1 -> properties = randomValueOtherThan(properties, () -> randomProperties(4));
             case 2 -> hasDocValues = false == hasDocValues;
             case 3 -> precision = randomValueOtherThan(precision, ESTestCase::randomInt);
             case 4 -> normalized = false == normalized;
             case 5 -> isAlias = false == isAlias;
+            case 6 -> tsType = randomValueOtherThan(tsType, () -> randomFrom(EsField.TimeSeriesFieldType.values()));
             default -> throw new IllegalArgumentException();
         }
-        return new KeywordEsField(name, properties, hasDocValues, precision, normalized, isAlias);
+        return new KeywordEsField(name, properties, hasDocValues, precision, normalized, isAlias, tsType);
     }
 }