Skip to content

Commit 51a7b97

Browse files
mark-vieiramark-vieira
authored
Remove references to V8_8_x transport versions (#139015)
1 parent c2286e1 commit 51a7b97

File tree

59 files changed

+167
-699
lines changed

Some content is hidden

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

59 files changed

+167
-699
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ static TransportVersion def(int id) {
5656
public static final TransportVersion V_8_0_0 = def(8_00_00_99);
5757
public static final TransportVersion V_8_7_0 = def(8_07_00_99);
5858
public static final TransportVersion V_8_7_1 = def(8_07_01_99);
59-
public static final TransportVersion V_8_8_0 = def(8_08_00_99);
60-
public static final TransportVersion V_8_8_1 = def(8_08_01_99);
6159
/*
6260
* READ THE COMMENT BELOW THIS BLOCK OF DECLARATIONS BEFORE ADDING NEW TRANSPORT VERSIONS
6361
* Detached transport versions added below here.

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ public NodeInfo(StreamInput in) throws IOException {
7575
} else {
7676
Version legacyVersion = Version.readVersion(in);
7777
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-
}
78+
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions;
8379
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
8480
indexVersion = IndexVersion.readVersion(in);
8581
} else {
@@ -111,9 +107,7 @@ public NodeInfo(StreamInput in) throws IOException {
111107
addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new));
112108
addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new));
113109
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-
}
110+
addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new));
117111
}
118112

119113
public NodeInfo(
@@ -253,8 +247,6 @@ public void writeTo(StreamOutput out) throws IOException {
253247
}
254248
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
255249
compatibilityVersions.writeTo(out);
256-
} else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
257-
TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);
258250
}
259251
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
260252
IndexVersion.writeVersion(indexVersion, out);
@@ -282,8 +274,6 @@ public void writeTo(StreamOutput out) throws IOException {
282274
out.writeOptionalWriteable(getInfo(PluginsAndModules.class));
283275
out.writeOptionalWriteable(getInfo(IngestInfo.class));
284276
out.writeOptionalWriteable(getInfo(AggregationInfo.class));
285-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
286-
out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
287-
}
277+
out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
288278
}
289279
}

‎server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
package org.elasticsearch.action.admin.indices.shards;
1010

11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.action.ActionRequestValidationException;
1312
import org.elasticsearch.action.IndicesRequest;
1413
import org.elasticsearch.action.support.IndicesOptions;
@@ -58,12 +57,7 @@ public IndicesShardStoresRequest(StreamInput in) throws IOException {
5857
statuses.add(ClusterHealthStatus.readFrom(in));
5958
}
6059
indicesOptions = IndicesOptions.readIndicesOptions(in);
61-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
62-
maxConcurrentShardRequests = in.readVInt();
63-
} else {
64-
// earlier versions had unlimited concurrency
65-
maxConcurrentShardRequests = Integer.MAX_VALUE;
66-
}
60+
maxConcurrentShardRequests = in.readVInt();
6761
}
6862

6963
@Override
@@ -72,17 +66,7 @@ public void writeTo(StreamOutput out) throws IOException {
7266
out.writeStringArrayNullable(indices);
7367
out.writeCollection(statuses, (o, v) -> o.writeByte(v.value()));
7468
indicesOptions.writeIndicesOptions(out);
75-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
76-
out.writeVInt(maxConcurrentShardRequests);
77-
} else if (maxConcurrentShardRequests != DEFAULT_MAX_CONCURRENT_SHARD_REQUESTS) {
78-
throw new IllegalArgumentException(
79-
"support for maxConcurrentShardRequests=["
80-
+ maxConcurrentShardRequests
81-
+ "] was added in version [8.8.0], cannot send this request using transport version ["
82-
+ out.getTransportVersion().toReleaseVersion()
83-
+ "]"
84-
);
85-
} // else just drop the value and use the default behaviour
69+
out.writeVInt(maxConcurrentShardRequests);
8670
}
8771

8872
/**

‎server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ public ActionRequestValidationException validate() {
7878
public void writeTo(StreamOutput out) throws IOException {
7979
super.writeTo(out);
8080
out.writeWriteable(shardId);
81-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
82-
out.writeBoolean(failShardOnError);
83-
}
81+
out.writeBoolean(failShardOnError);
8482
}
8583

8684
@Override

‎server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java‎

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

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.cluster.AbstractNamedDiffable;
1514
import org.elasticsearch.cluster.ClusterState;
1615
import org.elasticsearch.cluster.NamedDiff;
@@ -52,9 +51,7 @@ public HealthMetadata(Disk diskMetadata, ShardLimits shardLimitsMetadata) {
5251

5352
public HealthMetadata(StreamInput in) throws IOException {
5453
this.diskMetadata = Disk.readFrom(in);
55-
this.shardLimitsMetadata = in.getTransportVersion().onOrAfter(ShardLimits.VERSION_SUPPORTING_SHARD_LIMIT_FIELDS)
56-
? in.readOptionalWriteable(ShardLimits::readFrom)
57-
: null;
54+
this.shardLimitsMetadata = in.readOptionalWriteable(ShardLimits::readFrom);
5855
}
5956

6057
@Override
@@ -70,9 +67,7 @@ public TransportVersion getMinimalSupportedVersion() {
7067
@Override
7168
public void writeTo(StreamOutput out) throws IOException {
7269
diskMetadata.writeTo(out);
73-
if (out.getTransportVersion().onOrAfter(ShardLimits.VERSION_SUPPORTING_SHARD_LIMIT_FIELDS)) {
74-
out.writeOptionalWriteable(shardLimitsMetadata);
75-
}
70+
out.writeOptionalWriteable(shardLimitsMetadata);
7671
}
7772

7873
public static NamedDiff<ClusterState.Custom> readDiffFrom(StreamInput in) throws IOException {
@@ -172,7 +167,6 @@ public record ShardLimits(
172167
private static final ParseField SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED_FIELD = new ParseField(
173168
"shard_capacity_unhealthy_threshold_red"
174169
);
175-
static final TransportVersion VERSION_SUPPORTING_SHARD_LIMIT_FIELDS = TransportVersions.V_8_8_0;
176170
static final TransportVersion VERSION_SHARD_CAPACITY_UNHEALTH_THRESHOLDS = TransportVersion.fromName(
177171
"shard_capacity_unhealthy_thresholds"
178172
);

‎server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java‎

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

1010
package org.elasticsearch.index.fielddata;
1111

12-
import org.elasticsearch.TransportVersions;
1312
import org.elasticsearch.common.FieldMemoryStats;
1413
import org.elasticsearch.common.io.stream.StreamInput;
1514
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -48,18 +47,12 @@ public FieldDataStats(StreamInput in) throws IOException {
4847
memorySize = in.readVLong();
4948
evictions = in.readVLong();
5049
fields = in.readOptionalWriteable(FieldMemoryStats::new);
51-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
52-
long buildTimeMillis = in.readVLong();
53-
Map<String, GlobalOrdinalsStats.GlobalOrdinalFieldStats> fieldGlobalOrdinalsStats = null;
54-
if (in.readBoolean()) {
55-
fieldGlobalOrdinalsStats = in.readMap(
56-
in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong())
57-
);
58-
}
59-
globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats);
60-
} else {
61-
globalOrdinalsStats = new GlobalOrdinalsStats(0, null);
50+
long buildTimeMillis = in.readVLong();
51+
Map<String, GlobalOrdinalsStats.GlobalOrdinalFieldStats> fieldGlobalOrdinalsStats = null;
52+
if (in.readBoolean()) {
53+
fieldGlobalOrdinalsStats = in.readMap(in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong()));
6254
}
55+
globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats);
6356
}
6457

6558
public FieldDataStats(long memorySize, long evictions, @Nullable FieldMemoryStats fields, GlobalOrdinalsStats globalOrdinalsStats) {
@@ -111,17 +104,15 @@ public void writeTo(StreamOutput out) throws IOException {
111104
out.writeVLong(memorySize);
112105
out.writeVLong(evictions);
113106
out.writeOptionalWriteable(fields);
114-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
115-
out.writeVLong(globalOrdinalsStats.buildTimeMillis);
116-
if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) {
117-
out.writeBoolean(true);
118-
out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> {
119-
out1.writeVLong(value.totalBuildingTime);
120-
out1.writeVLong(value.valueCount);
121-
});
122-
} else {
123-
out.writeBoolean(false);
124-
}
107+
out.writeVLong(globalOrdinalsStats.buildTimeMillis);
108+
if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) {
109+
out.writeBoolean(true);
110+
out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> {
111+
out1.writeVLong(value.totalBuildingTime);
112+
out1.writeVLong(value.valueCount);
113+
});
114+
} else {
115+
out.writeBoolean(false);
125116
}
126117
}
127118

‎server/src/main/java/org/elasticsearch/index/translog/Translog.java‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,16 +1731,10 @@ public static List<Operation> readOperations(StreamInput input, String source) t
17311731
ArrayList<Operation> operations = new ArrayList<>();
17321732
int numOps = input.readInt();
17331733
final BufferedChecksumStreamInput checksumStreamInput = new BufferedChecksumStreamInput(input, source);
1734-
if (input.getTransportVersion().before(TransportVersions.V_8_8_0)) {
1735-
for (int i = 0; i < numOps; i++) {
1736-
operations.add(readOperation(checksumStreamInput));
1737-
}
1738-
} else {
1739-
for (int i = 0; i < numOps; i++) {
1740-
checksumStreamInput.resetDigest();
1741-
operations.add(Translog.Operation.readOperation(checksumStreamInput));
1742-
verifyChecksum(checksumStreamInput);
1743-
}
1734+
for (int i = 0; i < numOps; i++) {
1735+
checksumStreamInput.resetDigest();
1736+
operations.add(Operation.readOperation(checksumStreamInput));
1737+
verifyChecksum(checksumStreamInput);
17441738
}
17451739
return operations;
17461740
}
@@ -1781,13 +1775,9 @@ public static void writeOperations(StreamOutput outStream, List<Operation> toWri
17811775
if (size == 0) {
17821776
return;
17831777
}
1784-
if (outStream.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
1785-
final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream);
1786-
for (Operation op : toWrite) {
1787-
writeOperationNoSize(checksumStreamOutput, op);
1788-
}
1789-
} else {
1790-
writeOperationsToStreamLegacyFormat(outStream, toWrite);
1778+
final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream);
1779+
for (Operation op : toWrite) {
1780+
writeOperationNoSize(checksumStreamOutput, op);
17911781
}
17921782
}
17931783

‎server/src/main/java/org/elasticsearch/search/SearchHit.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,7 @@ public SearchHit(
198198
public static SearchHit readFrom(StreamInput in, boolean pooled) throws IOException {
199199
final float score = in.readFloat();
200200
final int rank;
201-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
202-
rank = in.readVInt();
203-
} else {
204-
rank = NO_RANK;
205-
}
201+
rank = in.readVInt();
206202
final Text id = in.readOptionalText();
207203
if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) {
208204
in.readOptionalText();
@@ -234,15 +230,7 @@ public static SearchHit readFrom(StreamInput in, boolean pooled) throws IOExcept
234230
final SearchSortValues sortValues = SearchSortValues.readFrom(in);
235231

236232
final Map<String, Float> matchedQueries;
237-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
238-
matchedQueries = in.readOrderedMap(StreamInput::readString, StreamInput::readFloat);
239-
} else {
240-
int size = in.readVInt();
241-
matchedQueries = Maps.newLinkedHashMapWithExpectedSize(size);
242-
for (int i = 0; i < size; i++) {
243-
matchedQueries.put(in.readString(), Float.NaN);
244-
}
245-
}
233+
matchedQueries = in.readOrderedMap(StreamInput::readString, StreamInput::readFloat);
246234

247235
final SearchShardTarget shardTarget = in.readOptionalWriteable(SearchShardTarget::new);
248236
final String index;
@@ -312,11 +300,7 @@ public static SearchHit unpooled(int nestedTopDocId, String id, NestedIdentity n
312300
public void writeTo(StreamOutput out) throws IOException {
313301
assert hasReferences();
314302
out.writeFloat(score);
315-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
316-
out.writeVInt(rank);
317-
} else if (rank != NO_RANK) {
318-
throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]");
319-
}
303+
out.writeVInt(rank);
320304
out.writeOptionalText(id);
321305
if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
322306
out.writeOptionalText(SINGLE_MAPPING_TYPE);
@@ -346,11 +330,7 @@ public void writeTo(StreamOutput out) throws IOException {
346330
}
347331
sortValues.writeTo(out);
348332

349-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
350-
out.writeMap(matchedQueries, StreamOutput::writeFloat);
351-
} else {
352-
out.writeStringCollection(matchedQueries.keySet());
353-
}
333+
out.writeMap(matchedQueries, StreamOutput::writeFloat);
354334
out.writeOptionalWriteable(shard);
355335
if (innerHits == null) {
356336
out.writeVInt(0);

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.search.aggregations.bucket.filter;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.common.ParsingException;
1514
import org.elasticsearch.common.io.stream.StreamInput;
1615
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -128,7 +127,7 @@ public FiltersAggregationBuilder(StreamInput in) throws IOException {
128127
}
129128
otherBucket = in.readBoolean();
130129
otherBucketKey = in.readString();
131-
keyedBucket = in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readBoolean() : true;
130+
keyedBucket = in.readBoolean();
132131
}
133132

134133
@Override
@@ -137,9 +136,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
137136
out.writeCollection(filters, keyed ? StreamOutput::writeWriteable : (o, v) -> o.writeNamedWriteable(v.filter()));
138137
out.writeBoolean(otherBucket);
139138
out.writeString(otherBucketKey);
140-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
141-
out.writeBoolean(keyedBucket);
142-
}
139+
out.writeBoolean(keyedBucket);
143140
}
144141

145142
/**

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java‎

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

1010
package org.elasticsearch.search.aggregations.bucket.filter;
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.common.util.Maps;
@@ -139,7 +138,7 @@ public InternalFilters(String name, List<InternalBucket> buckets, boolean keyed,
139138
public InternalFilters(StreamInput in) throws IOException {
140139
super(in);
141140
keyed = in.readBoolean();
142-
keyedBucket = in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readBoolean() : true;
141+
keyedBucket = in.readBoolean();
143142
int size = in.readVInt();
144143
List<InternalBucket> buckets = new ArrayList<>(size);
145144
for (int i = 0; i < size; i++) {
@@ -152,9 +151,7 @@ public InternalFilters(StreamInput in) throws IOException {
152151
@Override
153152
protected void doWriteTo(StreamOutput out) throws IOException {
154153
out.writeBoolean(keyed);
155-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
156-
out.writeBoolean(keyedBucket);
157-
}
154+
out.writeBoolean(keyedBucket);
158155
out.writeCollection(buckets);
159156
}
160157

0 commit comments

Comments
 (0)