Skip to content

Commit 2ddd79f

Browse files
authored
Adapt version after backport (#65934)
This commit adapts the version check for #65706 in preparation of the backport in #65927. The bwc tests are also disabled to not fail the build before #65927 gets merged.
1 parent aa4ab0b commit 2ddd79f

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
@@ -175,8 +175,8 @@ tasks.register("verifyVersions") {
175175
* after the backport of the backcompat code is complete.
176176
*/
177177

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

server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public ShardSearchRequest(StreamInput in) throws IOException {
197197
requestCache = in.readOptionalBoolean();
198198
clusterAlias = in.readOptionalString();
199199
allowPartialSearchResults = in.readBoolean();
200-
if (in.getVersion().before(Version.V_8_0_0)) {
200+
if (in.getVersion().before(Version.V_7_11_0)) {
201201
in.readStringArray();
202202
in.readOptionalString();
203203
}
@@ -266,7 +266,7 @@ protected final void innerWriteTo(StreamOutput out, boolean asKey) throws IOExce
266266
out.writeOptionalBoolean(requestCache);
267267
out.writeOptionalString(clusterAlias);
268268
out.writeBoolean(allowPartialSearchResults);
269-
if (asKey == false && out.getVersion().before(Version.V_8_0_0)) {
269+
if (asKey == false && out.getVersion().before(Version.V_7_11_0)) {
270270
out.writeStringArray(Strings.EMPTY_ARRAY);
271271
out.writeOptionalString(null);
272272
}

0 commit comments

Comments
 (0)