Skip to content

Commit 3d860c8

Browse files
mark-vieiramark-vieira
committed
Remove a whole host of references to unsupported transport versions
1 parent 8c4eee6 commit 3d860c8

File tree

279 files changed

+897
-3858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+897
-3858
lines changed

‎modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/InternalAutoDateHistogram.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,7 @@ public InternalAutoDateHistogram(StreamInput in) throws IOException {
206206
format = in.readNamedWriteable(DocValueFormat.class);
207207
buckets = in.readCollectionAsList(stream -> Bucket.readFrom(stream, format));
208208
this.targetBuckets = in.readVInt();
209-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) {
210-
bucketInnerInterval = in.readVLong();
211-
} else {
212-
bucketInnerInterval = 1; // Calculated on merge.
213-
}
209+
bucketInnerInterval = in.readVLong();
214210
// we changed the order format in 8.13 for partial reduce, therefore we need to order them to perform merge sort
215211
if (in.getTransportVersion().between(TransportVersions.V_8_13_0, TransportVersions.V_8_14_0)) {
216212
// list is mutable by #readCollectionAsList contract
@@ -224,9 +220,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
224220
out.writeNamedWriteable(format);
225221
out.writeCollection(buckets);
226222
out.writeVInt(targetBuckets);
227-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) {
228-
out.writeVLong(bucketInnerInterval);
229-
}
223+
out.writeVLong(bucketInnerInterval);
230224
}
231225

232226
long getBucketInnerInterval() {

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java‎

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

1010
package org.elasticsearch.ingest.geoip.direct;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.action.ActionRequestValidationException;
1413
import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
1514
import org.elasticsearch.common.Strings;
@@ -138,12 +137,7 @@ public DatabaseConfiguration(StreamInput in) throws IOException {
138137
}
139138

140139
private static Provider readProvider(StreamInput in) throws IOException {
141-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
142-
return in.readNamedWriteable(Provider.class);
143-
} else {
144-
// prior to the above version, everything was always a maxmind, so this half of the if is logical
145-
return new Maxmind(in.readString());
146-
}
140+
return in.readNamedWriteable(Provider.class);
147141
}
148142

