diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml index 353365df95a..3d569d5c2c9 100644 --- a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml +++ b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml @@ -158,6 +158,6 @@ teardown: --- "Test Grok Patterns Retrieval": - do: - ingest.processor.grok: {} + ingest.processor_grok: {} - length: { patterns: 303 } - match: { patterns.PATH: "(?:%{UNIXPATH}|%{WINPATH})" } diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml index 7843e30561a..ad1a9441231 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml @@ -2,7 +2,7 @@ "Fetch remote cluster info for existing cluster": - do: - remote.info: {} + cluster.remote_info: {} - match: { my_remote_cluster.connected: true } - match: { my_remote_cluster.num_nodes_connected: 1} - match: { my_remote_cluster.max_connections_per_cluster: 1} @@ -37,7 +37,7 @@ - match: { hits.hits.0._index: "test_remote_cluster:test_index" } - do: - remote.info: {} + cluster.remote_info: {} - set: { my_remote_cluster.http_addresses.0: remote_http } - match: { test_remote_cluster.http_addresses.0: $remote_http } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/remote.info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json similarity index 90% rename from rest-api-spec/src/main/resources/rest-api-spec/api/remote.info.json rename to rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json index aca981fff00..32378531544 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/remote.info.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json @@ -1,5 +1,5 @@ { - "remote.info": { + "cluster.remote_info": { "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html", "methods": ["GET"], "url": { @@ -9,4 +9,4 @@ }, "body": null } -} \ No newline at end of file +} diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor.grok.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json similarity index 91% rename from rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor.grok.json rename to rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json index 1bd0c3ceec4..55afada7281 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor.grok.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json @@ -1,5 +1,5 @@ { - "ingest.processor.grok": { + "ingest.processor_grok": { "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html", "methods": [ "GET" ], "url": { diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml similarity index 82% rename from rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml index 1c6ed4811d8..4ba67f4ab0a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml @@ -4,6 +4,6 @@ version: " - 5.3.99" reason: this API doesn't exist in 5.3.x yet - do: - remote.info: {} + cluster.remote_info: {} - is_true: '' diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml index 278fd1ca8e7..813868e2201 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml @@ -1,7 +1,8 @@ --- "Exists type": - skip: - version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node + # this will only run in a mixed cluster environment with at least 1 5.x node + version: "5.99.99 - " reason: multiple types are not supported on 6.x indices onwards - do: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml index ec88168f3ba..9334afc4d76 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml @@ -2,7 +2,8 @@ setup: - skip: - version: "5.99.99 - " # this will only run in a mixed cluster environment with at least 1 5.x node + # this will only run in a mixed cluster environment with at least 1 5.x node + version: "5.99.99 - " reason: multiple types are not supported on 6.x indices onwards - do: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml index 7ee6859c3c9..0a63ac1acb8 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml @@ -17,8 +17,9 @@ type: test id: "1" body: { "foo": "hello world" } - refresh: true # make this doc visible in index stats - + # make this doc visible in index stats + refresh: true + - do: get: index: logs_search diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml index 1dd851554b3..3516c2a877a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml @@ -1,7 +1,8 @@ --- "IDs": - skip: - version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node + # this will only run in a mixed cluster environment with at least 1 5.x node + version: "5.99.99 - " reason: multiple types are not supported on 6.x indices onwards - do: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml index 4301e6824e1..0a941f0eca5 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml @@ -62,27 +62,24 @@ setup: percentiles: field: double_field - - - match: { hits.total: 4 } + - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 - - match: - aggregations.percentiles_double.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 + + - match: { aggregations.percentiles_int.values.1\.0: 2.5 } + - match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.25\.0: 38.5 } + - match: { aggregations.percentiles_int.values.50\.0: 76.0 } + - match: { aggregations.percentiles_int.values.75\.0: 113.5 } + - match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_int.values.99\.0: 149.5 } + + - match: { aggregations.percentiles_double.values.1\.0: 2.5 } + - match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_double.values.25\.0: 38.5 } + - match: { aggregations.percentiles_double.values.50\.0: 76.0 } + - match: { aggregations.percentiles_double.values.75\.0: 113.5 } + - match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_double.values.99\.0: 149.5 } - do: search: @@ -102,24 +99,23 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 - - match: - aggregations.percentiles_double.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 + + - match: { aggregations.percentiles_int.values.1\.0: 2.5 } + - match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.25\.0: 38.5 } + - match: { aggregations.percentiles_int.values.50\.0: 76.0 } + - match: { aggregations.percentiles_int.values.75\.0: 113.5 } + - match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_int.values.99\.0: 149.5 } + + - match: { aggregations.percentiles_double.values.1\.0: 2.5 } + - match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_double.values.25\.0: 38.5 } + - match: { aggregations.percentiles_double.values.50\.0: 76.0 } + - match: { aggregations.percentiles_double.values.75\.0: 113.5 } + - match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_double.values.99\.0: 149.5 } + --- "Only aggs test": @@ -138,24 +134,24 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 0 } - - match: - aggregations.percentiles_int.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 - - match: - aggregations.percentiles_double.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 + + - match: { aggregations.percentiles_int.values.1\.0: 2.5 } + - match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.25\.0: 38.5 } + - match: { aggregations.percentiles_int.values.50\.0: 76.0 } + - match: { aggregations.percentiles_int.values.75\.0: 113.5 } + - match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_int.values.99\.0: 149.5 } + + - match: { aggregations.percentiles_double.values.1\.0: 2.5 } + - match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_double.values.25\.0: 38.5 } + - match: { aggregations.percentiles_double.values.50\.0: 76.0 } + - match: { aggregations.percentiles_double.values.75\.0: 113.5 } + - match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_double.values.99\.0: 149.5 } + + --- "Filtered test": @@ -179,24 +175,22 @@ setup: - match: { hits.total: 3 } - length: { hits.hits: 3 } - - match: - aggregations.percentiles_int.values: - "1.0": 52.0 - "5.0": 56.0 - "25.0": 76.0 - "50.0": 101.0 - "75.0": 126.0 - "95.0": 146.0 - "99.0": 150.0 - - match: - aggregations.percentiles_double.values: - "1.0": 52.0 - "5.0": 56.0 - "25.0": 76.0 - "50.0": 101.0 - "75.0": 126.0 - "95.0": 146.0 - "99.0": 150.0 + + - match: { aggregations.percentiles_int.values.1\.0: 52.0 } + - match: { aggregations.percentiles_int.values.5\.0: 56.0 } + - match: { aggregations.percentiles_int.values.25\.0: 76.0 } + - match: { aggregations.percentiles_int.values.50\.0: 101.0 } + - match: { aggregations.percentiles_int.values.75\.0: 126.0 } + - match: { aggregations.percentiles_int.values.95\.0: 146.0 } + - match: { aggregations.percentiles_int.values.99\.0: 150.0 } + + - match: { aggregations.percentiles_double.values.1\.0: 52.0 } + - match: { aggregations.percentiles_double.values.5\.0: 56.0 } + - match: { aggregations.percentiles_double.values.25\.0: 76.0 } + - match: { aggregations.percentiles_double.values.50\.0: 101.0 } + - match: { aggregations.percentiles_double.values.75\.0: 126.0 } + - match: { aggregations.percentiles_double.values.95\.0: 146.0 } + - match: { aggregations.percentiles_double.values.99\.0: 150.0 } --- "Missing field with missing param": @@ -212,15 +206,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_missing.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 1.0 - "75.0": 1.0 - "95.0": 1.0 - "99.0": 1.0 + + - match: { aggregations.percentiles_missing.values.1\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.5\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.25\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.50\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.75\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.95\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.99\.0: 1.0 } --- "Missing field without missing param": @@ -253,15 +246,15 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - match: { aggregations.percentiles_int.meta.foo: "bar" } - - match: - aggregations.percentiles_int.values: - "1.0": 2.5 - "5.0": 8.500000000000002 - "25.0": 38.5 - "50.0": 76.0 - "75.0": 113.5 - "95.0": 143.49999999999997 - "99.0": 149.5 + + + - match: { aggregations.percentiles_int.values.1\.0: 2.5 } + - match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.25\.0: 38.5 } + - match: { aggregations.percentiles_int.values.50\.0: 76.0 } + - match: { aggregations.percentiles_int.values.75\.0: 113.5 } + - match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 } + - match: { aggregations.percentiles_int.values.99\.0: 149.5 } --- "Invalid params test": @@ -335,16 +328,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - 5.0: 8.500000000000002 - 25.0: 38.5 - 50.0: 76.0 - - match: - aggregations.percentiles_double.values: - 5.0: 8.500000000000002 - 25.0: 38.5 - 50.0: 76.0 + + - match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.25\.0: 38.5 } + - match: { aggregations.percentiles_int.values.50\.0: 76.0 } + + - match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 } + - match: { aggregations.percentiles_double.values.25\.0: 38.5 } + - match: { aggregations.percentiles_double.values.50\.0: 76.0 } --- "Non-keyed test": @@ -362,14 +353,13 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - - key: 5.0 - value: 8.500000000000002 - - key: 25.0 - value: 38.5 - - key: 50.0 - value: 76.0 + + - match: { aggregations.percentiles_int.values.0.key: 5.0 } + - match: { aggregations.percentiles_int.values.0.value: 8.500000000000002 } + - match: { aggregations.percentiles_int.values.1.key: 25.0 } + - match: { aggregations.percentiles_int.values.1.value: 38.5 } + - match: { aggregations.percentiles_int.values.2.key: 50.0 } + - match: { aggregations.percentiles_int.values.2.value: 76.0 } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml index 426faae5035..785e3be8d00 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml @@ -67,24 +67,22 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 - - match: - aggregations.percentiles_double.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 + + - match: { aggregations.percentiles_int.values.1\.0: 1.0 } + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_int.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_int.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.1240234375 } + + - match: { aggregations.percentiles_double.values.1\.0: 1.0 } + - match: { aggregations.percentiles_double.values.5\.0: 1.0 } + - match: { aggregations.percentiles_double.values.25\.0: 1.0 } + - match: { aggregations.percentiles_double.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_double.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_double.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_double.values.99\.0: 151.1240234375 } - do: search: @@ -104,24 +102,23 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 - - match: - aggregations.percentiles_double.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 + + - match: { aggregations.percentiles_int.values.1\.0: 1.0 } + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_int.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_int.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.1240234375 } + + - match: { aggregations.percentiles_double.values.1\.0: 1.0 } + - match: { aggregations.percentiles_double.values.5\.0: 1.0 } + - match: { aggregations.percentiles_double.values.25\.0: 1.0 } + - match: { aggregations.percentiles_double.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_double.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_double.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_double.values.99\.0: 151.1240234375 } + --- "Only aggs test": @@ -142,24 +139,23 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 0 } - - match: - aggregations.percentiles_int.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 - - match: - aggregations.percentiles_double.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 + + - match: { aggregations.percentiles_int.values.1\.0: 1.0 } + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_int.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_int.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.1240234375 } + + - match: { aggregations.percentiles_double.values.1\.0: 1.0 } + - match: { aggregations.percentiles_double.values.5\.0: 1.0 } + - match: { aggregations.percentiles_double.values.25\.0: 1.0 } + - match: { aggregations.percentiles_double.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_double.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_double.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_double.values.99\.0: 151.1240234375 } + --- "Filtered test": @@ -185,24 +181,23 @@ setup: - match: { hits.total: 3 } - length: { hits.hits: 3 } - - match: - aggregations.percentiles_int.values: - "1.0": 51.0 - "5.0": 51.0 - "25.0": 51.0 - "50.0": 101.03125 - "75.0": 101.03125 - "95.0": 151.09375 - "99.0": 151.09375 - - match: - aggregations.percentiles_double.values: - "1.0": 51.0 - "5.0": 51.0 - "25.0": 51.0 - "50.0": 101.03125 - "75.0": 101.03125 - "95.0": 151.09375 - "99.0": 151.09375 + + - match: { aggregations.percentiles_int.values.1\.0: 51.0 } + - match: { aggregations.percentiles_int.values.5\.0: 51.0 } + - match: { aggregations.percentiles_int.values.25\.0: 51.0 } + - match: { aggregations.percentiles_int.values.50\.0: 101.03125 } + - match: { aggregations.percentiles_int.values.75\.0: 101.03125 } + - match: { aggregations.percentiles_int.values.95\.0: 151.09375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.09375 } + + - match: { aggregations.percentiles_double.values.1\.0: 51.0 } + - match: { aggregations.percentiles_double.values.5\.0: 51.0 } + - match: { aggregations.percentiles_double.values.25\.0: 51.0 } + - match: { aggregations.percentiles_double.values.50\.0: 101.03125 } + - match: { aggregations.percentiles_double.values.75\.0: 101.03125 } + - match: { aggregations.percentiles_double.values.95\.0: 151.09375 } + - match: { aggregations.percentiles_double.values.99\.0: 151.09375 } + --- "Missing field with missing param": @@ -219,15 +214,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_missing.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 1.0 - "75.0": 1.0 - "95.0": 1.0 - "99.0": 1.0 + + - match: { aggregations.percentiles_missing.values.1\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.5\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.25\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.50\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.75\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.95\.0: 1.0 } + - match: { aggregations.percentiles_missing.values.99\.0: 1.0 } --- "Missing field without missing param": @@ -262,15 +256,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - match: { aggregations.percentiles_int.meta.foo: "bar" } - - match: - aggregations.percentiles_int.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 + + - match: { aggregations.percentiles_int.values.1\.0: 1.0 } + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_int.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_int.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.1240234375 } --- "Invalid params test": @@ -372,16 +365,16 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - - match: - aggregations.percentiles_double.values: - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 + + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + + + - match: { aggregations.percentiles_double.values.5\.0: 1.0 } + - match: { aggregations.percentiles_double.values.25\.0: 1.0 } + - match: { aggregations.percentiles_double.values.50\.0: 51.0302734375 } + --- "Non-keyed test": @@ -400,14 +393,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - - key: 5.0 - value: 1.0 - - key: 25.0 - value: 1.0 - - key: 50.0 - value: 51.0302734375 + + + - match: { aggregations.percentiles_int.values.0.key: 5.0 } + - match: { aggregations.percentiles_int.values.0.value: 1.0 } + - match: { aggregations.percentiles_int.values.1.key: 25.0 } + - match: { aggregations.percentiles_int.values.1.value: 1.0 } + - match: { aggregations.percentiles_int.values.2.key: 50.0 } + - match: { aggregations.percentiles_int.values.2.value: 51.0302734375 } --- @@ -433,15 +426,14 @@ setup: - match: { hits.total: 4 } - length: { hits.hits: 4 } - - match: - aggregations.percentiles_int.values: - "1.0": 1.0 - "5.0": 1.0 - "25.0": 1.0 - "50.0": 51.0302734375 - "75.0": 101.0615234375 - "95.0": 151.1240234375 - "99.0": 151.1240234375 + + - match: { aggregations.percentiles_int.values.1\.0: 1.0 } + - match: { aggregations.percentiles_int.values.5\.0: 1.0 } + - match: { aggregations.percentiles_int.values.25\.0: 1.0 } + - match: { aggregations.percentiles_int.values.50\.0: 51.0302734375 } + - match: { aggregations.percentiles_int.values.75\.0: 101.0615234375 } + - match: { aggregations.percentiles_int.values.95\.0: 151.1240234375 } + - match: { aggregations.percentiles_int.values.99\.0: 151.1240234375 } - match: { _shards.failures.0.reason.type: array_index_out_of_bounds_exception } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml index e90fda9fe0d..524c1c59396 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml @@ -13,7 +13,8 @@ setup: --- "Nested inner hits": - skip: - version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node + # this will only run in a mixed cluster environment with at least 1 5.x node + version: "5.99.99 - " reason: multiple types are not supported on 6.x indices onwards - do: index: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml index 5ea597436be..fa012ff3acb 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml @@ -278,13 +278,11 @@ setup: index: test type: test body: - collapse: { - field: numeric_group, - inner_hits: [ - { name: sub_hits_asc, size: 2, sort: [{ sort: asc }] }, - { name: sub_hits_desc, size: 1, sort: [{ sort: desc }] } - ] - } + collapse: + field: numeric_group + inner_hits: + - { name: sub_hits_asc, size: 2, sort: [{ sort: asc }] } + - { name: sub_hits_desc, size: 1, sort: [{ sort: desc }] } sort: [{ sort: desc }] - match: { hits.total: 6 } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml index 158102f2014..343808e3374 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml @@ -117,7 +117,8 @@ setup: - match: { _shards.total: 3 } - match: { _shards.successful: 3 } - - match: { _shards.skipped : 2} # skip 2 and execute one to fetch the actual empty result + # skip 2 and execute one to fetch the actual empty result + - match: { _shards.skipped : 2} - match: { _shards.failed: 0 } - match: { hits.total: 0 } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml index 3ee99822452..5ba87875823 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml @@ -81,8 +81,7 @@ setup: body: query: match_all: {} - script_fields: { - "test1" : { "script" : { "lang": "painless", "source": "1" }}, - "test2" : { "script" : { "lang": "painless", "source": "1" }}, - "test3" : { "script" : { "lang": "painless", "source": "1" }} - } + script_fields: + "test1" : { "script" : { "lang": "painless", "source": "1;" }} + "test2" : { "script" : { "lang": "painless", "source": "1;" }} + "test3" : { "script" : { "lang": "painless", "source": "1;" }}