Skip to content

Commit 998461c

Browse files
authored
Test fix - reenable BWC tests and lower version checks now that PR 28440 for allowPartialSearchResults flag backported to 6.x (#28482)
Support for allowPartialSearchResults is now in 6.3 so changing master BWC checks accordingly
1 parent 1970e01 commit 998461c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ task verifyVersions {
145145
* after the backport of the backcompat code is complete.
146146
*/
147147
allprojects {
148-
ext.bwc_tests_enabled = false
148+
ext.bwc_tests_enabled = true
149149
}
150150

151151
task verifyBwcTestsEnabled {

server/src/main/java/org/elasticsearch/action/search/SearchRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public SearchRequest(StreamInput in) throws IOException {
138138
maxConcurrentShardRequests = in.readVInt();
139139
preFilterShardSize = in.readVInt();
140140
}
141-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
141+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
142142
allowPartialSearchResults = in.readOptionalBoolean();
143143
}
144144
}
@@ -163,7 +163,7 @@ public void writeTo(StreamOutput out) throws IOException {
163163
out.writeVInt(maxConcurrentShardRequests);
164164
out.writeVInt(preFilterShardSize);
165165
}
166-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
166+
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
167167
out.writeOptionalBoolean(allowPartialSearchResults);
168168
}
169169
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ protected void innerReadFrom(StreamInput in) throws IOException {
222222
if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
223223
clusterAlias = in.readOptionalString();
224224
}
225-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
225+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
226226
allowPartialSearchResults = in.readOptionalBoolean();
227227
}
228228
}
@@ -247,7 +247,7 @@ protected void innerWriteTo(StreamOutput out, boolean asKey) throws IOException
247247
if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
248248
out.writeOptionalString(clusterAlias);
249249
}
250-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
250+
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
251251
out.writeOptionalBoolean(allowPartialSearchResults);
252252
}
253253

0 commit comments

Comments
 (0)