From ccda0441e146d3d4a218a5eec7b614e339f82cdc Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Fri, 14 Jul 2017 23:49:50 +0200 Subject: [PATCH] Bump BWC versions after #25658 backport to 5.6 --- .../org/elasticsearch/action/search/SearchRequest.java | 4 ++-- .../org/elasticsearch/action/search/SearchResponse.java | 4 ++-- .../test/search/140_pre_filter_search_shards.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 19556d1e726..3690bff5664 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -406,7 +406,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest indicesOptions = IndicesOptions.readIndicesOptions(in); requestCache = in.readOptionalBoolean(); 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(); preFilterShardSize = in.readVInt(); } @@ -428,7 +428,7 @@ public final class SearchRequest extends ActionRequest implements IndicesRequest indicesOptions.writeIndicesOptions(out); out.writeOptionalBoolean(requestCache); 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(preFilterShardSize); } diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java index a1709c469d5..9e4b9382ab0 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -324,7 +324,7 @@ public class SearchResponse extends ActionResponse implements StatusToXContentOb } scrollId = in.readOptionalString(); 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(); } } @@ -343,7 +343,7 @@ public class SearchResponse extends ActionResponse implements StatusToXContentOb out.writeOptionalString(scrollId); 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); } } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml index 0095d2b1e90..158102f2014 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml @@ -40,8 +40,8 @@ setup: --- "pre_filter_shard_size with invalid parameter": - skip: - version: " - 5.99.99" - reason: this was added in 6.0.0 + version: " - 5.5.99" + reason: this was added in 5.6.0 - do: catch: /preFilterShardSize must be >= 1/ search: @@ -51,8 +51,8 @@ setup: --- "pre_filter_shard_size with shards that have no hit": - skip: - version: " - 5.99.99" - reason: this was added in 6.0.0 + version: " - 5.5.99" + reason: this was added in 5.6.0 - do: index: index: index_1