Skip to content

Commit 09ce855

Browse files
authored
Remove some 7.7 and 7.8 transport version checks (#118563)
1 parent 55ae512 commit 09ce855

File tree

24 files changed

+38
-148
lines changed

24 files changed

+38
-148
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String getWriteableName() {
8989

9090
@Override
9191
public TransportVersion getMinimalSupportedVersion() {
92-
return TransportVersions.V_7_7_0;
92+
return TransportVersions.ZERO;
9393
}
9494

9595
@Override
@@ -166,7 +166,7 @@ public String getWriteableName() {
166166

167167
@Override
168168
public TransportVersion getMinimalSupportedVersion() {
169-
return TransportVersions.V_7_7_0;
169+
return TransportVersions.ZERO;
170170
}
171171
}
172172
}

server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public String getWriteableName() {
9494

9595
@Override
9696
public TransportVersion getMinimalSupportedVersion() {
97-
return TransportVersions.V_7_7_0;
97+
return TransportVersions.ZERO;
9898
}
9999

100100
@Override
@@ -167,7 +167,7 @@ public String getWriteableName() {
167167

168168
@Override
169169
public TransportVersion getMinimalSupportedVersion() {
170-
return TransportVersions.V_7_7_0;
170+
return TransportVersions.ZERO;
171171
}
172172
}
173173
}

server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public String getWriteableName() {
217217

218218
@Override
219219
public TransportVersion getMinimalSupportedVersion() {
220-
return TransportVersions.V_7_7_0;
220+
return TransportVersions.ZERO;
221221
}
222222

223223
@Override
@@ -311,7 +311,7 @@ public String getWriteableName() {
311311

312312
@Override
313313
public TransportVersion getMinimalSupportedVersion() {
314-
return TransportVersions.V_7_7_0;
314+
return TransportVersions.ZERO;
315315
}
316316
}
317317
}

server/src/main/java/org/elasticsearch/script/ScriptException.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.script;
1111

1212
import org.elasticsearch.ElasticsearchException;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.Strings;
1514
import org.elasticsearch.common.io.stream.StreamInput;
1615
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -79,7 +78,7 @@ public ScriptException(StreamInput in) throws IOException {
7978
scriptStack = Arrays.asList(in.readStringArray());
8079
script = in.readString();
8180
lang = in.readString();
82-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0) && in.readBoolean()) {
81+
if (in.readBoolean()) {
8382
pos = new Position(in);
8483
} else {
8584
pos = null;
@@ -92,13 +91,11 @@ protected void writeTo(StreamOutput out, Writer<Throwable> nestedExceptionsWrite
9291
out.writeStringCollection(scriptStack);
9392
out.writeString(script);
9493
out.writeString(lang);
95-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0)) {
96-
if (pos == null) {
97-
out.writeBoolean(false);
98-
} else {
99-
out.writeBoolean(true);
100-
pos.writeTo(out);
101-
}
94+
if (pos == null) {
95+
out.writeBoolean(false);
96+
} else {
97+
out.writeBoolean(true);
98+
pos.writeTo(out);
10299
}
103100
}
104101

server/src/main/java/org/elasticsearch/search/DocValueFormat.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,6 @@ private DateTime(StreamInput in) throws IOException {
271271
this.formatter = DateFormatter.forPattern(formatterPattern).withZone(this.timeZone).withLocale(locale);
272272
this.parser = formatter.toDateMathParser();
273273
this.resolution = DateFieldMapper.Resolution.ofOrdinal(in.readVInt());
274-
if (in.getTransportVersion().between(TransportVersions.V_7_7_0, TransportVersions.V_8_0_0)) {
275-
/* when deserialising from 7.7+ nodes expect a flag indicating if a pattern is of joda style
276-
This is only used to support joda style indices in 7.x, in 8 we no longer support this.
277-
All indices in 8 should use java style pattern. Hence we can ignore this flag.
278-
*/
279-
in.readBoolean();
280-
}
281274
this.formatSortValues = in.readBoolean();
282275
}
283276

@@ -302,13 +295,6 @@ public void writeTo(StreamOutput out) throws IOException {
302295
}
303296
out.writeString(timeZone.getId());
304297
out.writeVInt(resolution.ordinal());
305-
if (out.getTransportVersion().between(TransportVersions.V_7_7_0, TransportVersions.V_8_0_0)) {
306-
/* when serializing to 7.7+ send out a flag indicating if a pattern is of joda style
307-
This is only used to support joda style indices in 7.x, in 8 we no longer support this.
308-
All indices in 8 should use java style pattern. Hence this flag is always false.
309-
*/
310-
out.writeBoolean(false);
311-
}
312298
out.writeBoolean(formatSortValues);
313299
}
314300

server/src/main/java/org/elasticsearch/tasks/TaskCancellationService.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,7 @@ private BanParentTaskRequest(StreamInput in) throws IOException {
333333
parentTaskId = TaskId.readFromStream(in);
334334
ban = in.readBoolean();
335335
reason = ban ? in.readString() : null;
336-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_8_0)) {
337-
waitForCompletion = in.readBoolean();
338-
} else {
339-
waitForCompletion = false;
340-
}
336+
waitForCompletion = in.readBoolean();
341337
}
342338

