Skip to content

Commit ccda044

Browse files
committed
Bump BWC versions after #25658 backport to 5.6
1 parent a6bea1b commit ccda044

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public void readFrom(StreamInput in) throws IOException {
406406
indicesOptions = IndicesOptions.readIndicesOptions(in);
407407
requestCache = in.readOptionalBoolean();
408408
batchedReduceSize = in.readVInt();
409-
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
409+
if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
410410
maxConcurrentShardRequests = in.readVInt();
411411
preFilterShardSize = in.readVInt();
412412
}
@@ -428,7 +428,7 @@ public void writeTo(StreamOutput out) throws IOException {
428428
indicesOptions.writeIndicesOptions(out);
429429
out.writeOptionalBoolean(requestCache);
430430
out.writeVInt(batchedReduceSize);
431-
if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
431+
if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
432432
out.writeVInt(maxConcurrentShardRequests);
433433
out.writeVInt(preFilterShardSize);
434434
}

core/src/main/java/org/elasticsearch/action/search/SearchResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public void readFrom(StreamInput in) throws IOException {
324324
}
325325
scrollId = in.readOptionalString();
326326
tookInMillis = in.readVLong();
327-
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
327+
if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
328328
skippedShards = in.readVInt();
329329
}
330330
}
@@ -343,7 +343,7 @@ public void writeTo(StreamOutput out) throws IOException {
343343

344344
out.writeOptionalString(scrollId);
345345
out.writeVLong(tookInMillis);
346-
if(out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
346+
if(out.getVersion().onOrAfter(Version.V_5_6_0)) {
347347
out.writeVInt(skippedShards);
348348
}
349349
}

rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ setup:
4040
---
4141
"pre_filter_shard_size with invalid parameter":
4242
- skip:
43-
version: " - 5.99.99"
44-
reason: this was added in 6.0.0
43+
version: " - 5.5.99"
44+
reason: this was added in 5.6.0
4545
- do:
4646
catch: /preFilterShardSize must be >= 1/
4747
search:
@@ -51,8 +51,8 @@ setup:
5151
---
5252
"pre_filter_shard_size with shards that have no hit":
5353
- skip:
54-
version: " - 5.99.99"
55-
reason: this was added in 6.0.0
54+
version: " - 5.5.99"
55+
reason: this was added in 5.6.0
5656
- do:
5757
index:
5858
index: index_1

0 commit comments

Comments
 (0)