Skip to content

Commit f0b029d

Browse files
committed
adjust tests
1 parent d7261c7 commit f0b029d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,12 @@ public enum Cap {
905905
*/
906906
AGGREGATE_METRIC_DOUBLE_SORTING(AGGREGATE_METRIC_DOUBLE_FEATURE_FLAG),
907907

908+
/**
909+
* Fixes bug when aggregate metric double is encoded as a NullBlock but decoded as
910+
* AggregateMetricDoubleBlock
911+
*/
912+
AGGREGATE_METRIC_DOUBLE_SORTING_FIXED(AGGREGATE_METRIC_DOUBLE_FEATURE_FLAG),
913+
908914
/**
909915
* Support avg with aggregate metric doubles
910916
*/

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ sorting with aggregate_metric_double with partial submetrics:
383383
- method: POST
384384
path: /_query
385385
parameters: []
386-
capabilities: [aggregate_metric_double_sorting]
387-
reason: "Support for sorting when aggregate_metric_double present"
386+
capabilities: [aggregate_metric_double_sorting_fixed]
387+
reason: "Serialization for rows containing agg metric double changed"
388388
- do:
389389
allowed_warnings_regex:
390390
- "No limit defined, adding default limit of \\[.*\\]"
@@ -415,8 +415,8 @@ aggregate_metric_double unsortable:
415415
- method: POST
416416
path: /_query
417417
parameters: []
418-
capabilities: [aggregate_metric_double_sorting]
419-
reason: "Support for sorting when aggregate_metric_double present"
418+
capabilities: [aggregate_metric_double_sorting_fixed]
419+
reason: "Serialization for rows containing agg metric double changed"
420420
- do:
421421
catch: /cannot sort on aggregate_metric_double/
422422
esql.query:

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ unsupported with sort:
313313
- method: POST
314314
path: /_query
315315
parameters: [ ]
316-
capabilities: [ dense_vector_field_type ]
317-
reason: "support for sorting when dense_vector_field_type present"
316+
capabilities: [ aggregate_metric_double_sorting_fixed ]
317+
reason: "Serialization for rows containing agg metric double changed"
318318

319319
- do:
320320
allowed_warnings_regex:

0 commit comments

Comments
 (0)