343339
@Override
@@ -348,9 +344,7 @@ public void writeTo(StreamOutput out) throws IOException {
348344
if (ban) {
349345
out.writeString(reason);
350346
}
351-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_8_0)) {
352-
out.writeBoolean(waitForCompletion);
353-
}
347+
out.writeBoolean(waitForCompletion);
354348
}
355349
}
356350

server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package org.elasticsearch.transport;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.Version;
1413
import org.elasticsearch.action.ActionListener;
1514
import org.elasticsearch.cluster.ClusterName;
@@ -355,11 +354,7 @@ public ProxyModeInfo(String address, String serverName, int maxSocketConnections
355354

356355
private ProxyModeInfo(StreamInput input) throws IOException {
357356
address = input.readString();
358-
if (input.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0)) {
359-
serverName = input.readString();
360-
} else {
361-
serverName = null;
362-
}
357+
serverName = input.readString();
363358
maxSocketConnections = input.readVInt();
364359
numSocketsConnected = input.readVInt();
365360
}
@@ -376,9 +371,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
376371
@Override
377372
public void writeTo(StreamOutput out) throws IOException {
378373
out.writeString(address);
379-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0)) {
380-
out.writeString(serverName);
381-
}
374+
out.writeString(serverName);
382375
out.writeVInt(maxSocketConnections);
383376
out.writeVInt(numSocketsConnected);
384377
}

server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package org.elasticsearch.action;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.action.support.IndicesOptions;
1413
import org.elasticsearch.common.io.stream.BytesStreamOutput;
1514
import org.elasticsearch.common.io.stream.StreamInput;
@@ -43,15 +42,7 @@ public void testOriginalIndicesSerialization() throws IOException {
4342
OriginalIndices originalIndices2 = OriginalIndices.readOriginalIndices(in);
4443

4544
assertThat(originalIndices2.indices(), equalTo(originalIndices.indices()));
46-
// indices options are not equivalent when sent to an older version and re-read due
47-
// to the addition of hidden indices as expand to hidden indices is always true when
48-
// read from a prior version
49-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0)
50-
|| originalIndices.indicesOptions().expandWildcardsHidden()) {
51-
assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions()));
52-
} else if (originalIndices.indicesOptions().expandWildcardsHidden()) {
53-
assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions()));
54-
}
45+
assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions()));
5546
}
5647
}
5748

server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.action.admin.cluster.shards;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.support.IndicesOptions;
1514
import org.elasticsearch.common.io.stream.BytesStreamOutput;
1615
import org.elasticsearch.common.io.stream.StreamInput;
@@ -54,12 +53,7 @@ public void testSerialization() throws Exception {
5453
in.setTransportVersion(version);
5554
ClusterSearchShardsRequest deserialized = new ClusterSearchShardsRequest(in);
5655
assertArrayEquals(request.indices(), deserialized.indices());
57-
// indices options are not equivalent when sent to an older version and re-read due
58-
// to the addition of hidden indices as expand to hidden indices is always true when
59-
// read from a prior version
60-
if (version.onOrAfter(TransportVersions.V_7_7_0) || request.indicesOptions().expandWildcardsHidden()) {
61-
assertEquals(request.indicesOptions(), deserialized.indicesOptions());
62-
}
56+
assertEquals(request.indicesOptions(), deserialized.indicesOptions());
6357
assertEquals(request.routing(), deserialized.routing());
6458
assertEquals(request.preference(), deserialized.preference());
6559
}

server/src/test/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestTests.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ public void testBwcSerialization() throws Exception {
5656
assertEquals(request.ackTimeout(), in.readTimeValue());
5757
assertArrayEquals(request.indices(), in.readStringArray());
5858
final IndicesOptions indicesOptions = IndicesOptions.readIndicesOptions(in);
59-
// indices options are not equivalent when sent to an older version and re-read due
60-
// to the addition of hidden indices as expand to hidden indices is always true when
61-
// read from a prior version
62-
// TODO update version on backport!
63-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0)
64-
|| request.indicesOptions().expandWildcardsHidden()) {
65-
assertEquals(request.indicesOptions(), indicesOptions);
66-
}
59+
assertEquals(request.indicesOptions(), indicesOptions);
6760
assertEquals(request.waitForActiveShards(), ActiveShardCount.readFrom(in));
6861
}
6962
}
@@ -92,13 +85,7 @@ public void testBwcSerialization() throws Exception {
9285
assertEquals(sample.masterNodeTimeout(), deserializedRequest.masterNodeTimeout());
9386
assertEquals(sample.ackTimeout(), deserializedRequest.ackTimeout());
9487
assertArrayEquals(sample.indices(), deserializedRequest.indices());
95-
// indices options are not equivalent when sent to an older version and re-read due
96-
// to the addition of hidden indices as expand to hidden indices is always true when
97-
// read from a prior version
98-
// TODO change version on backport
99-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_7_0) || sample.indicesOptions().expandWildcardsHidden()) {
100-
assertEquals(sample.indicesOptions(), deserializedRequest.indicesOptions());
101-
}
88+
assertEquals(sample.indicesOptions(), deserializedRequest.indicesOptions());
10289
assertEquals(sample.waitForActiveShards(), deserializedRequest.waitForActiveShards());
10390
}
10491
}

0 commit comments

Comments
 (0)