Skip to content

Commit e801035

Browse files
danhermanndanhermann
authored
Remove some obsolete BWC version checks (#78258)
1 parent c6928ed commit e801035

File tree

19 files changed

+53
-195
lines changed

19 files changed

+53
-195
lines changed

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public static GeoIpTaskState fromXContent(XContentParser parser) throws IOExcept
6868
databases = Collections.unmodifiableMap(input.readMap(StreamInput::readString,
6969
in -> {
7070
long lastUpdate = in.readLong();
71-
return new Metadata(lastUpdate, in.readVInt(), in.readVInt(), in.readString(),
72-
in.getVersion().onOrAfter(Version.V_7_14_0) ? in.readLong() : lastUpdate);
71+
return new Metadata(lastUpdate, in.readVInt(), in.readVInt(), in.readString(), in.readLong());
7372
}));
7473
}
7574

@@ -135,9 +134,7 @@ public void writeTo(StreamOutput out) throws IOException {
135134
o.writeVInt(v.firstChunk);
136135
o.writeVInt(v.lastChunk);
137136
o.writeString(v.md5);
138-
if (o.getVersion().onOrAfter(Version.V_7_14_0)) {
139-
o.writeLong(v.lastCheck);
140-
}
137+
o.writeLong(v.lastCheck);
141138
});
142139
}
143140

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

+3-10
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88

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

11-
import org.elasticsearch.Version;
12-
import org.elasticsearch.common.xcontent.ParseField;
1311
import org.elasticsearch.common.Strings;
1412
import org.elasticsearch.common.io.stream.StreamInput;
1513
import org.elasticsearch.common.io.stream.StreamOutput;
1614
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
15+
import org.elasticsearch.common.xcontent.ParseField;
1716
import org.elasticsearch.common.xcontent.XContentBuilder;
1817
import org.elasticsearch.common.xcontent.XContentParser;
1918
import org.elasticsearch.ingest.geoip.GeoIpDownloader;
@@ -59,11 +58,7 @@ public GeoIpDownloaderStats(StreamInput in) throws IOException {
5958
totalDownloadTime = in.readVLong();
6059
databasesCount = in.readVInt();
6160
skippedDownloads = in.readVInt();
62-
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
63-
expiredDatabases = in.readVInt();
64-
} else {
65-
expiredDatabases = 0;
66-
}
61+
expiredDatabases = in.readVInt();
6762
}
6863

6964
private GeoIpDownloaderStats(int successfulDownloads, int failedDownloads, long totalDownloadTime, int databasesCount,
@@ -149,9 +144,7 @@ public void writeTo(StreamOutput out) throws IOException {
149144
out.writeVLong(totalDownloadTime);
150145
out.writeVInt(databasesCount);
151146
out.writeVInt(skippedDownloads);
152-
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
153-
out.writeVInt(expiredDatabases);
154-
}
147+
out.writeVInt(expiredDatabases);
155148
}
156149

157150
@Override

‎server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.action.ActionResponse;
1212
import org.elasticsearch.cluster.metadata.AliasMetadata;
1313
import org.elasticsearch.cluster.metadata.DataStreamAlias;
14-
import org.elasticsearch.cluster.metadata.DataStreamMetadata;
1514
import org.elasticsearch.common.collect.ImmutableOpenMap;
1615
import org.elasticsearch.common.io.stream.StreamInput;
1716
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -34,8 +33,7 @@ public GetAliasesResponse(ImmutableOpenMap<String, List<AliasMetadata>> aliases,
3433
public GetAliasesResponse(StreamInput in) throws IOException {
3534
super(in);
3635
aliases = in.readImmutableMap(StreamInput::readString, i -> i.readList(AliasMetadata::new));
37-
dataStreamAliases = in.getVersion().onOrAfter(DataStreamMetadata.DATA_STREAM_ALIAS_VERSION) ?
38-
in.readMap(StreamInput::readString, in1 -> in1.readList(DataStreamAlias::new)) : Map.of();
36+
dataStreamAliases = in.readMap(StreamInput::readString, in1 -> in1.readList(DataStreamAlias::new));
3937
}
4038

4139
public ImmutableOpenMap<String, List<AliasMetadata>> getAliases() {
@@ -49,9 +47,7 @@ public Map<String, List<DataStreamAlias>> getDataStreamAliases() {
4947
@Override
5048
public void writeTo(StreamOutput out) throws IOException {
5149
out.writeMap(aliases, StreamOutput::writeString, StreamOutput::writeList);
52-
if (out.getVersion().onOrAfter(DataStreamMetadata.DATA_STREAM_ALIAS_VERSION)) {
53-
out.writeMap(dataStreamAliases, StreamOutput::writeString, StreamOutput::writeList);
54-
}
50+
out.writeMap(dataStreamAliases, StreamOutput::writeString, StreamOutput::writeList);
5551
}
5652

5753
@Override

‎server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,7 @@ public CommonStats(StreamInput in) throws IOException {
258258
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
259259
bulk = in.readOptionalWriteable(BulkStats::new);
260260
}
261-
if (in.getVersion().onOrAfter(Version.V_7_15_0)) {
262-
shards = in.readOptionalWriteable(ShardCountStats::new);
263-
}
261+
shards = in.readOptionalWriteable(ShardCountStats::new);
264262
}
265263

266264
@Override
@@ -284,9 +282,7 @@ public void writeTo(StreamOutput out) throws IOException {
284282
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
285283
out.writeOptionalWriteable(bulk);
286284
}
287-
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
288-
out.writeOptionalWriteable(shards);
289-
}
285+
out.writeOptionalWriteable(shards);
290286
}
291287

