Skip to content

Commit 752ba2f

Browse files
committed
Adjust serialization versions after backport
Relates #29533
1 parent 05ef601 commit 752ba2f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ protected void innerReadFrom(StreamInput in) throws IOException {
235235
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
236236
allowPartialSearchResults = in.readOptionalBoolean();
237237
}
238-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
238+
if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
239239
indexRoutings = in.readStringArray();
240240
preference = in.readOptionalString();
241241
} else {
@@ -268,7 +268,7 @@ protected void innerWriteTo(StreamOutput out, boolean asKey) throws IOException
268268
out.writeOptionalBoolean(allowPartialSearchResults);
269269
}
270270
if (asKey == false) {
271-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
271+
if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
272272
out.writeStringArray(indexRoutings);
273273
out.writeOptionalString(preference);
274274
}

server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public Query toFilter(ClusterService clusterService, ShardSearchRequest request,
225225

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

0 commit comments

Comments
 (0)