Skip to content

Commit 3397960

Browse files
committed
explicit metadata type
1 parent 001047d commit 3397960

File tree

9 files changed

+28
-12
lines changed

9 files changed

+28
-12
lines changed

x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/util/TestUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ public static FieldAttribute fieldAttribute() {
5454
}
5555

5656
public static FieldAttribute fieldAttribute(String name, DataType type) {
57-
return new FieldAttribute(EMPTY, name, new EsField(name, type, emptyMap(), randomBoolean()));
57+
return new FieldAttribute(EMPTY, name, new EsField(name, type, emptyMap(), randomBoolean(), EsField.TimeSeriesFieldType.NONE));
5858
}
5959

6060
public static FieldAttribute getFieldAttribute(String name) {
6161
return getFieldAttribute(name, INTEGER);
6262
}
6363

6464
public static FieldAttribute getFieldAttribute(String name, DataType dataType) {
65-
return new FieldAttribute(EMPTY, name, new EsField(name + "f", dataType, emptyMap(), true));
65+
return new FieldAttribute(EMPTY, name, new EsField(name + "f", dataType, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
6666
}
6767

6868
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,15 @@ public static FieldAttribute getFieldAttribute(String name) {
206206
}
207207

208208
public static FieldAttribute getFieldAttribute(String name, DataType dataType) {
209-
return new FieldAttribute(EMPTY, name, new EsField(name + "f", dataType, emptyMap(), true));
209+
return new FieldAttribute(EMPTY, name, new EsField(name + "f", dataType, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
210210
}
211211

212212
public static FieldAttribute fieldAttribute() {
213213
return fieldAttribute(randomAlphaOfLength(10), randomFrom(DataType.types()));
214214
}
215215

216216
public static FieldAttribute fieldAttribute(String name, DataType type) {
217-
return new FieldAttribute(EMPTY, name, new EsField(name, type, emptyMap(), randomBoolean()));
217+
return new FieldAttribute(EMPTY, name, new EsField(name, type, emptyMap(), randomBoolean(), EsField.TimeSeriesFieldType.NONE));
218218
}
219219

220220
public static Literal of(Object value) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private static void walkMapping(String name, Object value, Map<String, EsField>
114114
field = new UnsupportedEsField(name, List.of(type), null, properties);
115115
propagateUnsupportedType(name, type, properties);
116116
} else {
117-
field = new EsField(name, esDataType, properties, docValues);
117+
field = new EsField(name, esDataType, properties, docValues, EsField.TimeSeriesFieldType.NONE);
118118
}
119119
mapping.put(name, field);
120120
} else {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ private static boolean canConvertOriginalTypes(MultiTypeEsField multiTypeEsField
18191819
}
18201820

18211821
private static Expression typeSpecificConvert(ConvertFunction convert, Source source, DataType type, InvalidMappedField mtf) {
1822-
EsField field = new EsField(mtf.getName(), type, mtf.getProperties(), mtf.isAggregatable());
1822+
EsField field = new EsField(mtf.getName(), type, mtf.getProperties(), mtf.isAggregatable(), mtf.getTimeSeriesFieldType());
18231823
FieldAttribute originalFieldAttr = (FieldAttribute) convert.field();
18241824
FieldAttribute resolvedAttr = new FieldAttribute(
18251825
source,

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EsQueryExec.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ public class EsQueryExec extends LeafExec implements EstimatesRowSize {
4646
EsQueryExec::readFrom
4747
);
4848

49-
public static final EsField DOC_ID_FIELD = new EsField("_doc", DataType.DOC_DATA_TYPE, Map.of(), false);
49+
public static final EsField DOC_ID_FIELD = new EsField(
50+
"_doc",
51+
DataType.DOC_DATA_TYPE,
52+
Map.of(),
53+
false,
54+
EsField.TimeSeriesFieldType.NONE
55+
);
5056
public static final List<Sort> NO_SORTS = List.of(); // only exists to mimic older serialization, but we no longer serialize sorts
5157

5258
private final String indexPattern;

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,13 @@ private static Map<String, EsField> createMappingForIndex(CsvTestsDataLoader.Tes
420420
if (mapping.containsKey(entry.getKey())) {
421421
DataType dataType = DataType.fromTypeName(entry.getValue());
422422
EsField field = mapping.get(entry.getKey());
423-
EsField editedField = new EsField(field.getName(), dataType, field.getProperties(), field.isAggregatable());
423+
EsField editedField = new EsField(
424+
field.getName(),
425+
dataType,
426+
field.getProperties(),
427+
field.isAggregatable(),
428+
field.getTimeSeriesFieldType()
429+
);
424430
mapping.put(entry.getKey(), editedField);
425431
}
426432
}

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public static Stream<DataType> validFunctionParameters() {
447447
* Build an {@link Attribute} that loads a field.
448448
*/
449449
public static FieldAttribute field(String name, DataType type) {
450-
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true));
450+
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true, EsField.TimeSeriesFieldType.NONE));
451451
}
452452

453453
/**
@@ -456,7 +456,7 @@ public static FieldAttribute field(String name, DataType type) {
456456
public static Expression deepCopyOfField(String name, DataType type) {
457457
return new DeepCopy(
458458
Source.synthetic(name),
459-
new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true))
459+
new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
460460
);
461461
}
462462

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/fulltext/KnnTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static List<TestCaseSupplier> testCaseSuppliers() {
6666
new FieldAttribute(
6767
Source.EMPTY,
6868
randomIdentifier(),
69-
new EsField(randomIdentifier(), DENSE_VECTOR, Map.of(), false)
69+
new EsField(randomIdentifier(), DENSE_VECTOR, Map.of(), false, EsField.TimeSeriesFieldType.NONE)
7070
),
7171
DENSE_VECTOR,
7272
"dense_vector field"

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/NamedExpressionTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ public void testArithmeticFunctionName() {
5353
}
5454

5555
public void testNameForArithmeticFunctionAppliedOnTableColumn() {
56-
FieldAttribute fa = new FieldAttribute(EMPTY, "myField", new EsField("myESField", DataType.INTEGER, emptyMap(), true));
56+
FieldAttribute fa = new FieldAttribute(
57+
EMPTY,
58+
"myField",
59+
new EsField("myESField", DataType.INTEGER, emptyMap(), true, EsField.TimeSeriesFieldType.NONE)
60+
);
5761
String e = "myField + 10";
5862
Add add = new Add(s(e), fa, l(10));
5963
assertEquals(e, add.sourceText());

0 commit comments

Comments
 (0)