Skip to content

Commit 78ddfb2

Browse files
prdoyleprdoyle
committed
Initial TV collapse based on TransportVersions.json
1 parent 68b8145 commit 78ddfb2

File tree

12 files changed

+33
-42
lines changed

12 files changed

+33
-42
lines changed

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

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ static TransportVersion def(int id) {
8888
public static final TransportVersion V_8_15_2 = def(8_702_0_03);
8989
public static final TransportVersion V_8_16_0 = def(8_772_0_01);
9090
public static final TransportVersion V_8_16_1 = def(8_772_0_04);
91-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_5 = def(8_772_0_05);
92-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
91+
public static final TransportVersion V_8_16_5 = def(8_772_0_05);
92+
public static final TransportVersion V_8_16_6 = def(8_772_0_06);
9393
public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_7 = def(8_772_0_07);
9494
public static final TransportVersion V_8_17_0 = def(8_797_0_02);
95-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03);
96-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04);
97-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05);
95+
public static final TransportVersion V_8_17_3 = def(8_797_0_03);
96+
public static final TransportVersion V_8_17_4 = def(8_797_0_04);
97+
public static final TransportVersion V_8_17_5 = def(8_797_0_05);
9898
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_6 = def(8_797_0_06);
9999
public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00);
100100
public static final TransportVersion REINDEX_DATA_STREAMS = def(8_799_0_00);
@@ -140,7 +140,7 @@ static TransportVersion def(int id) {
140140
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
141141
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
142142
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18 = def(8_840_0_01);
143-
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_18 = def(8_840_0_02);
143+
public static final TransportVersion V_8_18_0 = def(8_840_0_02);
144144
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_1 = def(8_840_0_03);
145145
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
146146
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
@@ -162,16 +162,7 @@ static TransportVersion def(int id) {
162162
public static final TransportVersion AMAZON_BEDROCK_TASK_SETTINGS_8_19 = def(8_841_0_17);
163163
public static final TransportVersion BATCHED_QUERY_PHASE_VERSION_BACKPORT_8_X = def(8_841_0_19);
164164
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19 = def(8_841_0_20);
165-
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
166-
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
167-
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
168-
public static final TransportVersion REMOVE_DESIRED_NODE_VERSION_90 = def(9_000_0_03);
169-
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_90 = def(9_000_0_04);
170-
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_9_0 = def(9_000_0_05);
171-
public static final TransportVersion BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90 = def(9_000_0_06);
172-
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_90 = def(9_000_0_07);
173-
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90 = def(9_000_0_08);
174-
public static final TransportVersion STORED_SCRIPT_CONTENT_LENGTH_90 = def(9_000_0_09);
165+
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
175166
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
176167
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
177168
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
@@ -298,7 +289,7 @@ static TransportVersion def(int id) {
298289
* Reference to the minimum transport version that can be used with CCS.
299290
* This should be the transport version used by the previous minor release.
300291
*/
301-
public static final TransportVersion MINIMUM_CCS_VERSION = STORED_SCRIPT_CONTENT_LENGTH_90;
292+
public static final TransportVersion MINIMUM_CCS_VERSION = V_9_0_0;
302293

303294
/**
304295
* Sorted list of all versions defined in this class

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public GetSnapshotsResponse(List<SnapshotInfo> snapshots, @Nullable String next,
5050
public GetSnapshotsResponse(StreamInput in) throws IOException {
5151
this.snapshots = in.readCollectionAsImmutableList(SnapshotInfo::readFrom);
5252
if (in.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)
53-
&& in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_SNAPSHOT_FAILURES_90) == false) {
53+
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
5454
// Deprecated `failures` field
5555
in.readMap(StreamInput::readException);
5656
}
@@ -85,7 +85,7 @@ public int remaining() {
8585
public void writeTo(StreamOutput out) throws IOException {
8686
out.writeCollection(snapshots);
8787
if (out.getTransportVersion().before(TransportVersions.REMOVE_SNAPSHOT_FAILURES)
88-
&& out.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_SNAPSHOT_FAILURES_90) == false) {
88+
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
8989
// Deprecated `failures` field
9090
out.writeMap(Map.of(), StreamOutput::writeException);
9191
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class PutStoredScriptRequest extends AcknowledgedRequest<PutStoredScriptR
4545
public PutStoredScriptRequest(StreamInput in) throws IOException {
4646
super(in);
4747
id = in.readOptionalString();
48-
if (in.getTransportVersion().isPatchFrom(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH_90)
48+
if (in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
4949
|| in.getTransportVersion().onOrAfter(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH)) {
5050
contentLength = in.readVInt();
5151
} else {
@@ -106,7 +106,7 @@ public StoredScriptSource source() {
106106
public void writeTo(StreamOutput out) throws IOException {
107107
super.writeTo(out);
108108
out.writeOptionalString(id);
109-
if (out.getTransportVersion().isPatchFrom(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH_90)
109+
if (out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
110110
|| out.getTransportVersion().onOrAfter(TransportVersions.STORED_SCRIPT_CONTENT_LENGTH)) {
111111
out.writeVInt(contentLength);
112112
} else {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public SearchRequest(StreamInput in) throws IOException {
253253
finalReduce = true;
254254
}
255255
ccsMinimizeRoundtrips = in.readBoolean();
256-
if ((in.getTransportVersion().isPatchFrom(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90) == false
256+
if ((in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false
257257
&& in.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE)) && in.readBoolean()) {
258258
Version.readVersion(in); // and drop on the floor
259259
}
@@ -298,7 +298,7 @@ public void writeTo(StreamOutput out, boolean skipIndices) throws IOException {
298298
out.writeBoolean(finalReduce);
299299
}
300300
out.writeBoolean(ccsMinimizeRoundtrips);
301-
if ((out.getTransportVersion().isPatchFrom(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90) == false
301+
if ((out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false
302302
&& out.getTransportVersion().before(TransportVersions.RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE))) {
303303
out.writeBoolean(false);
304304
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static IndexComponentSelector getByKeyOrThrow(@Nullable String key) {
9393
public static IndexComponentSelector read(StreamInput in) throws IOException {
9494
byte id = in.readByte();
9595
if (in.getTransportVersion().onOrAfter(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR)
96-
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_9_0)
96+
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
9797
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18)
9898
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19)) {
9999
return getById(id);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public static DesiredNode readFrom(StreamInput in) throws IOException {
162162
final var memory = ByteSizeValue.readFrom(in);
163163
final var storage = ByteSizeValue.readFrom(in);
164164
if (in.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)
165-
&& in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_DESIRED_NODE_VERSION_90) == false) {
165+
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
166166
in.readOptionalString();
167167
}
168168
return new DesiredNode(settings, processors, processorsRange, memory, storage);
@@ -182,7 +182,7 @@ public void writeTo(StreamOutput out) throws IOException {
182182
memory.writeTo(out);
183183
storage.writeTo(out);
184184
if (out.getTransportVersion().before(TransportVersions.REMOVE_DESIRED_NODE_VERSION)
185-
&& out.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_DESIRED_NODE_VERSION_90) == false) {
185+
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
186186
out.writeOptionalString(null);
187187
}
188188
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

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;
30-
import static org.elasticsearch.TransportVersions.BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90;
30+
import static org.elasticsearch.TransportVersions.V_9_0_0;
3131
import static org.elasticsearch.TransportVersions.REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1;
3232
import static org.elasticsearch.common.unit.ByteSizeUnit.BYTES;
3333
import static org.elasticsearch.common.unit.ByteSizeUnit.GB;
@@ -134,7 +134,7 @@ public void writeTo(StreamOutput out) throws IOException {
134134

135135
private static boolean alwaysUseBytes(TransportVersion tv) {
136136
return tv.onOrAfter(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES)
137-
|| tv.isPatchFrom(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)
137+
|| tv.isPatchFrom(V_9_0_0)
138138
|| tv.between(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1, REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1);
139139
}
140140

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public TransportStats(StreamInput in) throws IOException {
7070
txCount = in.readVLong();
7171
txSize = in.readVLong();
7272
if (in.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)
73-
&& in.getTransportVersion().isPatchFrom(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90) == false) {
73+
&& in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
7474
in.readBoolean();
7575
}
7676
inboundHandlingTimeBucketFrequencies = new long[HandlingTimeTracker.BUCKET_COUNT];
@@ -100,7 +100,7 @@ public void writeTo(StreamOutput out) throws IOException {
100100
assert inboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
101101
assert outboundHandlingTimeBucketFrequencies.length == HandlingTimeTracker.BUCKET_COUNT;
102102
if (out.getTransportVersion().before(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED)
103-
&& out.getTransportVersion().isPatchFrom(TransportVersions.TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90) == false) {
103+
&& out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0) == false) {
104104
out.writeBoolean(true);
105105
}
106106
for (long handlingTimeBucketFrequency : inboundHandlingTimeBucketFrequencies) {

‎server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java‎

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

1212
import org.elasticsearch.ElasticsearchParseException;
1313
import org.elasticsearch.TransportVersion;
14+
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.common.io.stream.BytesStreamOutput;
1516
import org.elasticsearch.common.io.stream.Writeable.Reader;
1617
import org.elasticsearch.test.AbstractWireSerializingTestCase;
@@ -22,8 +23,7 @@
2223
import java.util.function.Function;
2324

2425
import static org.elasticsearch.TransportVersions.BYTE_SIZE_VALUE_ALWAYS_USES_BYTES;
25-
import static org.elasticsearch.TransportVersions.BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90;
26-
import static org.elasticsearch.TransportVersions.INITIAL_ELASTICSEARCH_9_0;
26+
import static org.elasticsearch.TransportVersions.V_9_0_0;
2727
import static org.elasticsearch.TransportVersions.V_8_16_0;
2828
import static org.hamcrest.Matchers.containsString;
2929
import static org.hamcrest.Matchers.equalTo;
@@ -523,7 +523,7 @@ protected void assertEqualInstances(ByteSizeValue expectedInstance, ByteSizeValu
523523

524524
public void testBWCTransportFormat() throws IOException {
525525
var tenMegs = ByteSizeValue.ofMb(10);
526-
for (var tv : List.of(V_8_16_0, INITIAL_ELASTICSEARCH_9_0)) {
526+
for (var tv : List.of(V_8_16_0, V_9_0_0)) {
527527
try (BytesStreamOutput expected = new BytesStreamOutput(); BytesStreamOutput actual = new BytesStreamOutput()) {
528528
expected.writeZLong(10);
529529
ByteSizeUnit.MB.writeTo(expected);
@@ -539,7 +539,7 @@ public void testBWCTransportFormat() throws IOException {
539539
}
540540

541541
public void testTransportRoundTripsWithTwoDigitFractions() throws IOException {
542-
for (var tv : List.of(TransportVersion.current(), BYTE_SIZE_VALUE_ALWAYS_USES_BYTES, BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)) {
542+
for (var tv : List.of(TransportVersion.current(), BYTE_SIZE_VALUE_ALWAYS_USES_BYTES, TransportVersions.V_9_0_0)) {
543543
for (var desiredUnit : ByteSizeUnit.values()) {
544544
if (desiredUnit == ByteSizeUnit.BYTES) {
545545
// Can't have a fraction of a byte!

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/action/RetryActionRequest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public RetryActionRequest(StreamInput in) throws IOException {
3535
this.indices = in.readStringArray();
3636
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
3737
if (in.getTransportVersion().onOrAfter(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR)
38-
|| in.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_90)
38+
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
3939
|| in.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_19)
40-
|| in.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_18)) {
40+
|| in.getTransportVersion().isPatchFrom(TransportVersions.V_8_18_0)) {
4141
this.requireError = in.readBoolean();
4242
}
4343
}
@@ -82,9 +82,9 @@ public void writeTo(StreamOutput out) throws IOException {
8282
out.writeStringArray(indices);
8383
indicesOptions.writeIndicesOptions(out);
8484
if (out.getTransportVersion().onOrAfter(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR)
85-
|| out.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_90)
85+
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_9_0_0)
8686
|| out.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_19)
87-
|| out.getTransportVersion().isPatchFrom(TransportVersions.RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_18)) {
87+
|| out.getTransportVersion().isPatchFrom(TransportVersions.V_8_18_0)) {
8888
out.writeBoolean(requireError);
8989
}
9090
}

0 commit comments

Comments
 (0)