honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump BWC versions after #25658 backport to 5.6

This commit is contained in:
Simon Willnauer 2017-07-14 23:49:50 +02:00
parent a6bea1bf97
commit ccda0441e1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/action/search/SearchRequest.java
View File

@ -406,7 +406,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
indicesOptions = IndicesOptions.readIndicesOptions(in); indicesOptions = IndicesOptions.readIndicesOptions(in);
requestCache = in.readOptionalBoolean(); requestCache = in.readOptionalBoolean();
batchedReduceSize = in.readVInt(); batchedReduceSize = in.readVInt();
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
maxConcurrentShardRequests = in.readVInt(); maxConcurrentShardRequests = in.readVInt();
preFilterShardSize = in.readVInt(); preFilterShardSize = in.readVInt();
} }
@ -428,7 +428,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest
indicesOptions.writeIndicesOptions(out); indicesOptions.writeIndicesOptions(out);
out.writeOptionalBoolean(requestCache); out.writeOptionalBoolean(requestCache);
out.writeVInt(batchedReduceSize); out.writeVInt(batchedReduceSize);
if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
out.writeVInt(maxConcurrentShardRequests); out.writeVInt(maxConcurrentShardRequests);
out.writeVInt(preFilterShardSize); out.writeVInt(preFilterShardSize);
} }

4
core/src/main/java/org/elasticsearch/action/search/SearchResponse.java
View File

@ -324,7 +324,7 @@ public class SearchResponse extends ActionResponse implements StatusToXContentOb
} }
scrollId = in.readOptionalString(); scrollId = in.readOptionalString();
tookInMillis = in.readVLong(); tookInMillis = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
skippedShards = in.readVInt(); skippedShards = in.readVInt();
} }
} }
@ -343,7 +343,7 @@ public class SearchResponse extends ActionResponse implements StatusToXContentOb
out.writeOptionalString(scrollId); out.writeOptionalString(scrollId);
out.writeVLong(tookInMillis); out.writeVLong(tookInMillis);
if(out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if(out.getVersion().onOrAfter(Version.V_5_6_0)) {
out.writeVInt(skippedShards); out.writeVInt(skippedShards);
} }
} }

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

@ -40,8 +40,8 @@ setup:
--- ---
"pre_filter_shard_size with invalid parameter": "pre_filter_shard_size with invalid parameter":
- skip: - skip:
version: " - 5.99.99" version: " - 5.5.99"
reason: this was added in 6.0.0 reason: this was added in 5.6.0
- do: - do:
catch: /preFilterShardSize must be >= 1/ catch: /preFilterShardSize must be >= 1/
search: search:
@ -51,8 +51,8 @@ setup:
--- ---
"pre_filter_shard_size with shards that have no hit": "pre_filter_shard_size with shards that have no hit":
- skip: - skip:
version: " - 5.99.99" version: " - 5.5.99"
reason: this was added in 6.0.0 reason: this was added in 5.6.0
- do: - do:
index: index:
index: index_1 index: index_1