149143
public static DatabaseConfiguration parse(XContentParser parser, String id) {
@@ -154,15 +148,7 @@ public static DatabaseConfiguration parse(XContentParser parser, String id) {
154148
public void writeTo(StreamOutput out) throws IOException {
155149
out.writeString(id);
156150
out.writeString(name);
157-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
158-
out.writeNamedWriteable(provider);
159-
} else {
160-
if (provider instanceof Maxmind maxmind) {
161-
out.writeString(maxmind.accountId);
162-
} else {
163-
assert false : "non-maxmind DatabaseConfiguration.Provider [" + provider.getWriteableName() + "]";
164-
}
165-
}
151+
out.writeNamedWriteable(provider);
166152
}
167153

168154
@Override

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpStatsAction.java‎

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

1010
package org.elasticsearch.ingest.geoip.stats;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.FailedNodeException;
1514
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
@@ -167,11 +166,7 @@ public static class NodeResponse extends BaseNodeResponse {
167166
protected NodeResponse(StreamInput in) throws IOException {
168167
super(in);
169168
downloaderStats = in.readBoolean() ? new GeoIpDownloaderStats(in) : null;
170-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
171-
cacheStats = in.readBoolean() ? new CacheStats(in) : null;
172-
} else {
173-
cacheStats = null;
174-
}
169+
cacheStats = in.readBoolean() ? new CacheStats(in) : null;
175170
databases = in.readCollectionAsImmutableSet(StreamInput::readString);
176171
filesInTemp = in.readCollectionAsImmutableSet(StreamInput::readString);
177172
configDatabases = in.readCollectionAsImmutableSet(StreamInput::readString);
@@ -216,11 +211,9 @@ public void writeTo(StreamOutput out) throws IOException {
216211
if (downloaderStats != null) {
217212
downloaderStats.writeTo(out);
218213
}
219-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
220-
out.writeBoolean(cacheStats != null);
221-
if (cacheStats != null) {
222-
cacheStats.writeTo(out);
223-
}
214+
out.writeBoolean(cacheStats != null);
215+
if (cacheStats != null) {
216+
cacheStats.writeTo(out);
224217
}
225218
out.writeStringCollection(databases);
226219
out.writeStringCollection(filesInTemp);

‎server/src/main/java/org/elasticsearch/Build.java‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -220,21 +220,9 @@ public static Build readBuild(StreamInput in) throws IOException {
220220
final String minWireVersion;
221221
final String minIndexVersion;
222222
final String displayString;
223-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
224-
version = in.readString();
225-
qualifier = in.readOptionalString();
226-
snapshot = in.readBoolean();
227-
} else {
228-
snapshot = in.readBoolean();
229-
String rawVersion = in.readString();
230-
// need to separate out qualifiers from older nodes
231-
var versionMatcher = qualfiedVersionRegex.matcher(rawVersion);
232-
if (versionMatcher.matches() == false) {
233-
throw new IllegalStateException(String.format(Locale.ROOT, "Malformed elasticsearch compile version: %s", rawVersion));
234-
}
235-
version = versionMatcher.group(1);
236-
qualifier = versionMatcher.group(2);
237-
}
223+
version = in.readString();
224+
qualifier = in.readOptionalString();
225+
snapshot = in.readBoolean();
238226
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
239227
minWireVersion = in.readString();
240228
minIndexVersion = in.readString();
@@ -258,14 +246,9 @@ public static void writeBuild(Build build, StreamOutput out) throws IOException
258246
out.writeString(build.type().displayName());
259247
out.writeString(build.hash());
260248
out.writeString(build.date());
261-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
262-
out.writeString(build.version());
263-
out.writeOptionalString(build.qualifier());
264-
out.writeBoolean(build.isSnapshot());
265-
} else {
266-
out.writeBoolean(build.isSnapshot());
267-
out.writeString(build.qualifiedVersion());
268-
}
249+
out.writeString(build.version());
250+
out.writeOptionalString(build.qualifier());
251+
out.writeBoolean(build.isSnapshot());
269252
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_10_X)) {
270253
out.writeString(build.minWireCompatVersion());
271254
out.writeString(build.minIndexCompatVersion());

‎server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ public TransportGetAllocationStatsAction(
9393

9494
@Override
9595
protected void doExecute(Task task, Request request, ActionListener<Response> listener) {
96-
if (clusterService.state().getMinTransportVersion().before(TransportVersions.V_8_14_0)) {
97-
// The action is not available before ALLOCATION_STATS
98-
listener.onResponse(new Response(Map.of(), null));
99-
return;
100-
}
10196
super.doExecute(task, request, listener);
10297
}
10398

@@ -144,9 +139,7 @@ public Request(StreamInput in) throws IOException {
144139
public void writeTo(StreamOutput out) throws IOException {
145140
assert out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0);
146141
super.writeTo(out);
147-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
148-
out.writeEnumSet(metrics);
149-
}
142+
out.writeEnumSet(metrics);
150143
}
151144

152145
public EnumSet<Metric> metrics() {
@@ -177,21 +170,13 @@ public Response(Map<String, NodeAllocationStats> nodeAllocationStats, DiskThresh
177170

178171
public Response(StreamInput in) throws IOException {
179172
this.nodeAllocationStats = in.readImmutableMap(StreamInput::readString, NodeAllocationStats::new);
180-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
181-
this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom);
182-
} else {
183-
this.diskThresholdSettings = null;
184-
}
173+
this.diskThresholdSettings = in.readOptionalWriteable(DiskThresholdSettings::readFrom);
185174
}
186175

187176
@Override
188177
public void writeTo(StreamOutput out) throws IOException {
189178
out.writeMap(nodeAllocationStats, StreamOutput::writeString, StreamOutput::writeWriteable);
190-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
191-
out.writeOptionalWriteable(diskThresholdSettings);
192-
} else {
193-
assert diskThresholdSettings == null;
194-
}
179+
out.writeOptionalWriteable(diskThresholdSettings);
195180
}
196181

