From 18894e98ae0e5518c3ee34f7ae9fa554d6c798d9 Mon Sep 17 00:00:00 2001 From: Christos Soulios Date: Mon, 20 Jun 2022 17:15:18 +0300 Subject: [PATCH 1/3] Expose aggregate_metric_double in field caps --- .../AggregateDoubleMetricFieldMapper.java | 5 -- ...AggregateDoubleMetricFieldMapperTests.java | 2 +- .../test/aggregate-metrics/100_field_caps.yml | 58 +++++++++++++++++++ 3 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java index fc8170a681065..a36572488ff89 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java @@ -299,11 +299,6 @@ private NumberFieldMapper.NumberFieldType delegateFieldType() { return delegateFieldType(defaultMetric); } - @Override - public String familyTypeName() { - return NumberFieldMapper.NumberType.DOUBLE.typeName(); - } - @Override public String typeName() { return CONTENT_TYPE; diff --git a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java index b51f522f2dcc3..1fbd1c018c670 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java @@ -517,7 +517,7 @@ public void testNoSubFieldsIterated() throws IOException { public void testFieldCaps() throws IOException { MapperService aggMetricMapperService = createMapperService(fieldMapping(this::minimalMapping)); MappedFieldType fieldType = aggMetricMapperService.fieldType("field"); - assertThat(fieldType.familyTypeName(), equalTo("double")); + assertThat(fieldType.familyTypeName(), equalTo("aggregate_metric_double")); assertTrue(fieldType.isSearchable()); assertTrue(fieldType.isAggregatable()); } diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml new file mode 100644 index 0000000000000..4022117976253 --- /dev/null +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml @@ -0,0 +1,58 @@ +setup: + - skip: + version: " - 7.15.99" + reason: introduced in 7.16.0 + + - do: + indices.create: + index: test_aggregate_metric + body: + mappings: + properties: + metric: + type: aggregate_metric_double + metrics: [min, max, value_count] + default_metric: max + +--- +field capabilities: + - skip: + version: " - 8.3.99" + reason: aggregate_metric_double fields caps changed in 8.4.0 + + - do: + field_caps: + index: test_aggregate_metric + fields: [metric] + + - match: {fields.metric.aggregate_metric_double.searchable: true} + - match: {fields.metric.aggregate_metric_double.aggregatable: true} + - is_false: fields.metric.aggregate_metric_double.indices + + +--- +field capabilities with conflict: + - skip: + version: " - 8.3.99" + reason: aggregate_metric_double fields caps changed in 8.4.0 + + - do: + indices.create: + index: test_double + body: + mappings: + properties: + metric: + type: double + + - do: + field_caps: + index: test_* + fields: [metric] + + - match: {fields.metric.aggregate_metric_double.searchable: true} + - match: {fields.metric.aggregate_metric_double.aggregatable: true} + - match: {fields.metric.aggregate_metric_double.indices: [test_aggregate_metric]} + - match: {fields.metric.double.searchable: true} + - match: {fields.metric.double.aggregatable: true} + - match: {fields.metric.double.indices: [test_double]} From 87efd1f2b4d26cfafafec22346ea907de42c5c61 Mon Sep 17 00:00:00 2001 From: Christos Soulios Date: Mon, 20 Jun 2022 17:50:25 +0300 Subject: [PATCH 2/3] Minor change --- .../test/aggregate-metrics/100_field_caps.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml index 4022117976253..d69efd1ba9bae 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml @@ -1,7 +1,7 @@ setup: - skip: - version: " - 7.15.99" - reason: introduced in 7.16.0 + version: " - 8.3.99" + reason: aggregate_metric_double field caps changed in 8.4.0 - do: indices.create: @@ -18,7 +18,7 @@ setup: field capabilities: - skip: version: " - 8.3.99" - reason: aggregate_metric_double fields caps changed in 8.4.0 + reason: aggregate_metric_double field caps changed in 8.4.0 - do: field_caps: @@ -34,7 +34,7 @@ field capabilities: field capabilities with conflict: - skip: version: " - 8.3.99" - reason: aggregate_metric_double fields caps changed in 8.4.0 + reason: aggregate_metric_double field caps changed in 8.4.0 - do: indices.create: From de07014003a1e5542f8fb4d3d57a3eee183fea32 Mon Sep 17 00:00:00 2001 From: Christos Soulios Date: Thu, 4 Aug 2022 20:54:35 +0300 Subject: [PATCH 3/3] Merged field caps tests --- .../test/aggregate-metrics/100_field_caps.yml | 58 ------------------- .../test/aggregate-metrics/110_field_caps.yml | 52 +++++++++++++++++ 2 files changed, 52 insertions(+), 58 deletions(-) delete mode 100644 x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml deleted file mode 100644 index d69efd1ba9bae..0000000000000 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_field_caps.yml +++ /dev/null @@ -1,58 +0,0 @@ -setup: - - skip: - version: " - 8.3.99" - reason: aggregate_metric_double field caps changed in 8.4.0 - - - do: - indices.create: - index: test_aggregate_metric - body: - mappings: - properties: - metric: - type: aggregate_metric_double - metrics: [min, max, value_count] - default_metric: max - ---- -field capabilities: - - skip: - version: " - 8.3.99" - reason: aggregate_metric_double field caps changed in 8.4.0 - - - do: - field_caps: - index: test_aggregate_metric - fields: [metric] - - - match: {fields.metric.aggregate_metric_double.searchable: true} - - match: {fields.metric.aggregate_metric_double.aggregatable: true} - - is_false: fields.metric.aggregate_metric_double.indices - - ---- -field capabilities with conflict: - - skip: - version: " - 8.3.99" - reason: aggregate_metric_double field caps changed in 8.4.0 - - - do: - indices.create: - index: test_double - body: - mappings: - properties: - metric: - type: double - - - do: - field_caps: - index: test_* - fields: [metric] - - - match: {fields.metric.aggregate_metric_double.searchable: true} - - match: {fields.metric.aggregate_metric_double.aggregatable: true} - - match: {fields.metric.aggregate_metric_double.indices: [test_aggregate_metric]} - - match: {fields.metric.double.searchable: true} - - match: {fields.metric.double.aggregatable: true} - - match: {fields.metric.double.indices: [test_double]} diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml index 29fc5226c4cda..abf367043d9c8 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml @@ -72,6 +72,58 @@ setup: type: double time_series_metric: gauge + - do: + indices.create: + index: test_aggregate_metric + body: + mappings: + properties: + metric: + type: aggregate_metric_double + metrics: [ min, max, value_count ] + default_metric: max + +--- +aggregate_metric on standard index: + - skip: + version: " - 8.4.99" + reason: aggregate_metric_double field caps changed in 8.5.0 + + - do: + field_caps: + index: test_aggregate_metric + fields: [ metric ] + + - match: { fields.metric.aggregate_metric_double.searchable: true } + - match: { fields.metric.aggregate_metric_double.aggregatable: true } + - is_false: fields.metric.aggregate_metric_double.indices + +--- +aggregate_metric on standard index conflict with double: + - skip: + version: " - 8.4.99" + reason: aggregate_metric_double field caps changed in 8.5.0 + + - do: + indices.create: + index: test_double + body: + mappings: + properties: + metric: + type: double + + - do: + field_caps: + index: [test_double, test_aggregate_metric] + fields: [ metric ] + + - match: { fields.metric.aggregate_metric_double.searchable: true } + - match: { fields.metric.aggregate_metric_double.aggregatable: true } + - match: { fields.metric.aggregate_metric_double.indices: [ test_aggregate_metric ] } + - match: { fields.metric.double.searchable: true } + - match: { fields.metric.double.aggregatable: true } + - match: { fields.metric.double.indices: [ test_double ] } --- # Test field_caps on a rollup index