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

Adjust serialization versions after backport 

Relates #29533
This commit is contained in:
Jim Ferenczi 2018-04-26 14:06:56 +02:00
parent 05ef60135b
commit 752ba2fb45
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
View File

@ -235,7 +235,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
if (in.getVersion().onOrAfter(Version.V_6_3_0)) { if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
allowPartialSearchResults = in.readOptionalBoolean(); allowPartialSearchResults = in.readOptionalBoolean();
} }
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
indexRoutings = in.readStringArray(); indexRoutings = in.readStringArray();
preference = in.readOptionalString(); preference = in.readOptionalString();
} else { } else {
@ -268,7 +268,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
out.writeOptionalBoolean(allowPartialSearchResults); out.writeOptionalBoolean(allowPartialSearchResults);
} }
if (asKey == false) { if (asKey == false) {
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeStringArray(indexRoutings); out.writeStringArray(indexRoutings);
out.writeOptionalString(preference); out.writeOptionalString(preference);
} }

4
server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java
View File

@ -225,7 +225,7 @@ public class SliceBuilder implements Writeable, ToXContentObject {
int shardId = request.shardId().id(); int shardId = request.shardId().id();
int numShards = context.getIndexSettings().getNumberOfShards(); int numShards = context.getIndexSettings().getNumberOfShards();
if (minNodeVersion.onOrAfter(Version.V_7_0_0_alpha1) && if (minNodeVersion.onOrAfter(Version.V_6_4_0) &&
(request.preference() != null || request.indexRoutings().length > 0)) { (request.preference() != null || request.indexRoutings().length > 0)) {
GroupShardsIterator<ShardIterator> group = buildShardIterator(clusterService, request); GroupShardsIterator<ShardIterator> group = buildShardIterator(clusterService, request);
assert group.size() <= numShards : "index routing shards: " + group.size() + assert group.size() <= numShards : "index routing shards: " + group.size() +
@ -235,7 +235,7 @@ public class SliceBuilder implements Writeable, ToXContentObject {
* The routing of this request targets a subset of the shards of this index so we need to we retrieve * The routing of this request targets a subset of the shards of this index so we need to we retrieve
* the original {@link GroupShardsIterator} and compute the request shard id and number of * the original {@link GroupShardsIterator} and compute the request shard id and number of
* shards from it. * shards from it.
* This behavior has been added in {@link Version#V_7_0_0_alpha1} so if there is another node in the cluster * This behavior has been added in {@link Version#V_6_4_0} so if there is another node in the cluster
* with an older version we use the original shard id and number of shards in order to ensure that all * with an older version we use the original shard id and number of shards in order to ensure that all
* slices use the same numbers. * slices use the same numbers.
*/ */