197182
public Map<String, NodeAllocationStats> getNodeAllocationStats() {

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99

1010
package org.elasticsearch.action.admin.cluster.node.hotthreads;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
1413
import org.elasticsearch.cluster.node.DiscoveryNode;
15-
import org.elasticsearch.common.bytes.BytesArray;
1614
import org.elasticsearch.common.bytes.ReleasableBytesReference;
1715
import org.elasticsearch.common.io.stream.StreamInput;
1816
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -28,11 +26,7 @@ public class NodeHotThreads extends BaseNodeResponse {
2826

2927
NodeHotThreads(StreamInput in) throws IOException {
3028
super(in);
31-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
32-
bytes = in.readReleasableBytesReference();
33-
} else {
34-
bytes = ReleasableBytesReference.wrap(new BytesArray(in.readString().getBytes(StandardCharsets.UTF_8)));
35-
}
29+
bytes = in.readReleasableBytesReference();
3630
}
3731

3832
public NodeHotThreads(DiscoveryNode node, ReleasableBytesReference hotThreadsUtf8Bytes) {
@@ -57,11 +51,7 @@ public java.io.Reader getHotThreadsReader() {
5751
@Override
5852
public void writeTo(StreamOutput out) throws IOException {
5953
super.writeTo(out);
60-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
61-
out.writeBytesReference(bytes);
62-
} else {
63-
out.writeString(bytes.utf8ToString());
64-
}
54+
out.writeBytesReference(bytes);
6555
}
6656

6757
@Override

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java‎

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.Build;
1313
import org.elasticsearch.TransportVersion;
1414
import org.elasticsearch.TransportVersions;
15-
import org.elasticsearch.Version;
1615
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
1716
import org.elasticsearch.cluster.node.DiscoveryNode;
1817
import org.elasticsearch.cluster.version.CompatibilityVersions;
@@ -64,33 +63,14 @@ public class NodeInfo extends BaseNodeResponse {
6463

6564
public NodeInfo(StreamInput in) throws IOException {
6665
super(in);
67-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
68-
version = in.readString();
69-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
70-
compatibilityVersions = CompatibilityVersions.readVersion(in);
71-
} else {
72-
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
73-
}
74-
indexVersion = IndexVersion.readVersion(in);
66+
version = in.readString();
67+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
68+
compatibilityVersions = CompatibilityVersions.readVersion(in);
7569
} else {
76-
Version legacyVersion = Version.readVersion(in);
77-
version = legacyVersion.toString();
78-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
79-
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
80-
} else {
81-
compatibilityVersions = new CompatibilityVersions(TransportVersion.fromId(legacyVersion.id), Map.of());
82-
}
83-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
84-
indexVersion = IndexVersion.readVersion(in);
85-
} else {
86-
indexVersion = IndexVersion.fromId(legacyVersion.id);
87-
}
88-
}
89-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
90-
componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt);
91-
} else {
92-
componentVersions = Map.of();
70+
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
9371
}
72+
indexVersion = IndexVersion.readVersion(in);
73+
componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt);
9474
build = Build.readBuild(in);
9575
if (in.readBoolean()) {
9676
totalIndexingBuffer = ByteSizeValue.ofBytes(in.readLong());
@@ -111,9 +91,7 @@ public NodeInfo(StreamInput in) throws IOException {
11191
addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new));
11292
addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new));
11393
addInfoIfNonNull(AggregationInfo.class, in.readOptionalWriteable(AggregationInfo::new));
114-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
115-
addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new));
116-
}
94+
addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new));
11795
}
11896

