Skip to content

[Transform] re-enable BWC #60393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 30, 2020
Merged

[Transform] re-enable BWC #60393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599a090
adapt versions (BWC)
Jul 29, 2020
0305f14
re-enable BWC
Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...rg/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/elasticsearch/xpack/core/transform/transforms/pivot/GeoTileGroupSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down