1
0
Эх сурвалжийг харах

[Transform] re-enable BWC (#60393)

re-enable bwc tests after PR #60390
Hendrik Muhs 5 жил өмнө
parent
commit
b9a457c903

+ 2 - 2
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")

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java

@@ -91,7 +91,7 @@ public abstract class SingleGroupSource implements Writeable, ToXContentObject {
         } 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 abstract class SingleGroupSource implements Writeable, ToXContentObject {
         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);
         }
     }

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java

@@ -34,7 +34,7 @@ public class DateHistogramGroupSourceTests extends AbstractSerializingTestCase<D
         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()) {

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java

@@ -26,7 +26,7 @@ public class GeoTileGroupSourceTests extends AbstractSerializingTestCase<GeoTile
 
     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,

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java

@@ -24,7 +24,7 @@ public class HistogramGroupSourceTests extends AbstractSerializingTestCase<Histo
         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);
     }

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java

@@ -24,7 +24,7 @@ public class TermsGroupSourceTests extends AbstractSerializingTestCase<TermsGrou
         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);
     }