Skip to content

Commit c63d906

Browse files
alexey-ivanov-esalexey-ivanov-es
committed
Merge remote-tracking branch 'origin/ES-12677' into ES-12677
2 parents 5bc028a + 1d93b72 commit c63d906

File tree

4 files changed

+86
-58
lines changed

4 files changed

+86
-58
lines changed

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java‎

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,12 +3182,12 @@ public void testResolveInsist_multiIndexFieldExistsWithSingleTypeButIsNotKeyword
31823182
new IndexResolver.FieldsInfo(
31833183
FieldCapabilitiesResponse.builder()
31843184
.withIndexResponses(
3185-
List.of(
3186-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3187-
fieldCapabilitiesIndexResponse("bar", Map.of())
3185+
List.of(
3186+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3187+
fieldCapabilitiesIndexResponse("bar", Map.of())
31883188
)
31893189
)
3190-
.build(),
3190+
.build(),
31913191
true,
31923192
true
31933193
)
@@ -3211,12 +3211,13 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesNoKeyw
32113211
new IndexResolver.FieldsInfo(
32123212
FieldCapabilitiesResponse.builder()
32133213
.withIndexResponses(
3214-
List.of(
3215-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3216-
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3217-
fieldCapabilitiesIndexResponse("bazz", Map.of())
3218-
))
3219-
.build(),
3214+
List.of(
3215+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3216+
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3217+
fieldCapabilitiesIndexResponse("bazz", Map.of())
3218+
)
3219+
)
3220+
.build(),
32203221
true,
32213222
true
32223223
)
@@ -3239,11 +3240,12 @@ public void testResolveInsist_multiIndexSameMapping_fieldIsMapped() {
32393240
new IndexResolver.FieldsInfo(
32403241
FieldCapabilitiesResponse.builder()
32413242
.withIndexResponses(
3242-
List.of(
3243-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3244-
fieldCapabilitiesIndexResponse("bar", messageResponseMap("long"))
3245-
))
3246-
.build(),
3243+
List.of(
3244+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3245+
fieldCapabilitiesIndexResponse("bar", messageResponseMap("long"))
3246+
)
3247+
)
3248+
.build(),
32473249
true,
32483250
true
32493251
)
@@ -3264,12 +3266,13 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithKe
32643266
new IndexResolver.FieldsInfo(
32653267
FieldCapabilitiesResponse.builder()
32663268
.withIndexResponses(
3267-
List.of(
3268-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3269-
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3270-
fieldCapabilitiesIndexResponse("bazz", messageResponseMap("keyword")),
3271-
fieldCapabilitiesIndexResponse("qux", Map.of())
3272-
))
3269+
List.of(
3270+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3271+
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3272+
fieldCapabilitiesIndexResponse("bazz", messageResponseMap("keyword")),
3273+
fieldCapabilitiesIndexResponse("qux", Map.of())
3274+
)
3275+
)
32733276
.build(),
32743277
true,
32753278
true
@@ -3293,11 +3296,12 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithCa
32933296
new IndexResolver.FieldsInfo(
32943297
FieldCapabilitiesResponse.builder()
32953298
.withIndexResponses(
3296-
List.of(
3297-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3298-
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3299-
fieldCapabilitiesIndexResponse("bazz", Map.of())
3300-
))
3299+
List.of(
3300+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
3301+
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
3302+
fieldCapabilitiesIndexResponse("bazz", Map.of())
3303+
)
3304+
)
33013305
.build(),
33023306
true,
33033307
true
@@ -3316,9 +3320,10 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithCa
33163320

