Skip to content

Commit b9a457c

Browse files
author
Hendrik Muhs
authored
[Transform] re-enable BWC (#60393)
re-enable bwc tests after PR #60390
1 parent b487990 commit b9a457c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
174174
* after the backport of the backcompat code is complete.
175175
*/
176176

177-
boolean bwc_tests_enabled = false
178-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/60390" /* place a PR link here when committing bwc changes */
177+
boolean bwc_tests_enabled = true
178+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
179179
if (bwc_tests_enabled == false) {
180180
if (bwc_tests_disabled_issue.isEmpty()) {
181181
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public SingleGroupSource(StreamInput in) throws IOException {
9191
} else {
9292
scriptConfig = null;
9393
}
94-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_10_0
94+
if (in.getVersion().onOrAfter(Version.V_7_10_0)) {
9595
missingBucket = in.readBoolean();
9696
} else {
9797
missingBucket = false;
@@ -124,7 +124,7 @@ public void writeTo(StreamOutput out) throws IOException {
124124
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
125125
out.writeOptionalWriteable(scriptConfig);
126126
}
127-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_10_0
127+
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
128128
out.writeBoolean(missingBucket);
129129
}
130130
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static DateHistogramGroupSource randomDateHistogramGroupSource(Version ve
3434
ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0)
3535
? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig()
3636
: null;
37-
boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0
37+
boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false;
3838

3939
DateHistogramGroupSource dateHistogramGroupSource;
4040
if (randomBoolean()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static GeoTileGroupSource randomGeoTileGroupSource() {
2626

2727
public static GeoTileGroupSource randomGeoTileGroupSource(Version version) {
2828
Rectangle rectangle = GeometryTestUtils.randomRectangle();
29-
boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0
29+
boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false;
3030
return new GeoTileGroupSource(
3131
randomBoolean() ? null : randomAlphaOfLength(10),
3232
missingBucket,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static HistogramGroupSource randomHistogramGroupSource(Version version) {
2424
ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0)
2525
? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig()
2626
: null;
27-
boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0
27+
boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false;
2828
double interval = randomDoubleBetween(Math.nextUp(0), Double.MAX_VALUE, false);
2929
return new HistogramGroupSource(field, scriptConfig, missingBucket, interval);
3030
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static TermsGroupSource randomTermsGroupSource(Version version) {
2424
ScriptConfig scriptConfig = version.onOrAfter(Version.V_7_7_0)
2525
? randomBoolean() ? null : ScriptConfigTests.randomScriptConfig()
2626
: null;
27-
boolean missingBucket = version.onOrAfter(Version.V_8_0_0) ? randomBoolean() : false; // todo: V_7_10_0
27+
boolean missingBucket = version.onOrAfter(Version.V_7_10_0) ? randomBoolean() : false;
2828
return new TermsGroupSource(field, scriptConfig, missingBucket);
2929
}
3030

0 commit comments

Comments
 (0)