Skip to content
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

[Transform] reenable bwc #53329

Merged
merged 3 commits into from
Mar 10, 2020
Merged

[Transform] reenable bwc #53329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d7fed
disable BWC in order to merge #53324
Mar 10, 2020
b42cccd
Merge branch 'master' of github.com:elastic/elasticsearch into transf…
Mar 10, 2020
97769ef
re-enable BWC and finish backport of #53324
Mar 10, 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 @@ -220,8 +220,8 @@ task 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/53324" /* 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 @@ -80,7 +80,7 @@ public SingleGroupSource(final String field, final ScriptConfig scriptConfig) {

public SingleGroupSource(StreamInput in) throws IOException {
field = in.readOptionalString();
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // change to 7.7.0
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
scriptConfig = in.readOptionalWriteable(ScriptConfig::new);
} else {
scriptConfig = null;
Expand All @@ -107,7 +107,7 @@ protected void innerXContent(XContentBuilder builder, Params params) throws IOEx
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(field);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
out.writeOptionalWriteable(scriptConfig);
}
}
Expand Down