Adjust serialization versions after backport

Relates #29533
elastic · Apr 26, 2018 · 752ba2f · 752ba2f
1 parent 05ef601
commit 752ba2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
@@ -235,7 +235,7 @@ protected void innerReadFrom(StreamInput in) throws IOException {
         if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
             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();
             preference = in.readOptionalString();
         } else {
@@ -268,7 +268,7 @@ protected void innerWriteTo(StreamOutput out, boolean asKey) throws IOException
             out.writeOptionalBoolean(allowPartialSearchResults);
         }
         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.writeOptionalString(preference);
             }

diff --git a/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java b/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java
@@ -225,7 +225,7 @@ public Query toFilter(ClusterService clusterService, ShardSearchRequest request,
 
         int shardId = request.shardId().id();
         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)) {
             GroupShardsIterator<ShardIterator> group = buildShardIterator(clusterService, request);
             assert group.size() <= numShards : "index routing shards: " + group.size() +
@@ -235,7 +235,7 @@ public Query toFilter(ClusterService clusterService, ShardSearchRequest request,
                  * 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
                  * 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
                  * slices use the same numbers.
                  */