From ed38fd2844324cfb609fab1c7f0c948e7ebe671e Mon Sep 17 00:00:00 2001 From: Salvatore Campagna <93581129+salvatore-campagna@users.noreply.github.com> Date: Thu, 31 Mar 2022 11:27:53 +0200 Subject: [PATCH 1/4] fix: remove two tests from 7.17 Backport PR #85467 added two tests: * Multi-value date histogram * Multi-value date histogram docvalues only as a result of a mistake while doing a conflict resolution. With this PR I will remove them temporarily from master, backport the fix to 7.17.3 and later make another PR to master to add them back. This is a fix for #85509. --- .../search.aggregation/360_date_histogram.yml | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml index 0e3d91c739a84..9dfa382daecd7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml @@ -312,45 +312,3 @@ setup: - match: { aggregations.date_histogram_no__tz.buckets.2.key: 1619906400000 } - match: { aggregations.date_histogram_no__tz.buckets.3.key: 1619910000000 } ---- -"Multi-value date histogram": - - skip: - version: "all" - reason: AwaitsFix https://github.com/elastic/elasticsearch/issues/85509 - - - do: - search: - body: - query: - match: - date: "2021-04-01" - aggs: - datehisto: - date_histogram: - field: "date" - calendar_interval: "1M" - - - match: { hits.total.value: 1 } - - length: { aggregations.datehisto.buckets: 2 } - ---- -"Multi-value date histogram docvalues only": - - skip: - version: "all" - reason: AwaitsFix https://github.com/elastic/elasticsearch/issues/85509 - - - do: - search: - body: - profile: true - query: - match: - date_not_indexed: "2021-04-01" - aggs: - datehisto: - date_histogram: - field: "date_not_indexed" - calendar_interval: "1M" - - - match: { hits.total.value: 1 } - - length: { aggregations.datehisto.buckets: 3 } From 57cc5ead78e54138e2e168993ac32e4fc1c379e5 Mon Sep 17 00:00:00 2001 From: Salvatore Campagna <93581129+salvatore-campagna@users.noreply.github.com> Date: Thu, 31 Mar 2022 11:34:08 +0200 Subject: [PATCH 2/4] fix: remove skip test after removing the two tests --- rest-api-spec/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle index 296ccee88ec70..3baa2593f7da6 100644 --- a/rest-api-spec/build.gradle +++ b/rest-api-spec/build.gradle @@ -82,8 +82,6 @@ tasks.named("yamlRestTestV7CompatTransform").configure { task -> task.skipTest("search.aggregation/20_terms/string profiler via map", "The profiler results aren't backwards compatible.") task.skipTest("search.aggregation/20_terms/numeric profiler", "The profiler results aren't backwards compatible.") task.skipTest("migration/10_get_feature_upgrade_status/Get feature upgrade status", "Awaits backport") - task.skipTest("search.aggregation/360_date_histogram/Multi-value date histogram", "Awaits Fix #85509") - task.skipTest("search.aggregation/360_date_histogram/Multi-value date histogram docvalues only", "Awaits Fix #85509") task.replaceValueInMatch("_type", "_doc") task.addAllowedWarningRegex("\\[types removal\\].*") From 0fd6681e19c733296bca2e06a32e50d06597d80d Mon Sep 17 00:00:00 2001 From: Salvatore Campagna <93581129+salvatore-campagna@users.noreply.github.com> Date: Thu, 31 Mar 2022 11:37:12 +0200 Subject: [PATCH 3/4] Update docs/changelog/85534.yaml --- docs/changelog/85534.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/85534.yaml diff --git a/docs/changelog/85534.yaml b/docs/changelog/85534.yaml new file mode 100644 index 0000000000000..7168d957dd49e --- /dev/null +++ b/docs/changelog/85534.yaml @@ -0,0 +1,5 @@ +pr: 85534 +summary: "Fix: remove tests from 7.17" +area: Aggregations +type: bug +issues: [] From 4440b41c493198cb2eae94e910c4495052353270 Mon Sep 17 00:00:00 2001 From: Salvatore Campagna <93581129+salvatore-campagna@users.noreply.github.com> Date: Thu, 31 Mar 2022 11:59:06 +0200 Subject: [PATCH 4/4] fix: will unmute the tests in the following PR to master --- rest-api-spec/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle index 3baa2593f7da6..296ccee88ec70 100644 --- a/rest-api-spec/build.gradle +++ b/rest-api-spec/build.gradle @@ -82,6 +82,8 @@ tasks.named("yamlRestTestV7CompatTransform").configure { task -> task.skipTest("search.aggregation/20_terms/string profiler via map", "The profiler results aren't backwards compatible.") task.skipTest("search.aggregation/20_terms/numeric profiler", "The profiler results aren't backwards compatible.") task.skipTest("migration/10_get_feature_upgrade_status/Get feature upgrade status", "Awaits backport") + task.skipTest("search.aggregation/360_date_histogram/Multi-value date histogram", "Awaits Fix #85509") + task.skipTest("search.aggregation/360_date_histogram/Multi-value date histogram docvalues only", "Awaits Fix #85509") task.replaceValueInMatch("_type", "_doc") task.addAllowedWarningRegex("\\[types removal\\].*")