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

Change compatibility version to 5.6 after backport

This commit is contained in:
Simon Willnauer 2017-07-11 11:39:08 +02:00
parent ec1afe30ea
commit 538110bd60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public final class SearchShardTarget implements Writeable, Comparable<SearchShar
} }
shardId = ShardId.readShardId(in); shardId = ShardId.readShardId(in);
this.originalIndices = null; this.originalIndices = null;
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
clusterAlias = in.readOptionalString(); clusterAlias = in.readOptionalString();
} else { } else {
clusterAlias = null; clusterAlias = null;
@ -114,7 +114,7 @@ public final class SearchShardTarget implements Writeable, Comparable<SearchShar
out.writeText(nodeId); out.writeText(nodeId);
} }
shardId.writeTo(out); shardId.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
out.writeOptionalString(clusterAlias); out.writeOptionalString(clusterAlias);
} }
} }

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

@ -199,7 +199,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
} }
nowInMillis = in.readVLong(); nowInMillis = in.readVLong();
requestCache = in.readOptionalBoolean(); requestCache = in.readOptionalBoolean();
if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (in.getVersion().onOrAfter(Version.V_5_6_0)) {
clusterAlias = in.readOptionalString(); clusterAlias = in.readOptionalString();
} }
} }
@ -221,7 +221,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest {
out.writeVLong(nowInMillis); out.writeVLong(nowInMillis);
} }
out.writeOptionalBoolean(requestCache); out.writeOptionalBoolean(requestCache);
if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) { if (out.getVersion().onOrAfter(Version.V_5_6_0)) {
out.writeOptionalString(clusterAlias); out.writeOptionalString(clusterAlias);
} }
} }