292288
public void add(CommonStats stats) {

‎server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ public CommonStatsFlags(StreamInput in) throws IOException {
5555
fieldDataFields = in.readStringArray();
5656
completionDataFields = in.readStringArray();
5757
includeSegmentFileSizes = in.readBoolean();
58-
if (in.getVersion().onOrAfter(Version.V_7_2_0)) {
59-
includeUnloadedSegments = in.readBoolean();
60-
}
58+
includeUnloadedSegments = in.readBoolean();
6159
}
6260

6361
@Override
@@ -75,9 +73,7 @@ public void writeTo(StreamOutput out) throws IOException {
7573
out.writeStringArrayNullable(fieldDataFields);
7674
out.writeStringArrayNullable(completionDataFields);
7775
out.writeBoolean(includeSegmentFileSizes);
78-
if (out.getVersion().onOrAfter(Version.V_7_2_0)) {
79-
out.writeBoolean(includeUnloadedSegments);
80-
}
76+
out.writeBoolean(includeUnloadedSegments);
8177
}
8278

8379
/**

‎server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteComponentTemplateAction.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
package org.elasticsearch.action.admin.indices.template.delete;
1010

11-
import org.elasticsearch.Version;
1211
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -38,11 +37,7 @@ public static class Request extends MasterNodeRequest<Request> {
3837

3938
public Request(StreamInput in) throws IOException {
4039
super(in);
41-
if (in.getVersion().onOrAfter(Version.V_7_13_0)) {
42-
names = in.readStringArray();
43-
} else {
44-
names = new String[] {in.readString()};
45-
}
40+
names = in.readStringArray();
4641
}
4742

4843
/**
@@ -71,11 +66,7 @@ public String[] names() {
7166
@Override
7267
public void writeTo(StreamOutput out) throws IOException {
7368
super.writeTo(out);
74-
if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
75-
out.writeStringArray(names);
76-
} else {
77-
out.writeString(names[0]);
78-
}
69+
out.writeStringArray(names);
7970
}
8071
}
8172
}

‎server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteComposableIndexTemplateAction.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
package org.elasticsearch.action.admin.indices.template.delete;
1010

11-
import org.elasticsearch.Version;
1211
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.ActionType;
1413
import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -38,11 +37,7 @@ public static class Request extends MasterNodeRequest<Request> {
3837

3938
public Request(StreamInput in) throws IOException {
4039
super(in);
41-
if (in.getVersion().onOrAfter(Version.V_7_13_0)) {
42-
names = in.readStringArray();
43-
} else {
44-
names = new String[] {in.readString()};
45-
}
40+
names = in.readStringArray();
4641
}
4742

4843
/**
@@ -71,11 +66,7 @@ public String[] names() {
7166
@Override
7267
public void writeTo(StreamOutput out) throws IOException {
7368
super.writeTo(out);
74-
if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
75-
out.writeStringArray(names);
76-
} else {
77-
out.writeString(names[0]);
78-
}
69+
out.writeStringArray(names);
7970
}
8071

8172
@Override

‎server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamAlias.java

+9-12
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
*/
88
package org.elasticsearch.cluster.metadata;
99

10-
import org.elasticsearch.Version;
1110
import org.elasticsearch.cluster.AbstractDiffable;
1211
import org.elasticsearch.cluster.Diff;
12+
import org.elasticsearch.common.ParsingException;
1313
import org.elasticsearch.common.bytes.BytesReference;
1414
import org.elasticsearch.common.compress.CompressedXContent;
15-
import org.elasticsearch.common.xcontent.ObjectParser;
16-
import org.elasticsearch.common.xcontent.ParseField;
17-
import org.elasticsearch.common.ParsingException;
1815
import org.elasticsearch.common.io.stream.StreamInput;
1916
import org.elasticsearch.common.io.stream.StreamOutput;
2017
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
18+
import org.elasticsearch.common.xcontent.ObjectParser;
19+
import org.elasticsearch.common.xcontent.ParseField;
2120
import org.elasticsearch.common.xcontent.ToXContentFragment;
2221
import org.elasticsearch.common.xcontent.XContentBuilder;
2322
import org.elasticsearch.common.xcontent.XContentFactory;
@@ -108,7 +107,7 @@ public DataStreamAlias(StreamInput in) throws IOException {
108107
this.name = in.readString();
109108
this.dataStreams = in.readStringList();
110109
this.writeDataStream = in.readOptionalString();
111-
this.filter = in.getVersion().onOrAfter(Version.V_7_15_0) && in.readBoolean() ? CompressedXContent.readCompressedString(in) : null;
110+
this.filter = in.readBoolean() ? CompressedXContent.readCompressedString(in) : null;
112111
}
113112

114113
/**
@@ -297,13 +296,11 @@ public void writeTo(StreamOutput out) throws IOException {
297296
out.writeString(name);
298297
out.writeStringCollection(dataStreams);
299298
out.writeOptionalString(writeDataStream);
300-
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
301-
if (filter != null) {
302-
out.writeBoolean(true);
303-
filter.writeTo(out);
304-
} else {
305-
out.writeBoolean(false);
306-
}
299+
if (filter != null) {
300+
out.writeBoolean(true);
301+
filter.writeTo(out);
302+
} else {
303+
out.writeBoolean(false);
307304
}
308305
}
309306

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

+5-16
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ public class DataStreamMetadata implements Metadata.Custom {
6464
}, DATA_STREAM_ALIASES);
6565
}
6666

67-
public static final Version DATA_STREAM_ALIAS_VERSION = Version.V_7_14_0;
68-
6967
private final Map<String, DataStream> dataStreams;
7068
private final Map<String, DataStreamAlias> dataStreamAliases;
7169

@@ -76,8 +74,7 @@ public DataStreamMetadata(Map<String, DataStream> dataStreams,
7674
}
7775

7876
public DataStreamMetadata(StreamInput in) throws IOException {
79-
this(in.readMap(StreamInput::readString, DataStream::new), in.getVersion().onOrAfter(DATA_STREAM_ALIAS_VERSION) ?
80-
in.readMap(StreamInput::readString, DataStreamAlias::new) : Map.of());
77+
this(in.readMap(StreamInput::readString, DataStream::new), in.readMap(StreamInput::readString, DataStreamAlias::new));
8178
}
8279

8380
public Map<String, DataStream> dataStreams() {
@@ -115,9 +112,7 @@ public Version getMinimalSupportedVersion() {
115112
@Override
116113
public void writeTo(StreamOutput out) throws IOException {
117114
out.writeMap(this.dataStreams, StreamOutput::writeString, (stream, val) -> val.writeTo(stream));
118-
if (out.getVersion().onOrAfter(DATA_STREAM_ALIAS_VERSION)) {
119-
out.writeMap(this.dataStreamAliases, StreamOutput::writeString, (stream, val) -> val.writeTo(stream));
120-
}
115+
out.writeMap(this.dataStreamAliases, StreamOutput::writeString, (stream, val) -> val.writeTo(stream));
121116
}
122117

123118
public static DataStreamMetadata fromXContent(XContentParser parser) throws IOException {
@@ -177,12 +172,8 @@ static class DataStreamMetadataDiff implements NamedDiff<Metadata.Custom> {
177172
DataStreamMetadataDiff(StreamInput in) throws IOException {
178173
this.dataStreamDiff = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(),
179174
DataStream::new, DataStream::readDiffFrom);
180-
if (in.getVersion().onOrAfter(DATA_STREAM_ALIAS_VERSION)) {
181-
this.dataStreamAliasDiff = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(),
182-
DataStreamAlias::new, DataStreamAlias::readDiffFrom);
183-
} else {
184-
this.dataStreamAliasDiff = null;
185-
}
175+
this.dataStreamAliasDiff = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(),
176+
DataStreamAlias::new, DataStreamAlias::readDiffFrom);
186177
}
187178

188179
@Override
@@ -196,9 +187,7 @@ public Metadata.Custom apply(Metadata.Custom part) {
196187
@Override
197188
public void writeTo(StreamOutput out) throws IOException {
198189
dataStreamDiff.writeTo(out);
199-
if (out.getVersion().onOrAfter(DATA_STREAM_ALIAS_VERSION)) {
200-
dataStreamAliasDiff.writeTo(out);
201-
}
190+
dataStreamAliasDiff.writeTo(out);
202191
}
203192

204193
@Override

‎server/src/main/java/org/elasticsearch/ingest/IngestService.java

-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.ElasticsearchParseException;
1515
import org.elasticsearch.ExceptionsHelper;
1616
import org.elasticsearch.ResourceNotFoundException;
17-
import org.elasticsearch.Version;
1817
import org.elasticsearch.action.ActionListener;
1918
import org.elasticsearch.action.DocWriteRequest;
2019
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
@@ -352,15 +351,6 @@ public void putPipeline(
352351
}
353352
}
354353

355-
if (state.getNodes().getMinNodeVersion().before(Version.V_7_15_0)) {
356-
pipelineConfig = pipelineConfig == null
357-
? XContentHelper.convertToMap(request.getSource(), false, request.getXContentType()).v2()
358-
: pipelineConfig;
359-
if (pipelineConfig.containsKey(Pipeline.META_KEY)) {
360-
throw new IllegalStateException("pipelines with _meta field require minimum node version of " + Version.V_7_15_0);
361-
}
362-
}
363-
364354
final Map<String, Object> config = pipelineConfig == null
365355
? XContentHelper.convertToMap(request.getSource(), false, request.getXContentType()).v2()
366356
: pipelineConfig;

‎server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java

+7-21
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88

99
package org.elasticsearch.monitor.fs;
1010

11-
import org.elasticsearch.Version;
12-
import org.elasticsearch.core.Nullable;
1311
import org.elasticsearch.common.io.stream.StreamInput;
1412
import org.elasticsearch.common.io.stream.StreamOutput;
1513
import org.elasticsearch.common.io.stream.Writeable;
1614
import org.elasticsearch.common.unit.ByteSizeValue;
1715
import org.elasticsearch.common.xcontent.ToXContentFragment;
1816
import org.elasticsearch.common.xcontent.ToXContentObject;
1917
import org.elasticsearch.common.xcontent.XContentBuilder;
18+
import org.elasticsearch.core.Nullable;
2019

2120
import java.io.IOException;
2221
import java.util.Arrays;
@@ -237,13 +236,8 @@ public DeviceStats(StreamInput in) throws IOException {
237236
previousSectorsRead = in.readLong();
238237
currentSectorsWritten = in.readLong();
239238
previousSectorsWritten = in.readLong();
240-
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
241-
currentIOTime = in.readLong();
242-
previousIOTime = in.readLong();
243-
} else {
244-
currentIOTime = -1;
245-
previousIOTime = -1;
246-
}
239+
currentIOTime = in.readLong();
240+
previousIOTime = in.readLong();
247241
}
248242

249243
@Override
@@ -259,10 +253,8 @@ public void writeTo(StreamOutput out) throws IOException {
259253
out.writeLong(previousSectorsRead);
260254
out.writeLong(currentSectorsWritten);
261255
out.writeLong(previousSectorsWritten);
262-
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
263-
out.writeLong(currentIOTime);
264-
out.writeLong(previousIOTime);
265-
}
256+
out.writeLong(currentIOTime);
257+
out.writeLong(previousIOTime);
266258
}
267259

268260
public long operations() {
@@ -370,11 +362,7 @@ public IoStats(StreamInput in) throws IOException {
370362
this.totalWriteOperations = in.readLong();
371363
this.totalReadKilobytes = in.readLong();
372364
this.totalWriteKilobytes = in.readLong();
373-
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
374-
this.totalIOTimeInMillis = in.readLong();
375-
} else {
376-
this.totalIOTimeInMillis = -1;
377-
}
365+
this.totalIOTimeInMillis = in.readLong();
378366
}
379367

380368
@Override
@@ -388,9 +376,7 @@ public void writeTo(StreamOutput out) throws IOException {
388376
out.writeLong(totalWriteOperations);
389377
out.writeLong(totalReadKilobytes);
390378
out.writeLong(totalWriteKilobytes);
391-
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
392-
out.writeLong(totalIOTimeInMillis);
393-
}
379+
out.writeLong(totalIOTimeInMillis);
394380
}
395381

396382
public DeviceStats[] getDevicesStats() {

0 commit comments

Comments
 (0)