Skip to content

Commit 33ef69e

Browse files
committed
Prepare to backport elastic#53793
Update version in wire protocol and disable BWC.
1 parent ffbb558 commit 33ef69e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ task verifyVersions {
222222
* after the backport of the backcompat code is complete.
223223
*/
224224

225-
boolean bwc_tests_enabled = true
226-
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
225+
boolean bwc_tests_enabled = false
226+
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/53793" /* place a PR link here when committing bwc changes */
227227
if (bwc_tests_enabled == false) {
228228
if (bwc_tests_disabled_issue.isEmpty()) {
229229
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public void readFromWithId(SearchContextId id, StreamInput in) throws IOExceptio
320320
}
321321
}
322322
setTopDocs(readTopDocs(in));
323-
if (in.getVersion().before(Version.V_8_0_0)) {
323+
if (in.getVersion().before(Version.V_7_7_0)) {
324324
InternalAggregations readAggs = null;
325325
if (hasAggs = in.readBoolean()) {
326326
readAggs = new InternalAggregations(in);
@@ -398,7 +398,7 @@ public void writeToNoId(StreamOutput out) throws IOException {
398398
}
399399
} else {
400400
out.writeBoolean(true);
401-
if (out.getVersion().before(Version.V_8_0_0)) {
401+
if (out.getVersion().before(Version.V_7_7_0)) {
402402
InternalAggregations aggs = aggregations.get();
403403
aggs.writeTo(out);
404404
if (out.getVersion().before(Version.V_7_2_0)) {

0 commit comments

Comments
 (0)