Skip to content

Commit 93581ee

Browse files
thecoopgeorgewallace
thecoop
authored and
georgewallace
committed
Collapse transport versions for 8.17.0 (elastic#124005)
1 parent b6f58b3 commit 93581ee

File tree

26 files changed

+48
-102
lines changed

26 files changed

+48
-102
lines changed

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,31 +103,7 @@ static TransportVersion def(int id) {
103103
public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
104104
public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_0_00);
105105
public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_0_00);
106-
public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_0_00);
107-
public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ = def(8_776_0_00);
108-
public static final TransportVersion SIMULATE_MAPPING_ADDITION = def(8_777_0_00);
109-
public static final TransportVersion INTRODUCE_ALL_APPLICABLE_SELECTOR = def(8_778_0_00);
110-
public static final TransportVersion INDEX_MODE_LOOKUP = def(8_779_0_00);
111-
public static final TransportVersion INDEX_REQUEST_REMOVE_METERING = def(8_780_0_00);
112-
public static final TransportVersion CPU_STAT_STRING_PARSING = def(8_781_0_00);
113-
public static final TransportVersion QUERY_RULES_RETRIEVER = def(8_782_0_00);
114-
public static final TransportVersion ESQL_CCS_EXEC_INFO_WITH_FAILURES = def(8_783_0_00);
115-
public static final TransportVersion LOGSDB_TELEMETRY = def(8_784_0_00);
116-
public static final TransportVersion LOGSDB_TELEMETRY_STATS = def(8_785_0_00);
117-
public static final TransportVersion KQL_QUERY_ADDED = def(8_786_0_00);
118-
public static final TransportVersion ROLE_MONITOR_STATS = def(8_787_0_00);
119-
public static final TransportVersion DATA_STREAM_INDEX_VERSION_DEPRECATION_CHECK = def(8_788_0_00);
120-
public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO = def(8_789_0_00);
121-
public static final TransportVersion VERTEX_AI_INPUT_TYPE_ADDED = def(8_790_0_00);
122-
public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE = def(8_791_0_00);
123-
public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES = def(8_792_0_00);
124-
public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS = def(8_793_0_00);
125-
public static final TransportVersion INDEX_STATS_ADDITIONAL_FIELDS_REVERT = def(8_794_0_00);
126-
public static final TransportVersion FAST_REFRESH_RCO_2 = def(8_795_0_00);
127-
public static final TransportVersion ESQL_ENRICH_RUNTIME_WARNINGS = def(8_796_0_00);
128-
public static final TransportVersion INGEST_PIPELINE_CONFIGURATION_AS_MAP = def(8_797_0_00);
129-
public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE_FIX_8_17 = def(8_797_0_01);
130-
public static final TransportVersion SOURCE_MODE_TELEMETRY_FIX_8_17 = def(8_797_0_02);
106+
public static final TransportVersion V_8_17_0 = def(8_797_0_02);
131107
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03);
132108
public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04);
133109
public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public NodeInfo(StreamInput in) throws IOException {
6666
super(in);
6767
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
6868
version = in.readString();
69-
if (in.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_1)
70-
|| in.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) {
69+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
7170
compatibilityVersions = CompatibilityVersions.readVersion(in);
7271
} else {
7372
compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
@@ -252,8 +251,7 @@ public void writeTo(StreamOutput out) throws IOException {
252251
} else {
253252
Version.writeVersion(Version.fromString(version), out);
254253
}
255-
if (out.getTransportVersion().isPatchFrom(TransportVersions.V_8_16_1)
256-
|| out.getTransportVersion().onOrAfter(TransportVersions.ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO)) {
254+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
257255
compatibilityVersions.writeTo(out);
258256
} else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
259257
TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);

‎server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,7 @@ public void writeTo(StreamOutput out) throws IOException {
291291
}
292292

293293
private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) {
294-
return version.isPatchFrom(TransportVersions.SOURCE_MODE_TELEMETRY_FIX_8_17)
295-
|| version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
294+
return version.isPatchFrom(TransportVersions.V_8_17_0) || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
296295
}
297296

298297
private static OptionalLong ofNullable(Long l) {

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

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,7 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse {
5555
IndicesStatsResponse(StreamInput in) throws IOException {
5656
super(in);
5757
shards = in.readArray(ShardStats::new, ShardStats[]::new);
58-
if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) {
59-
indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
60-
indexStateMap = in.readMap(IndexMetadata.State::readFrom);
61-
} else if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) {
62-
indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
63-
indexStateMap = in.readMap(IndexMetadata.State::readFrom);
64-
in.readMap(StreamInput::readStringCollectionAsList); // unused, reverted
65-
in.readMap(StreamInput::readLong); // unused, reverted
66-
} else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
58+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
6759
// Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response
6860
// where we only had health and state available.
6961
indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
@@ -186,15 +178,7 @@ public CommonStats getPrimaries() {
186178
public void writeTo(StreamOutput out) throws IOException {
187179
super.writeTo(out);
188180
out.writeArray(shards);
189-
if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS_REVERT)) {
190-
out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
191-
out.writeMap(indexStateMap, StreamOutput::writeWriteable);
192-
} else if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_STATS_ADDITIONAL_FIELDS)) {
193-
out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
194-
out.writeMap(indexStateMap, StreamOutput::writeWriteable);
195-
out.writeMap(Map.of(), StreamOutput::writeStringCollection);
196-
out.writeMap(Map.of(), StreamOutput::writeLong);
197-
} else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
181+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
198182
out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
199183
out.writeMap(indexStateMap, StreamOutput::writeWriteable);
200184
}

