Skip to content

Commit 37849ed

Browse files
committed
explicit default for a bunch of constructors
1 parent d726c75 commit 37849ed

File tree

16 files changed

+97
-40
lines changed

16 files changed

+97
-40
lines changed

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,16 @@ public void testLuceneQuery_AllLiterals_NonTranslatable() {
3333
public void testLuceneQuery_NonFoldableSuffix_NonTranslatable() {
3434
EndsWith function = new EndsWith(
3535
Source.EMPTY,
36-
new FieldAttribute(Source.EMPTY, "field", new EsField("field", DataType.KEYWORD, Map.of(), true)),
37-
new FieldAttribute(Source.EMPTY, "field", new EsField("suffix", DataType.KEYWORD, Map.of(), true))
36+
new FieldAttribute(
37+
Source.EMPTY,
38+
"field",
39+
new EsField("field", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
40+
),
41+
new FieldAttribute(
42+
Source.EMPTY,
43+
"field",
44+
new EsField("suffix", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
45+
)
3846
);
3947

4048
assertThat(function.translatable(LucenePushdownPredicates.DEFAULT), equalTo(TranslationAware.Translatable.NO));
@@ -43,7 +51,11 @@ public void testLuceneQuery_NonFoldableSuffix_NonTranslatable() {
4351
public void testLuceneQuery_NonFoldableSuffix_Translatable() {
4452
EndsWith function = new EndsWith(
4553
Source.EMPTY,
46-
new FieldAttribute(Source.EMPTY, "field", new EsField("suffix", DataType.KEYWORD, Map.of(), true)),
54+
new FieldAttribute(
55+
Source.EMPTY,
56+
"field",
57+
new EsField("suffix", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
58+
),
4759
Literal.keyword(Source.EMPTY, "a*b?c\\")
4860
);
4961

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private static Page row(List<Object> values) {
8383
}
8484

8585
private static FieldAttribute field(String name, DataType type) {
86-
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true));
86+
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true, EsField.TimeSeriesFieldType.NONE));
8787
}
8888

8989
private DriverContext driverContext() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private static Page row(List<Object> values) {
120120
}
121121

122122
private static FieldAttribute field(String name, DataType type) {
123-
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true));
123+
return new FieldAttribute(Source.synthetic(name), name, new EsField(name, type, Map.of(), true, EsField.TimeSeriesFieldType.NONE));
124124
}
125125

126126
private DriverContext driverContext() {

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,16 @@ public void testLuceneQuery_AllLiterals_NonTranslatable() {
3333
public void testLuceneQuery_NonFoldablePrefix_NonTranslatable() {
3434
var function = new StartsWith(
3535
Source.EMPTY,
36-
new FieldAttribute(Source.EMPTY, "field", new EsField("field", DataType.KEYWORD, Map.of(), true)),
37-
new FieldAttribute(Source.EMPTY, "field", new EsField("prefix", DataType.KEYWORD, Map.of(), true))
36+
new FieldAttribute(
37+
Source.EMPTY,
38+
"field",
39+
new EsField("field", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
40+
),
41+
new FieldAttribute(
42+
Source.EMPTY,
43+
"field",
44+
new EsField("prefix", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
45+
)
3846
);
3947

4048
assertThat(function.translatable(LucenePushdownPredicates.DEFAULT), equalTo(TranslationAware.Translatable.NO));
@@ -43,7 +51,11 @@ public void testLuceneQuery_NonFoldablePrefix_NonTranslatable() {
4351
public void testLuceneQuery_NonFoldablePrefix_Translatable() {
4452
var function = new StartsWith(
4553
Source.EMPTY,
46-
new FieldAttribute(Source.EMPTY, "field", new EsField("prefix", DataType.KEYWORD, Map.of(), true)),
54+
new FieldAttribute(
55+
Source.EMPTY,
56+
"field",
57+
new EsField("prefix", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
58+
),
4759
Literal.keyword(Source.EMPTY, "a*b?c\\")
4860
);
4961

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/InStaticTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ public void testHandleNullsOnRightValue() {
5959
public void testConvertedNull() {
6060
In in = new In(
6161
EMPTY,
62-
new FieldAttribute(Source.EMPTY, "field", new EsField("suffix", DataType.KEYWORD, Map.of(), true)),
62+
new FieldAttribute(
63+
Source.EMPTY,
64+
"field",
65+
new EsField("suffix", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
66+
),
6367
Arrays.asList(ONE, new Literal(Source.EMPTY, null, randomFrom(DataType.types())), THREE)
6468
);
6569
var query = in.asQuery(LucenePushdownPredicates.DEFAULT, TranslatorHandler.TRANSLATOR_HANDLER);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ public static EsIndex indexWithManyConflicts(boolean withParent) {
115115
}
116116
for (int i = 0; i < nonConflictingCount; i++) {
117117
String name = String.format(Locale.ROOT, "blah.blah.blah.blah.blah.blah.nonconflict.name%04d", i);
118-
fields.put(name, new EsField(name, DataType.KEYWORD, Map.of(), true));
118+
fields.put(name, new EsField(name, DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE));
119119
}
120120

121121
if (withParent) {
122-
EsField parent = new EsField("parent", DataType.OBJECT, Map.copyOf(fields), false);
122+
EsField parent = new EsField("parent", DataType.OBJECT, Map.copyOf(fields), false, EsField.TimeSeriesFieldType.NONE);
123123
fields.put("parent", parent);
124124
}
125125

@@ -199,7 +199,7 @@ private static EsField fieldWithRecursiveChildren(int depth, int childrenPerLeve
199199
if (depth == 1) {
200200
for (int i = 0; i < childrenPerLevel; i++) {
201201
childName = "leaf" + i;
202-
children.put(childName, new EsField(childName, DataType.KEYWORD, Map.of(), true));
202+
children.put(childName, new EsField(childName, DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE));
203203
}
204204
} else {
205205
for (int i = 0; i < childrenPerLevel; i++) {
@@ -208,7 +208,7 @@ private static EsField fieldWithRecursiveChildren(int depth, int childrenPerLeve
208208
}
209209
}
210210

211-
return new EsField(name, DataType.OBJECT, children, false);
211+
return new EsField(name, DataType.OBJECT, children, false, EsField.TimeSeriesFieldType.NONE);
212212
}
213213

214214
/**

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ public static void init() {
150150
);
151151

152152
var multiIndexMapping = loadMapping("mapping-basic.json");
153-
multiIndexMapping.put("partial_type_keyword", new EsField("partial_type_keyword", KEYWORD, emptyMap(), true));
153+
multiIndexMapping.put(
154+
"partial_type_keyword",
155+
new EsField("partial_type_keyword", KEYWORD, emptyMap(), true, EsField.TimeSeriesFieldType.NONE)
156+
);
154157
var multiIndex = IndexResolution.valid(
155158
new EsIndex(
156159
"multi_index",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,11 @@ public void testMissingFieldInNewCommand() {
340340
new MockFieldAttributeCommand(
341341
EMPTY,
342342
new Row(EMPTY, List.of()),
343-
new FieldAttribute(EMPTY, "last_name", new EsField("last_name", DataType.KEYWORD, Map.of(), true))
343+
new FieldAttribute(
344+
EMPTY,
345+
"last_name",
346+
new EsField("last_name", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
347+
)
344348
),
345349
testStats
346350
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ public void init() {
221221
List.of("a", "b"),
222222
Map.of("", "idx"),
223223
Map.ofEntries(
224-
Map.entry("a", new EsField("a", DataType.INTEGER, Map.of(), true)),
225-
Map.entry("b", new EsField("b", DataType.LONG, Map.of(), true))
224+
Map.entry("a", new EsField("a", DataType.INTEGER, Map.of(), true, EsField.TimeSeriesFieldType.NONE)),
225+
Map.entry("b", new EsField("b", DataType.LONG, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
226226
)
227227
)
228228
);

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ private static EnrichResolution setupEnrichResolution() {
402402
List.of("a", "b"),
403403
Map.of("", "idx"),
404404
Map.ofEntries(
405-
Map.entry("a", new EsField("a", DataType.INTEGER, Map.of(), true)),
406-
Map.entry("b", new EsField("b", DataType.LONG, Map.of(), true))
405+
Map.entry("a", new EsField("a", DataType.INTEGER, Map.of(), true, EsField.TimeSeriesFieldType.NONE)),
406+
Map.entry("b", new EsField("b", DataType.LONG, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
407407
)
408408
)
409409
);
@@ -416,10 +416,13 @@ private static EnrichResolution setupEnrichResolution() {
416416
List.of("city", "airport", "region", "city_boundary"),
417417
Map.of("", "airport_city_boundaries"),
418418
Map.ofEntries(
419-
Map.entry("city", new EsField("city", DataType.KEYWORD, Map.of(), true)),
420-
Map.entry("airport", new EsField("airport", DataType.TEXT, Map.of(), false)),
421-
Map.entry("region", new EsField("region", DataType.TEXT, Map.of(), false)),
422-
Map.entry("city_boundary", new EsField("city_boundary", DataType.GEO_SHAPE, Map.of(), false))
419+
Map.entry("city", new EsField("city", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)),
420+
Map.entry("airport", new EsField("airport", DataType.TEXT, Map.of(), false, EsField.TimeSeriesFieldType.NONE)),
421+
Map.entry("region", new EsField("region", DataType.TEXT, Map.of(), false, EsField.TimeSeriesFieldType.NONE)),
422+
Map.entry(
423+
"city_boundary",
424+
new EsField("city_boundary", DataType.GEO_SHAPE, Map.of(), false, EsField.TimeSeriesFieldType.NONE)
425+
)
423426
)
424427
)
425428
);
@@ -431,7 +434,7 @@ private static EnrichResolution setupEnrichResolution() {
431434
EnrichPolicy.MATCH_TYPE,
432435
List.of("department"),
433436
Map.of("", ".enrich-departments-1", "cluster_1", ".enrich-departments-2"),
434-
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true))
437+
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
435438
)
436439
);
437440
enrichResolution.addResolvedPolicy(
@@ -442,7 +445,7 @@ private static EnrichResolution setupEnrichResolution() {
442445
EnrichPolicy.MATCH_TYPE,
443446
List.of("department"),
444447
Map.of("", ".enrich-departments-3"),
445-
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true))
448+
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
446449
)
447450
);
448451
enrichResolution.addResolvedPolicy(
@@ -453,7 +456,7 @@ private static EnrichResolution setupEnrichResolution() {
453456
EnrichPolicy.MATCH_TYPE,
454457
List.of("department"),
455458
Map.of("cluster_1", ".enrich-departments-2"),
456-
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true))
459+
Map.of("department", new EsField("department", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
457460
)
458461
);
459462
enrichResolution.addResolvedPolicy(
@@ -464,7 +467,7 @@ private static EnrichResolution setupEnrichResolution() {
464467
EnrichPolicy.MATCH_TYPE,
465468
List.of("supervisor"),
466469
Map.of("", ".enrich-supervisors-a", "cluster_1", ".enrich-supervisors-b"),
467-
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true))
470+
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
468471
)
469472
);
470473
enrichResolution.addResolvedPolicy(
@@ -475,7 +478,7 @@ private static EnrichResolution setupEnrichResolution() {
475478
EnrichPolicy.MATCH_TYPE,
476479
List.of("supervisor"),
477480
Map.of("", ".enrich-supervisors-c"),
478-
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true))
481+
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
479482
)
480483
);
481484
enrichResolution.addResolvedPolicy(
@@ -486,7 +489,7 @@ private static EnrichResolution setupEnrichResolution() {
486489
EnrichPolicy.MATCH_TYPE,
487490
List.of("supervisor"),
488491
Map.of("cluster_1", ".enrich-supervisors-b"),
489-
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true))
492+
Map.of("supervisor", new EsField("supervisor", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE))
490493
)
491494
);
492495
return enrichResolution;
@@ -2990,9 +2993,9 @@ public void testProjectAwayColumns() {
29902993
"test",
29912994
Map.of(
29922995
"some_field1",
2993-
new EsField("some_field1", DataType.KEYWORD, Map.of(), true),
2996+
new EsField("some_field1", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE),
29942997
"some_field2",
2995-
new EsField("some_field2", DataType.KEYWORD, Map.of(), true)
2998+
new EsField("some_field2", DataType.KEYWORD, Map.of(), true, EsField.TimeSeriesFieldType.NONE)
29962999
)
29973000
),
29983001
IndexMode.STANDARD
@@ -7845,7 +7848,7 @@ private Map<String, EsField> fields(Collection<String> fieldNames) {
78457848
Map<String, EsField> fields = new HashMap<>();
78467849

78477850
for (String fieldName : fieldNames) {
7848-
fields.put(fieldName, new EsField(fieldName, DataType.KEYWORD, Map.of(), false));
7851+
fields.put(fieldName, new EsField(fieldName, DataType.KEYWORD, Map.of(), false, EsField.TimeSeriesFieldType.NONE));
78497852
}
78507853

78517854
return fields;

0 commit comments

Comments
 (0)