Skip to content

Commit cf48733

Browse files
committed
fix the other constructor
1 parent 37849ed commit cf48733

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ public EsField(
138138
this(name, esDataType, properties, aggregatable, false, timeSeriesFieldType);
139139
}
140140

141-
public EsField(String name, DataType esDataType, Map<String, EsField> properties, boolean aggregatable, boolean isAlias) {
142-
this(name, esDataType, properties, aggregatable, isAlias, TimeSeriesFieldType.UNKNOWN);
143-
}
144-
145141
public EsField(
146142
String name,
147143
DataType esDataType,

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
@@ -464,7 +464,7 @@ private LocalRelation tableMapAsRelation(Source source, Map<String, Column> mapT
464464
String name = entry.getKey();
465465
Column column = entry.getValue();
466466
// create a fake ES field - alternative is to use a ReferenceAttribute
467-
EsField field = new EsField(name, column.type(), Map.of(), false, false);
467+
EsField field = new EsField(name, column.type(), Map.of(), false, false, EsField.TimeSeriesFieldType.UNKNOWN);
468468
attributes.add(new FieldAttribute(source, null, name, field));
469469
// prepare the block for the supplier
470470
blocks[i++] = column.values();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ private Tuple<ResolvedEnrichPolicy, String> mergeLookupResults(
238238
DataType.fromTypeName(field.getDataType().typeName()),
239239
field.getProperties(),
240240
field.isAggregatable(),
241-
field.isAlias()
241+
field.isAlias(),
242+
field.getTimeSeriesFieldType()
242243
);
243244
EsField old = mappings.putIfAbsent(m.getKey(), field);
244245
if (old != null && old.getDataType().equals(field.getDataType()) == false) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/ResolvedEnrichPolicy.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@ public void writeTo(StreamOutput out) throws IOException {
5454
* as though it were the base class.
5555
*/
5656
(o, v) -> {
57-
var field = new EsField(v.getName(), v.getDataType(), v.getProperties(), v.isAggregatable(), v.isAlias());
57+
var field = new EsField(
58+
v.getName(),
59+
v.getDataType(),
60+
v.getProperties(),
61+
v.isAggregatable(),
62+
v.isAlias(),
63+
v.getTimeSeriesFieldType()
64+
);
5865
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_2)) {
5966
field.writeTo(o);
6067
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private static EsField createField(
234234
return unsupported(name, first);
235235
}
236236

237-
return new EsField(name, type, new HashMap<>(), aggregatable, isAlias);
237+
return new EsField(name, type, new HashMap<>(), aggregatable, isAlias, timeSeriesFieldType);
238238
}
239239

240240
private static UnsupportedEsField unsupported(String name, IndexFieldCapabilities fc) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public void testSparseDocument() throws Exception {
498498
Map<String, EsField> large = Maps.newLinkedHashMapWithExpectedSize(size);
499499
for (int i = 0; i < size; i++) {
500500
var name = String.format(Locale.ROOT, "field%03d", i);
501-
large.put(name, new EsField(name, DataType.INTEGER, emptyMap(), true, false));
501+
large.put(name, new EsField(name, DataType.INTEGER, emptyMap(), true, false, EsField.TimeSeriesFieldType.NONE));
502502
}
503503

504504
SearchStats searchStats = statsForExistingField("field000", "field001", "field002", "field003", "field004");

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public static EsField randomEsField(int maxPropertiesDepth) {
1919
Map<String, EsField> properties = randomProperties(maxPropertiesDepth);
2020
boolean aggregatable = randomBoolean();
2121
boolean isAlias = randomBoolean();
22-
return new EsField(name, esDataType, properties, aggregatable, isAlias);
22+
EsField.TimeSeriesFieldType tsType = randomFrom(EsField.TimeSeriesFieldType.values());
23+
return new EsField(name, esDataType, properties, aggregatable, isAlias, tsType);
2324
}
2425

2526
@Override
@@ -34,14 +35,16 @@ protected EsField mutate(EsField instance) {
3435
Map<String, EsField> properties = instance.getProperties();
3536
boolean aggregatable = instance.isAggregatable();
3637
boolean isAlias = instance.isAlias();
37-
switch (between(0, 4)) {
38+
EsField.TimeSeriesFieldType tsType = instance.getTimeSeriesFieldType();
39+
switch (between(0, 5)) {
3840
case 0 -> name = randomAlphaOfLength(name.length() + 1);
3941
case 1 -> esDataType = randomValueOtherThan(esDataType, () -> randomFrom(DataType.types()));
4042
case 2 -> properties = randomValueOtherThan(properties, () -> randomProperties(4));
4143
case 3 -> aggregatable = false == aggregatable;
4244
case 4 -> isAlias = false == isAlias;
45+
case 5 -> tsType = randomValueOtherThan(tsType, () -> randomFrom(EsField.TimeSeriesFieldType.values()));
4346
default -> throw new IllegalArgumentException();
4447
}
45-
return new EsField(name, esDataType, properties, aggregatable, isAlias);
48+
return new EsField(name, esDataType, properties, aggregatable, isAlias, tsType);
4649
}
4750
}

0 commit comments

Comments
 (0)