33173321
public void testResolveDenseVector() {
33183322
FieldCapabilitiesResponse caps = FieldCapabilitiesResponse.builder()
3319-
.withIndexResponses(
3320-
List.of(fieldCapabilitiesIndexResponse("foo", Map.of("v", new IndexFieldCapabilitiesBuilder("v", "dense_vector").build())))
3321-
).build();
3323+
.withIndexResponses(
3324+
List.of(fieldCapabilitiesIndexResponse("foo", Map.of("v", new IndexFieldCapabilitiesBuilder("v", "dense_vector").build())))
3325+
)
3326+
.build();
33223327
{
33233328
IndexResolution resolution = IndexResolver.mergedMappings("foo", new IndexResolver.FieldsInfo(caps, true, true));
33243329
var plan = analyze("FROM foo", analyzer(resolution, TEST_VERIFIER));
@@ -3335,14 +3340,15 @@ public void testResolveDenseVector() {
33353340

33363341
public void testResolveAggregateMetricDouble() {
33373342
FieldCapabilitiesResponse caps = FieldCapabilitiesResponse.builder()
3338-
.withIndexResponses(
3339-
List.of(
3340-
fieldCapabilitiesIndexResponse(
3341-
"foo",
3342-
Map.of("v", new IndexFieldCapabilitiesBuilder("v", "aggregate_metric_double").build())
3343+
.withIndexResponses(
3344+
List.of(
3345+
fieldCapabilitiesIndexResponse(
3346+
"foo",
3347+
Map.of("v", new IndexFieldCapabilitiesBuilder("v", "aggregate_metric_double").build())
3348+
)
33433349
)
33443350
)
3345-
).build();
3351+
.build();
33463352
{
33473353
IndexResolution resolution = IndexResolver.mergedMappings("foo", new IndexResolver.FieldsInfo(caps, true, true));
33483354
var plan = analyze("FROM foo", analyzer(resolution, TEST_VERIFIER));
@@ -3803,7 +3809,11 @@ private static LogicalPlan analyzeWithEmptyFieldCapsResponse(String query) throw
38033809
List<FieldCapabilitiesIndexResponse> idxResponses = List.of(
38043810
new FieldCapabilitiesIndexResponse("idx", "idx", Map.of(), true, IndexMode.STANDARD)
38053811
);
3806-
IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(FieldCapabilitiesResponse.builder().withIndexResponses(idxResponses).build(), true, true);
3812+
IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(
3813+
FieldCapabilitiesResponse.builder().withIndexResponses(idxResponses).build(),
3814+
true,
3815+
true
3816+
);
38073817
IndexResolution resolution = IndexResolver.mergedMappings("test*", caps);
38083818
var analyzer = analyzer(resolution, TEST_VERIFIER, configuration(query));
38093819
return analyze(query, analyzer);

‎x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndexTests.java‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,19 @@ private Map<String, Object> testCreateDestinationIndex(DataFrameAnalysis analysi
285285
doAnswer(callListenerOnResponse(getMappingsResponse)).when(client)
286286
.execute(eq(GetMappingsAction.INSTANCE), getMappingsRequestCaptor.capture(), any());
287287

288-
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder().withFields(Map.of(
289-
NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
290-
OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
291-
ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
292-
ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
293-
))
288+
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder()
289+
.withFields(
290+
Map.of(
291+
NUMERICAL_FIELD,
292+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
293+
OUTER_FIELD + "." + INNER_FIELD,
294+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
295+
ALIAS_TO_NUMERICAL_FIELD,
296+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
297+
ALIAS_TO_NESTED_FIELD,
298+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
299+
)
300+
)
294301
.build();
295302

296303
doAnswer(callListenerOnResponse(fieldCapabilitiesResponse)).when(client)
@@ -614,12 +621,19 @@ private Map<String, Object> testUpdateMappingsToDestIndex(DataFrameAnalysis anal
614621
doAnswer(callListenerOnResponse(AcknowledgedResponse.TRUE)).when(client)
615622
.execute(eq(TransportPutMappingAction.TYPE), putMappingRequestCaptor.capture(), any());
616623

617-
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder().withFields(Map.of(
618-
NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
619-
OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
620-
ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
621-
ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
622-
))
624+
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder()
625+
.withFields(
626+
Map.of(
627+
NUMERICAL_FIELD,
628+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
629+
OUTER_FIELD + "." + INNER_FIELD,
630+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
631+
ALIAS_TO_NUMERICAL_FIELD,
632+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
633+
ALIAS_TO_NESTED_FIELD,
634+
singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
635+
)
636+
)
623637
.build();
624638

625639
doAnswer(callListenerOnResponse(fieldCapabilitiesResponse)).when(client)

‎x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/common/DocumentConversionUtilsTests.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,18 @@ public void testRemoveInternalFields() {
8787
}
8888

8989
public void testExtractFieldMappings() {
90-
FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder().withIndices(
91-
new String[] { "some-index" })
92-
.withFields(
93-
Map.ofEntries(
94-
entry("field-1", Map.of("keyword", createFieldCapabilities("field-1", "keyword"))),
95-
entry(
96-
"field-2",
97-
Map.of("long", createFieldCapabilities("field-2", "long"), "keyword", createFieldCapabilities("field-2", "keyword"))
90+
FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder()
91+
.withIndices(new String[] { "some-index" })
92+
.withFields(
93+
Map.ofEntries(
94+
entry("field-1", Map.of("keyword", createFieldCapabilities("field-1", "keyword"))),
95+
entry(
96+
"field-2",
97+
Map.of("long", createFieldCapabilities("field-2", "long"), "keyword", createFieldCapabilities("field-2", "keyword"))
98+
)
9899
)
99100
)
100-
).build();
101+
.build();
101102

102103
assertThat(
103104
DocumentConversionUtils.extractFieldMappings(response),

‎x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/SchemaUtilTests.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,10 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
287287
responseMap.put(field, singletonMap(field, createFieldCapabilities(field, type)));
288288
}
289289

290-
final FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder().withIndices(fieldCapsRequest.indices()).withFields(responseMap).build();
290+
final FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder()
291+
.withIndices(fieldCapsRequest.indices())
292+
.withFields(responseMap)
293+
.build();
291294
listener.onResponse((Response) response);
292295
return;
293296
}

0 commit comments

Comments
 (0)