Skip to content

Commit 51eedb2

Browse files
jdconradjdconrad
committed
migrate v_9_0_0 and remove_all_applicable_selector transport versions to
files
1 parent bde4004 commit 51eedb2

File tree

15 files changed

+50
-29
lines changed

15 files changed

+50
-29
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ static TransportVersion def(int id) {
143143
public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
144144
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
145145
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
146-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18 = def(8_840_0_01);
147146
public static final TransportVersion V_8_18_0 = def(8_840_0_02);
148147
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_1 = def(8_840_0_03);
149148
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_2 = def(8_840_0_04);
@@ -152,7 +151,6 @@ static TransportVersion def(int id) {
152151
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08);
153152
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
154153
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
155-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19 = def(8_841_0_02);
156154
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_841_0_03);
157155
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_841_0_04);
158156
public static final TransportVersion VOYAGE_AI_INTEGRATION_ADDED_BACKPORT_8_X = def(8_841_0_05);
@@ -216,7 +214,6 @@ static TransportVersion def(int id) {
216214
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_1 = def(8_841_0_65);
217215
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_2 = def(8_841_0_66);
218216
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19_3 = def(8_841_0_67);
219-
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
220217
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
221218
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
222219
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12);
@@ -230,7 +227,6 @@ static TransportVersion def(int id) {
230227
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE = def(9_006_0_00);
231228
public static final TransportVersion ESQL_PROFILE_ASYNC_NANOS = def(9_007_00_0);
232229
public static final TransportVersion ESQL_LOOKUP_JOIN_SOURCE_TEXT = def(9_008_0_00);
233-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR = def(9_009_0_00);
234230
public static final TransportVersion SLM_UNHEALTHY_IF_NO_SNAPSHOT_WITHIN = def(9_010_0_00);
235231
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS = def(9_011_0_00);
236232
public static final TransportVersion REMOVE_REPOSITORY_CONFLICT_MESSAGE = def(9_012_0_00);

‎server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java‎

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

1010
package org.elasticsearch.action.admin.cluster.snapshots.get;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.ActionResponse;
1415
import org.elasticsearch.common.Strings;
@@ -31,6 +32,8 @@
3132
*/
3233
public class GetSnapshotsResponse extends ActionResponse implements ChunkedToXContentObject {
3334

35+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
36+
3437
private final List<SnapshotInfo> snapshots;
3538

3639
@Nullable
@@ -50,7 +53,7 @@ public GetSnapshotsResponse(List<SnapshotInfo> snapshots, @Nullable String next,
5053
public GetSnapshotsResponse(StreamInput in) throws IOException {
5154
this.snapshots = in.readCollectionAsImmutableList(SnapshotInfo::readFrom);
5255
if (in.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)
53-
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
56+
&& in.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
5457
// Deprecated `failures` field
5558
in.readMap(StreamInput::readException);
5659
}
@@ -85,7 +88,7 @@ public int remaining() {
8588
public void writeTo(StreamOutput out) throws IOException {
8689
out.writeCollection(snapshots);
8790
if (out.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)
88-
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
91+
&& out.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
8992
// Deprecated `failures` field
9093
out.writeMap(Map.of(), StreamOutput::writeException);
9194
}

‎server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java‎

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

1010
package org.elasticsearch.action.admin.cluster.storedscripts;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.ActionRequestValidationException;
1415
import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -32,6 +33,8 @@
3233

3334
public class PutStoredScriptRequest extends AcknowledgedRequest<PutStoredScriptRequest> implements ToXContentFragment {
3435

36+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
37+
3538
@Nullable
3639
private final String id;
3740

@@ -45,7 +48,7 @@ public class PutStoredScriptRequest extends AcknowledgedRequest<PutStoredScriptR
4548
public PutStoredScriptRequest(StreamInput in) throws IOException {
4649
super(in);
4750
id = in.readOptionalString();
48-
if (in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
51+
if (in.getTransportVersion().isPatchFrom(V_9_0_0)
4952
|| in.getTransportVersion().onOrAfter(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH)) {
5053
contentLength = in.readVInt();
5154
} else {
@@ -106,7 +109,7 @@ public StoredScriptSource source() {
106109
public void writeTo(StreamOutput out) throws IOException {
107110
super.writeTo(out);
108111
out.writeOptionalString(id);
109-
if (out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
112+
if (out.getTransportVersion().isPatchFrom(V_9_0_0)
110113
|| out.getTransportVersion().onOrAfter(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH)) {
111114
out.writeVInt(contentLength);
112115
} else {

‎server/src/main/java/org/elasticsearch/action/search/SearchRequest.java‎

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

1010
package org.elasticsearch.action.search;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.Version;
1415
import org.elasticsearch.action.ActionRequestValidationException;
@@ -55,6 +56,8 @@
5556
*/
5657
public class SearchRequest extends LegacyActionRequest implements IndicesRequest.Replaceable, Rewriteable<SearchRequest> {
5758

59+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
60+
5861
public static final ToXContent.Params FORMAT_PARAMS = new ToXContent.MapParams(Collections.singletonMap("pretty", "false"));
5962

6063
public static final int DEFAULT_PRE_FILTER_SHARD_SIZE = 128;
@@ -254,7 +257,7 @@ public SearchRequest(StreamInput in) throws IOException {
254257
finalReduce = true;
255258
}
256259
ccsMinimizeRoundtrips = in.readBoolean();
257-
if ((in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false
260+
if ((in.getTransportVersion().isPatchFrom(V_9_0_0) == false
258261
&& in.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) && in.readBoolean()) {
259262
Version.readVersion(in); // and drop on the floor
260263
}
@@ -299,7 +302,7 @@ public void writeTo(StreamOutput out, boolean skipIndices) throws IOException {
299302
out.writeBoolean(finalReduce);
300303
}
301304
out.writeBoolean(ccsMinimizeRoundtrips);
302-
if ((out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false
305+
if ((out.getTransportVersion().isPatchFrom(V_9_0_0) == false
303306
&& out.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE))) {
304307
out.writeBoolean(false);
305308
}

‎server/src/main/java/org/elasticsearch/action/support/IndexComponentSelector.java‎

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

1010
package org.elasticsearch.action.support;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.common.io.stream.StreamInput;
1414
import org.elasticsearch.common.io.stream.StreamOutput;
1515
import org.elasticsearch.common.io.stream.Writeable;
@@ -46,6 +46,9 @@ public byte getId() {
4646
return id;
4747
}
4848

49+
private static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR = TransportVersion.fromName("remove_all_applicable_selector");
50+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
51+
4952
private static final Map<String, IndexComponentSelector> KEY_REGISTRY;
5053
private static final Map<Byte, IndexComponentSelector> ID_REGISTRY;
5154

@@ -92,10 +95,7 @@ public static IndexComponentSelector getByKeyOrThrow(@Nullable String key) {
9295

9396
public static IndexComponentSelector read(StreamInput in) throws IOException {
9497
byte id = in.readByte();
95-
if (in.getTransportVersion().onOrAfter(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR)
96-
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
97-
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18)
98-
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19)) {
98+
if (in.getTransportVersion().supports(REMOVE_ALL_APPLICABLE_SELECTOR) || in.getTransportVersion().isPatchFrom(V_9_0_0)) {
9999
return getById(id);
100100
} else {
101101
// Legacy value ::*, converted to ::data

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
public final class DesiredNode implements Writeable, ToXContentObject, Comparable<DesiredNode> {
4343

4444
public static final TransportVersion RANGE_FLOAT_PROCESSORS_SUPPORT_TRANSPORT_VERSION = TransportVersions.V_8_3_0;
45+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
4546

4647
private static final ParseField SETTINGS_FIELD = new ParseField("settings");
4748
private static final ParseField PROCESSORS_FIELD = new ParseField("processors");
@@ -162,7 +163,7 @@ public static DesiredNode readFrom(StreamInput in) throws IOException {
162163
final var memory = ByteSizeValue.readFrom(in);
163164
final var storage = ByteSizeValue.readFrom(in);
164165
if (in.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)
165-
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
166+
&& in.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
166167
in.readOptionalString();
167168
}
168169
return new DesiredNode(settings, processors, processorsRange, memory, storage);
@@ -182,7 +183,7 @@ public void writeTo(StreamOutput out) throws IOException {
182183
memory.writeTo(out);
183184
storage.writeTo(out);
184185
if (out.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)
185-
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
186+
&& out.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
186187
out.writeOptionalString(null);
187188
}
188189
}

‎server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import static org.elasticsearch.TransportVersions.BYTE_SIZE_VALUE_ALWAYS_USES_BYTES;
2929
import static org.elasticsearch.TransportVersions.BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1;
3030
import static org.elasticsearch.TransportVersions.REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1;
31-
import static org.elasticsearch.TransportVersions.V_9_0_0;
3231
import static org.elasticsearch.common.unit.ByteSizeUnit.BYTES;
3332
import static org.elasticsearch.common.unit.ByteSizeUnit.GB;
3433
import static org.elasticsearch.common.unit.ByteSizeUnit.KB;
@@ -47,6 +46,8 @@ static class DeprecationLoggerHolder {
4746
static DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ByteSizeValue.class);
4847
}
4948

49+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
50+
5051
public static final ByteSizeValue ZERO = new ByteSizeValue(0, BYTES);
5152
public static final ByteSizeValue ONE = new ByteSizeValue(1, BYTES);
5253
public static final ByteSizeValue MINUS_ONE = new ByteSizeValue(-1, BYTES);

‎server/src/main/java/org/elasticsearch/transport/TransportStats.java‎

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

1010
package org.elasticsearch.transport;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.common.collect.Iterators;
1415
import org.elasticsearch.common.io.stream.StreamInput;
@@ -29,6 +30,8 @@
2930

3031
public class TransportStats implements Writeable, ChunkedToXContent {
3132

33+
private static final TransportVersion V_9_0_0 = TransportVersion.fromName("v_9_0_0");
34+
3235
private final long serverOpen;
3336
private final long totalOutboundConnections;
3437
private final long rxCount;
@@ -70,7 +73,7 @@ public TransportStats(StreamInput in) throws IOException {
7073
txCount = in.readVLong();
7174
txSize = in.readVLong();
7275
if (in.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)
73-
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
76+
&& in.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
7477
in.readBoolean();
7578
}
7679
inboundHandlingTimeBucketFrequencies = new long[HandlingTimeTracker.BUCKET_COUNT];
@@ -100,7 +103,7 @@ public void writeTo(StreamOutput out) throws IOException {
100103
assert inboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
101104
assert outboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
102105
if (out.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)
103-
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
106+
&& out.getTransportVersion().isPatchFrom(V_9_0_0) == false) {
104107
out.writeBoolean(true);
105108
}
106109
for (long handlingTimeBucketFrequency : inboundHandlingTimeBucketFrequencies) {

‎server/src/main/resources/transport/definitions/named/remove_all_applicable_selector.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9009000,8841002,8840001

‎server/src/main/resources/transport/definitions/named/v_9_0_0.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9000009

0 commit comments

Comments
 (0)