From 599a090318da324608815a79b7f57a12119c4f59 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 29 Jul 2020 15:07:40 +0200 Subject: [PATCH 1/2] adapt versions (BWC) --- .../core/transform/transforms/pivot/SingleGroupSource.java | 4 ++-- .../transforms/pivot/DateHistogramGroupSourceTests.java | 2 +- .../transform/transforms/pivot/GeoTileGroupSourceTests.java | 2 +- .../transform/transforms/pivot/HistogramGroupSourceTests.java | 2 +- .../transform/transforms/pivot/TermsGroupSourceTests.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java index ea06cd551425c..c9e983d058bdc 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java @@ -91,7 +91,7 @@ public SingleGroupSource(StreamInput in) throws IOException { } else { scriptConfig = null; } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_10_0 + if (in.getVersion().onOrAfter(Version.V_7_10_0)) { missingBucket = in.readBoolean(); } else { missingBucket = false; @@ -124,7 +124,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_7_0)) { out.writeOptionalWriteable(scriptConfig); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_10_0 + if (out.getVersion().onOrAfter(Version.V_7_10_0)) { out.writeBoolean(missingBucket); } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java index 4a538af8fc0c6..60fe4577340fb 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java @@ -34,7 +34,7 @@ public static DateHistogramGroupSource randomDateHistogramGroupSource(Version ve ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0) ? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig() : null; - boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0 + boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false; DateHistogramGroupSource dateHistogramGroupSource; if (randomBoolean()) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java index 28b71d8bfdb35..5576df181bf54 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java @@ -26,7 +26,7 @@ public static GeoTileGroupSource randomGeoTileGroupSource() { public static GeoTileGroupSource randomGeoTileGroupSource(Version version) { Rectangle rectangle = GeometryTestUtils.randomRectangle(); - boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0 + boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false; return new GeoTileGroupSource( randomBoolean() ? null : randomAlphaOfLength(10), missingBucket, diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java index e58fe2dbc02d8..432f8779c24b8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java @@ -24,7 +24,7 @@ public static HistogramGroupSource randomHistogramGroupSource(Version version) { ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0) ? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig() : null; - boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0 + boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false; double interval = randomDoubleBetween(Math.nextUp(0), Double.MAX_VALUE, false); return new HistogramGroupSource(field, scriptConfig, missingBucket, interval); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java index ffcc269448ce1..c143fa9abf3f0 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java @@ -24,7 +24,7 @@ public static TermsGroupSource randomTermsGroupSource(Version version) { ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0) ? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig() : null; - boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0 + boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false; return new TermsGroupSource(field, scriptConfig, missingBucket); } From 0305f14f7758cbb6182072cb21d4bd354bfe0114 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Thu, 30 Jul 2020 08:32:47 +0200 Subject: [PATCH 2/2] re-enable BWC --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0c5ac61124b86..44f3d4559ec0a 100644 --- a/build.gradle +++ b/build.gradle @@ -174,8 +174,8 @@ tasks.register("verifyVersions") { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false -final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/60390" /* place a PR link here when committing bwc changes */ +boolean bwc_tests_enabled = true +final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")