‎server/src/main/java/org/elasticsearch/action/bulk/SimulateBulkRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public SimulateBulkRequest(StreamInput in) throws IOException {
142142
componentTemplateSubstitutions = Map.of();
143143
indexTemplateSubstitutions = Map.of();
144144
}
145-
if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) {
145+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
146146
this.mappingAddition = (Map<String, Object>) in.readGenericValue();
147147
} else {
148148
mappingAddition = Map.of();
@@ -157,7 +157,7 @@ public void writeTo(StreamOutput out) throws IOException {
157157
out.writeGenericValue(componentTemplateSubstitutions);
158158
out.writeGenericValue(indexTemplateSubstitutions);
159159
}
160-
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_MAPPING_ADDITION)) {
160+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
161161
out.writeGenericValue(mappingAddition);
162162
}
163163
}

‎server/src/main/java/org/elasticsearch/action/index/IndexRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
203203
requireDataStream = false;
204204
}
205205

206-
if (in.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) {
206+
if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) {
207207
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
208208
in.readZLong(); // obsolete normalisedBytesParsed
209209
}
@@ -803,7 +803,7 @@ private void writeBody(StreamOutput out) throws IOException {
803803
out.writeBoolean(requireDataStream);
804804
}
805805

806-
if (out.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_METERING)) {
806+
if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) {
807807
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
808808
out.writeZLong(-1); // obsolete normalisedBytesParsed
809809
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ public void writeIndicesOptions(StreamOutput out) throws IOException {
911911
}
912912
if (out.getTransportVersion()
913913
.between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) {
914-
if (out.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) {
914+
if (out.getTransportVersion().before(TransportVersions.V_8_17_0)) {
915915
out.writeVInt(1); // Enum set sized 1
916916
out.writeVInt(0); // ordinal 0 (::data selector)
917917
} else {
@@ -955,7 +955,7 @@ public static IndicesOptions readIndicesOptions(StreamInput in) throws IOExcepti
955955
if (in.getTransportVersion()
956956
.between(TransportVersions.V_8_16_0, TransportVersions.REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX)) {
957957
// Reading from an older node, which will be sending either an enum set or a single byte that needs to be read out and ignored.
958-
if (in.getTransportVersion().before(TransportVersions.INTRODUCE_ALL_APPLICABLE_SELECTOR)) {
958+
if (in.getTransportVersion().before(TransportVersions.V_8_17_0)) {
959959
int size = in.readVInt();
960960
for (int i = 0; i < size; i++) {
961961
in.readVInt();

‎server/src/main/java/org/elasticsearch/index/IndexMode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ public static void writeTo(IndexMode indexMode, StreamOutput out) throws IOExcep
587587
case STANDARD -> 0;
588588
case TIME_SERIES -> 1;
589589
case LOGSDB -> 2;
590-
case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.INDEX_MODE_LOOKUP) ? 3 : 0;
590+
case LOOKUP -> out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0) ? 3 : 0;
591591
};
592592
out.writeByte((byte) code);
593593
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
168168
public static PipelineConfiguration readFrom(StreamInput in) throws IOException {
169169
final String id = in.readString();
170170
final Map<String, Object> config;
171-
if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_PIPELINE_CONFIGURATION_AS_MAP)) {
171+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
172172
config = in.readGenericMap();
173173
} else {
174174
final BytesReference bytes = in.readSlicedBytesReference();
@@ -190,7 +190,7 @@ public String toString() {
190190
@Override
191191
public void writeTo(StreamOutput out) throws IOException {
192192
out.writeString(id);
193-
if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_PIPELINE_CONFIGURATION_AS_MAP)) {
193+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
194194
out.writeGenericMap(config);
195195
} else {
196196
XContentBuilder builder = XContentBuilder.builder(JsonXContent.jsonXContent).prettyPrint();

‎server/src/main/java/org/elasticsearch/monitor/os/OsStats.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ public Cgroup(
488488

489489
Cgroup(final StreamInput in) throws IOException {
490490
cpuAcctControlGroup = in.readString();
491-
if (in.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
491+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
492492
cpuAcctUsageNanos = in.readBigInteger();
493493
} else {
494494
cpuAcctUsageNanos = BigInteger.valueOf(in.readLong());
@@ -505,7 +505,7 @@ public Cgroup(
505505
@Override
506506
public void writeTo(final StreamOutput out) throws IOException {
507507
out.writeString(cpuAcctControlGroup);
508-
if (out.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
508+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
509509
out.writeBigInteger(cpuAcctUsageNanos);
510510
} else {
511511
out.writeLong(cpuAcctUsageNanos.longValue());
@@ -605,7 +605,7 @@ public CpuStat(
605605
}
606606

607607
CpuStat(final StreamInput in) throws IOException {
608-
if (in.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
608+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
609609
numberOfElapsedPeriods = in.readBigInteger();
610610
numberOfTimesThrottled = in.readBigInteger();
611611
timeThrottledNanos = in.readBigInteger();
@@ -618,7 +618,7 @@ public CpuStat(
618618

619619
@Override
620620
public void writeTo(final StreamOutput out) throws IOException {
621-
if (out.getTransportVersion().onOrAfter(TransportVersions.CPU_STAT_STRING_PARSING)) {
621+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
622622
out.writeBigInteger(numberOfElapsedPeriods);
623623
out.writeBigInteger(numberOfTimesThrottled);
624624
out.writeBigInteger(timeThrottledNanos);

0 commit comments

Comments
 (0)