Skip to content

Commit

Permalink
Prepare to backport elastic#53793 (elastic#54010)
Browse files Browse the repository at this point in the history
Update version in wire protocol and disable BWC.
  • Loading branch information
nik9000 authored Mar 23, 2020
1 parent ec4c699 commit 1016e20
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ task verifyVersions {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/53793" /* 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
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void readFromWithId(SearchContextId id, StreamInput in) throws IOExceptio
}
}
setTopDocs(readTopDocs(in));
if (in.getVersion().before(Version.V_8_0_0)) {
if (in.getVersion().before(Version.V_7_7_0)) {
InternalAggregations readAggs = null;
if (hasAggs = in.readBoolean()) {
readAggs = new InternalAggregations(in);
Expand Down Expand Up @@ -398,7 +398,7 @@ public void writeToNoId(StreamOutput out) throws IOException {
}
} else {
out.writeBoolean(true);
if (out.getVersion().before(Version.V_8_0_0)) {
if (out.getVersion().before(Version.V_7_7_0)) {
InternalAggregations aggs = aggregations.get();
aggs.writeTo(out);
if (out.getVersion().before(Version.V_7_2_0)) {
Expand Down

0 comments on commit 1016e20

Please sign in to comment.