Skip to content

Commit 6b254ed

Browse files
nik9000nik9000
committed
ESQL: Handle release of 9.2 in test
I'd made a mistake in elastic#136327 when writing the test for fetching fields that the release of 9.2.0 revealed. This fixes it and adds one more test that we needed from elastic#136327.
1 parent b311383 commit 6b254ed

File tree

6 files changed

+96
-22
lines changed

6 files changed

+96
-22
lines changed

‎server/src/main/resources/transport/definitions/referable/esql_resolve_fields_response_used.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9202000,9185004

‎server/src/main/resources/transport/upper_bounds/9.2.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
initial_9.2.1,9185003
1+
esql_resolve_fields_response_used,9185004

‎server/src/main/resources/transport/upper_bounds/9.3.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
esql_lookup_join_full_text_function,9201000
1+
esql_resolve_fields_response_used,9202000

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ Builder underConstruction() {
976976
}
977977
}
978978

979-
private static class DataTypesTransportVersions {
979+
public static class DataTypesTransportVersions {
980980

981981
public static final TransportVersion INDEX_SOURCE = TransportVersion.fromName("index_source");
982982

‎x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/AllSupportedFieldsTestCase.java‎

Lines changed: 89 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
import static org.elasticsearch.test.ListMatcher.matchesList;
4545
import static org.elasticsearch.test.MapMatcher.assertMap;
4646
import static org.elasticsearch.test.MapMatcher.matchesMap;
47-
import static org.elasticsearch.xpack.esql.action.EsqlResolveFieldsResponse.RESOLVE_FIELDS_RESPONSE_CREATED_TV;
47+
import static org.elasticsearch.xpack.esql.action.EsqlResolveFieldsResponse.RESOLVE_FIELDS_RESPONSE_USED_TV;
48+
import static org.elasticsearch.xpack.esql.core.type.DataType.DataTypesTransportVersions.ESQL_AGGREGATE_METRIC_DOUBLE_CREATED_VERSION;
49+
import static org.elasticsearch.xpack.esql.core.type.DataType.DataTypesTransportVersions.ESQL_DENSE_VECTOR_CREATED_VERSION;
4850
import static org.hamcrest.Matchers.any;
4951
import static org.hamcrest.Matchers.anyOf;
5052
import static org.hamcrest.Matchers.containsString;
@@ -329,6 +331,76 @@ public final void testFetchDenseVector() throws IOException {
329331
assertMap(indexToRow(columns, values), expectedAllValues);
330332
}
331333

334+
/**
335+
* Tests fetching {@code aggregate_metric_double} if possible. Uses the {@code dense_vector_agg_metric_double_if_fns}
336+
* work around if required.
337+
*/
338+
public final void testFetchAggregateMetricDouble() throws IOException {
339+
Map<String, Object> response;
340+
try {
341+
String request = """
342+
| EVAL strjunk = TO_STRING(f_aggregate_metric_double)
343+
| KEEP _index, f_aggregate_metric_double
344+
| LIMIT 1000
345+
""";
346+
if (denseVectorAggMetricDoubleIfVersion() == false) {
347+
request = """
348+
| EVAL junk = TO_AGGREGATE_METRIC_DOUBLE(1) // workaround to enable fetching aggregate_metric_double
349+
""" + request;
350+
}
351+
response = esql(request);
352+
if ((Boolean) response.get("is_partial")) {
353+
Map<?, ?> clusters = (Map<?, ?>) response.get("_clusters");
354+
Map<?, ?> details = (Map<?, ?>) clusters.get("details");
355+
356+
boolean foundError = false;
357+
for (Map.Entry<?, ?> cluster : details.entrySet()) {
358+
String failures = cluster.getValue().toString();
359+
if (denseVectorAggMetricDoubleIfFns()) {
360+
throw new AssertionError("should correctly fetch the aggregate_metric_double: " + failures);
361+
}
362+
foundError |= failures.contains("doesn't understand data type [AGGREGATE_METRIC_DOUBLE]");
363+
}
364+
assertTrue("didn't find errors: " + details, foundError);
365+
return;
366+
}
367+
} catch (ResponseException e) {
368+
if (denseVectorAggMetricDoubleIfFns()) {
369+
throw new AssertionError("should correctly fetch the aggregate_metric_double", e);
370+
}
371+
assertThat(
372+
"old version should fail with this error",
373+
EntityUtils.toString(e.getResponse().getEntity()),
374+
anyOf(
375+
containsString("Unknown function [TO_AGGREGATE_METRIC_DOUBLE]"),
376+
containsString("Cannot use field [f_aggregate_metric_double] with unsupported type"),
377+
containsString("doesn't understand data type [AGGREGATE_METRIC_DOUBLE]")
378+
)
379+
);
380+
// Failure is expected and fine
381+
return;
382+
}
383+
List<?> columns = (List<?>) response.get("columns");
384+
List<?> values = (List<?>) response.get("values");
385+
386+
MapMatcher expectedColumns = matchesMap().entry("f_aggregate_metric_double", "aggregate_metric_double").entry("_index", "keyword");
387+
assertMap(nameToType(columns), expectedColumns);
388+
389+
MapMatcher expectedAllValues = matchesMap();
390+
for (Map.Entry<String, NodeInfo> e : expectedIndices().entrySet()) {
391+
String indexName = e.getKey();
392+
NodeInfo nodeInfo = e.getValue();
393+
MapMatcher expectedValues = matchesMap();
394+
expectedValues = expectedValues.entry(
395+
"f_aggregate_metric_double",
396+
"{\"min\":-302.5,\"max\":702.3,\"sum\":200.0,\"value_count\":25}"
397+
);
398+
expectedValues = expectedValues.entry("_index", indexName);
399+
expectedAllValues = expectedAllValues.entry(indexName, expectedValues);
400+
}
401+
assertMap(indexToRow(columns, values), expectedAllValues);
402+
}
403+
332404
private Map<String, Object> esql(String query) throws IOException {
333405
Request request = new Request("POST", "_query");
334406
XContentBuilder body = JsonXContent.contentBuilder().startObject();
@@ -473,21 +545,15 @@ private Matcher<?> expectedValue(DataType type, NodeInfo nodeInfo) throws IOExce
473545
case GEO_SHAPE -> equalTo("POINT (-71.34 41.12)");
474546
case NULL -> nullValue();
475547
case AGGREGATE_METRIC_DOUBLE -> {
476-
/*
477-
* We need both AGGREGATE_METRIC_DOUBLE_CREATED and RESOLVE_FIELDS_RESPONSE_CREATED_TV
478-
* but RESOLVE_FIELDS_RESPONSE_CREATED_TV came last so it's enough to check just it.
479-
*/
480-
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_CREATED_TV) == false) {
548+
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_USED_TV) == false
549+
|| minVersion().supports(ESQL_AGGREGATE_METRIC_DOUBLE_CREATED_VERSION) == false) {
481550
yield nullValue();
482551
}
483552
yield equalTo("{\"min\":-302.5,\"max\":702.3,\"sum\":200.0,\"value_count\":25}");
484553
}
485554
case DENSE_VECTOR -> {
486-
/*
487-
* We need both DENSE_VECTOR_CREATED and RESOLVE_FIELDS_RESPONSE_CREATED_TV
488-
* but RESOLVE_FIELDS_RESPONSE_CREATED_TV came last so it's enough to check just it.
489-
*/
490-
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_CREATED_TV) == false) {
555+
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_USED_TV) == false
556+
|| minVersion().supports(ESQL_DENSE_VECTOR_CREATED_VERSION) == false) {
491557
yield nullValue();
492558
}
493559
yield equalTo(List.of(0.5, 10.0, 5.9999995));
@@ -572,15 +638,20 @@ private Matcher<String> expectedType(DataType type) throws IOException {
572638
case BYTE, SHORT -> equalTo("integer");
573639
case HALF_FLOAT, SCALED_FLOAT, FLOAT -> equalTo("double");
574640
case NULL -> equalTo("keyword");
575-
case AGGREGATE_METRIC_DOUBLE, DENSE_VECTOR -> {
576-
/*
577-
* We need both <type_name>_CREATED and RESOLVE_FIELDS_RESPONSE_CREATED_TV
578-
* but RESOLVE_FIELDS_RESPONSE_CREATED_TV came last so it's enough to check just it.
579-
*/
580-
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_CREATED_TV) == false) {
641+
case AGGREGATE_METRIC_DOUBLE -> {
642+
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_USED_TV) == false
643+
|| minVersion().supports(ESQL_AGGREGATE_METRIC_DOUBLE_CREATED_VERSION) == false) {
644+
yield equalTo("unsupported");
645+
}
646+
yield equalTo("aggregate_metric_double");
647+
}
648+
case DENSE_VECTOR -> {
649+
logger.error("ADFDAFAF " + minVersion());
650+
if (minVersion().supports(RESOLVE_FIELDS_RESPONSE_USED_TV) == false
651+
|| minVersion().supports(ESQL_DENSE_VECTOR_CREATED_VERSION) == false) {
581652
yield equalTo("unsupported");
582653
}
583-
yield equalTo(type.esType());
654+
yield equalTo("dense_vector");
584655
}
585656
default -> equalTo(type.esType());
586657
};

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlResolveFieldsResponse.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
import java.io.IOException;
1818

1919
public class EsqlResolveFieldsResponse extends ActionResponse {
20-
public static final TransportVersion RESOLVE_FIELDS_RESPONSE_CREATED_TV = TransportVersion.fromName(
20+
private static final TransportVersion RESOLVE_FIELDS_RESPONSE_CREATED_TV = TransportVersion.fromName(
2121
"esql_resolve_fields_response_created"
2222
);
2323

24+
public static final TransportVersion RESOLVE_FIELDS_RESPONSE_USED_TV = TransportVersion.fromName("esql_resolve_fields_response_used");
25+
2426
private final FieldCapabilitiesResponse caps;
2527
private final TransportVersion minTransportVersion;
2628

0 commit comments

Comments
 (0)