11997
public NodeInfo(
@@ -246,20 +224,10 @@ private <T extends ReportingService.Info> void addInfoIfNonNull(Class<T> clazz,
246224
@Override
247225
public void writeTo(StreamOutput out) throws IOException {
248226
super.writeTo(out);
249-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
250-
out.writeString(version);
251-
} else {
252-
Version.writeVersion(Version.fromString(version), out);
253-
}
254-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
255-
compatibilityVersions.writeTo(out);
256-
} else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
257-
TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);
258-
}
259-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
260-
IndexVersion.writeVersion(indexVersion, out);
261-
out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);
262-
}
227+
out.writeString(version);
228+
compatibilityVersions.writeTo(out);
229+
IndexVersion.writeVersion(indexVersion, out);
230+
out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);
263231
Build.writeBuild(build, out);
264232
if (totalIndexingBuffer == null) {
265233
out.writeBoolean(false);
@@ -282,8 +250,6 @@ public void writeTo(StreamOutput out) throws IOException {
282250
out.writeOptionalWriteable(getInfo(PluginsAndModules.class));
283251
out.writeOptionalWriteable(getInfo(IngestInfo.class));
284252
out.writeOptionalWriteable(getInfo(AggregationInfo.class));
285-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
286-
out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
287-
}
253+
out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
288254
}
289255
}

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java‎

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

1010
package org.elasticsearch.action.admin.cluster.node.info;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.common.io.stream.StreamInput;
1413
import org.elasticsearch.common.io.stream.StreamOutput;
1514
import org.elasticsearch.node.ReportingService;
@@ -42,11 +41,7 @@ public PluginsAndModules(StreamInput in) throws IOException {
4241

4342
@Override
4443
public void writeTo(StreamOutput out) throws IOException {
45-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) {
46-
out.writeCollection(plugins);
47-
} else {
48-
out.writeCollection(plugins.stream().map(PluginRuntimeInfo::descriptor).toList());
49-
}
44+
out.writeCollection(plugins);
5045
out.writeCollection(modules);
5146
}
5247

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99

1010
package org.elasticsearch.action.admin.cluster.node.reload;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
14-
import org.elasticsearch.cluster.node.DiscoveryNode;
15-
import org.elasticsearch.common.Strings;
1613
import org.elasticsearch.common.bytes.BytesArray;
1714
import org.elasticsearch.common.bytes.BytesReference;
1815
import org.elasticsearch.common.io.stream.StreamInput;
@@ -23,7 +20,6 @@
2320
import org.elasticsearch.core.Nullable;
2421
import org.elasticsearch.core.RefCounted;
2522
import org.elasticsearch.core.Releasables;
26-
import org.elasticsearch.tasks.TaskId;
2723
import org.elasticsearch.transport.AbstractTransportRequest;
2824
import org.elasticsearch.transport.LeakTracker;
2925

@@ -92,13 +88,6 @@ public static class NodeRequest extends AbstractTransportRequest {
9288
NodeRequest(StreamInput in) throws IOException {
9389
super(in);
9490

95-
if (in.getTransportVersion().before(TransportVersions.V_8_13_0)) {
96-
TaskId.readFromStream(in);
97-
in.readStringArray();
98-
in.readOptionalArray(DiscoveryNode::new, DiscoveryNode[]::new);
99-
in.readOptionalTimeValue();
100-
}
101-
10291
final BytesReference bytesRef = in.readOptionalBytesReference();
10392
if (bytesRef != null) {
10493
byte[] bytes = BytesReference.toBytes(bytesRef);
@@ -126,13 +115,6 @@ public void writeTo(StreamOutput out) throws IOException {
126115
assert hasReferences();
127116
super.writeTo(out);
128117

129-
if (out.getTransportVersion().before(TransportVersions.V_8_13_0)) {
130-
TaskId.EMPTY_TASK_ID.writeTo(out);
131-
out.writeStringArray(Strings.EMPTY_ARRAY);
132-
out.writeOptionalArray(StreamOutput::writeWriteable, null);
133-
out.writeOptionalTimeValue(null);
134-
}
135-
136118
if (this.secureSettingsPassword == null) {
137119
out.writeOptionalBytesReference(null);
138120
} else {

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesRemovalPrevalidation.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ public void writeTo(StreamOutput out) throws IOException {
156156
}
157157

158158
public static Result readFrom(final StreamInput in) throws IOException {
159-
if (in.getTransportVersion().before(TransportVersions.V_8_7_0)) {
160-
return new Result(in.readBoolean(), null, in.readString());
161-
}
162159
return new Result(in.readBoolean(), Reason.readFrom(in), in.readString());
163160
}
164161

0 commit comments

Comments
 (0)