Skip to content

Commit 0a5a74c

Browse files
jdconradjdconrad
authored
Migrate 9.2 transport versions to files (#133684)
This migrates a group of transport versions to the new file system that should only affect 9.2 so no backports are required. This leaves the very latest for now, so devs adding new versions will know which version to bump next. ES-12334
1 parent 37f65b0 commit 0a5a74c

File tree

40 files changed

+137
-69
lines changed

40 files changed

+137
-69
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -352,23 +352,6 @@ static TransportVersion def(int id) {
352352
public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00);
353353
public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
354354
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00);
355-
public static final TransportVersion ESQL_TOPN_TIMINGS = def(9_128_0_00);
356-
public static final TransportVersion NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS = def(9_129_0_00);
357-
public static final TransportVersion RERANK_SNIPPETS = def(9_130_0_00);
358-
public static final TransportVersion PIPELINE_TRACKING_INFO = def(9_131_0_00);
359-
public static final TransportVersion COMPONENT_TEMPLATE_TRACKING_INFO = def(9_132_0_00);
360-
public static final TransportVersion TO_CHILD_BLOCK_JOIN_QUERY = def(9_133_0_00);
361-
public static final TransportVersion ML_INFERENCE_AI21_COMPLETION_ADDED = def(9_134_0_00);
362-
public static final TransportVersion TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION = def(9_135_0_00);
363-
public static final TransportVersion INDEX_TEMPLATE_TRACKING_INFO = def(9_136_0_00);
364-
public static final TransportVersion EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO = def(9_137_0_00);
365-
public static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = def(9_138_0_00);
366-
public static final TransportVersion ESQL_LOOKUP_JOIN_ON_MANY_FIELDS = def(9_139_0_00);
367-
public static final TransportVersion SIMULATE_INGEST_EFFECTIVE_MAPPING = def(9_140_0_00);
368-
public static final TransportVersion RESOLVE_INDEX_MODE_ADDED = def(9_141_0_00);
369-
public static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = def(9_142_0_00);
370-
public static final TransportVersion SCRIPT_RESCORER = def(9_143_0_00);
371-
public static final TransportVersion ESQL_LOOKUP_OPERATOR_EMITTED_ROWS = def(9_144_0_00);
372355
public static final TransportVersion ALLOCATION_DECISION_NOT_PREFERRED = def(9_145_0_00);
373356
public static final TransportVersion ESQL_QUALIFIERS_IN_ATTRIBUTES = def(9_146_0_00);
374357

‎server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java‎

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

1010
package org.elasticsearch.action.admin.indices.resolve;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionListener;
1414
import org.elasticsearch.action.ActionRequestValidationException;
1515
import org.elasticsearch.action.ActionResponse;
@@ -73,6 +73,8 @@ public class ResolveIndexAction extends ActionType<ResolveIndexAction.Response>
7373
public static final String NAME = "indices:admin/resolve/index";
7474
public static final RemoteClusterActionType<Response> REMOTE_TYPE = new RemoteClusterActionType<>(NAME, Response::new);
7575

76+
private static final TransportVersion RESOLVE_INDEX_MODE_ADDED = TransportVersion.fromName("resolve_index_mode_added");
77+
7678
private ResolveIndexAction() {
7779
super(NAME);
7880
}
@@ -190,7 +192,7 @@ public static class ResolvedIndex extends ResolvedIndexAbstraction implements Wr
190192
this.aliases = in.readStringArray();
191193
this.attributes = in.readStringArray();
192194
this.dataStream = in.readOptionalString();
193-
if (in.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_ADDED)) {
195+
if (in.getTransportVersion().supports(RESOLVE_INDEX_MODE_ADDED)) {
194196
this.mode = IndexMode.readFrom(in);
195197
} else {
196198
this.mode = null;
@@ -231,7 +233,7 @@ public void writeTo(StreamOutput out) throws IOException {
231233
out.writeStringArray(aliases);
232234
out.writeStringArray(attributes);
233235
out.writeOptionalString(dataStream);
234-
if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_ADDED)) {
236+
if (out.getTransportVersion().supports(RESOLVE_INDEX_MODE_ADDED)) {
235237
IndexMode.writeTo(mode, out);
236238
}
237239
}

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

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

1010
package org.elasticsearch.action.bulk;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.cluster.metadata.ComponentTemplate;
1415
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
@@ -99,6 +100,11 @@
99100
* processor definitions.
100101
*/
101102
public class SimulateBulkRequest extends BulkRequest {
103+
104+
private static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = TransportVersion.fromName(
105+
"simulate_ingest_mapping_merge_type"
106+
);
107+
102108
private final Map<String, Map<String, Object>> pipelineSubstitutions;
103109
private final Map<String, Map<String, Object>> componentTemplateSubstitutions;
104110
private final Map<String, Map<String, Object>> indexTemplateSubstitutions;
@@ -150,7 +156,7 @@ public SimulateBulkRequest(StreamInput in) throws IOException {
150156
} else {
151157
mappingAddition = Map.of();
152158
}
153-
if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
159+
if (in.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
154160
mappingMergeType = in.readOptionalString();
155161
} else {
156162
mappingMergeType = null;
@@ -168,7 +174,7 @@ public void writeTo(StreamOutput out) throws IOException {
168174
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
169175
out.writeGenericValue(mappingAddition);
170176
}
171-
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
177+
if (out.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
172178
out.writeOptionalString(mappingMergeType);
173179
}
174180
}

‎server/src/main/java/org/elasticsearch/action/datastreams/UpdateDataStreamSettingsAction.java‎

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

1010
package org.elasticsearch.action.datastreams;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.ActionResponse;
1415
import org.elasticsearch.action.ActionType;
@@ -41,6 +42,10 @@ public class UpdateDataStreamSettingsAction extends ActionType<UpdateDataStreamS
4142
public static final String NAME = "indices:admin/data_stream/settings/update";
4243
public static final UpdateDataStreamSettingsAction INSTANCE = new UpdateDataStreamSettingsAction();
4344

45+
private static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = TransportVersion.fromName(
46+
"data_stream_write_index_only_settings"
47+
);
48+
4449
public UpdateDataStreamSettingsAction() {
4550
super(NAME);
4651
}
@@ -242,9 +247,7 @@ public record IndicesSettingsResult(
242247
public IndicesSettingsResult(StreamInput in) throws IOException {
243248
this(
244249
in.readStringCollectionAsList(),
245-
in.getTransportVersion().onOrAfter(TransportVersions.DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)
246-
? in.readStringCollectionAsList()
247-
: List.of(),
250+
in.getTransportVersion().supports(DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS) ? in.readStringCollectionAsList() : List.of(),
248251
in.readStringCollectionAsList(),
249252
in.readCollectionAsList(IndexSettingError::new)
250253
);
@@ -264,7 +267,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
264267
@Override
265268
public void writeTo(StreamOutput out) throws IOException {
266269
out.writeStringCollection(appliedToDataStreamOnly);
267-
if (out.getTransportVersion().onOrAfter(TransportVersions.DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)) {
270+
if (out.getTransportVersion().supports(DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)) {
268271
out.writeStringCollection(appliedToDataStreamAndWriteIndex);
269272
}
270273
out.writeStringCollection(appliedToDataStreamAndBackingIndices);

‎server/src/main/java/org/elasticsearch/action/ingest/SimulateIndexResponse.java‎

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

1212
import org.elasticsearch.ElasticsearchException;
13+
import org.elasticsearch.TransportVersion;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.action.bulk.IndexDocFailureStoreStatus;
1516
import org.elasticsearch.action.index.IndexResponse;
@@ -35,6 +36,11 @@
3536
* BulkItemResponse in IngestService.
3637
*/
3738
public class SimulateIndexResponse extends IndexResponse {
39+
40+
private static final TransportVersion SIMULATE_INGEST_EFFECTIVE_MAPPING = TransportVersion.fromName(
41+
"simulate_ingest_effective_mapping"
42+
);
43+
3844
private final BytesReference source;
3945
private final XContentType sourceXContentType;
4046
private final Collection<String> ignoredFields;
@@ -57,7 +63,7 @@ public SimulateIndexResponse(StreamInput in) throws IOException {
5763
} else {
5864
this.ignoredFields = List.of();
5965
}
60-
if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
66+
if (in.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
6167
if (in.readBoolean()) {
6268
this.effectiveMapping = CompressedXContent.readCompressedString(in);
6369
} else {
@@ -149,7 +155,7 @@ public void writeTo(StreamOutput out) throws IOException {
149155
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_IGNORED_FIELDS)) {
150156
out.writeStringCollection(ignoredFields);
151157
}
152-
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
158+
if (out.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
153159
out.writeBoolean(effectiveMapping != null);
154160
if (effectiveMapping != null) {
155161
effectiveMapping.writeTo(out);

‎server/src/main/java/org/elasticsearch/cluster/NodeUsageStatsForThreadPoolsCollector.java‎

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

1010
package org.elasticsearch.cluster;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionListener;
1414
import org.elasticsearch.action.admin.cluster.node.usage.NodeUsageStatsForThreadPoolsAction;
1515
import org.elasticsearch.action.admin.cluster.node.usage.TransportNodeUsageStatsForThreadPoolsAction;
@@ -33,6 +33,10 @@ public void collectUsageStats(
3333
}
3434
};
3535

36+
private static final TransportVersion TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION = TransportVersion.fromName(
37+
"transport_node_usage_stats_for_thread_pools_action"
38+
);
39+
3640
/**
3741
* Collects the thread pool usage stats ({@link NodeUsageStatsForThreadPools}) for each node in the cluster.
3842
*
@@ -44,7 +48,7 @@ public void collectUsageStats(
4448
ActionListener<Map<String, NodeUsageStatsForThreadPools>> listener
4549
) {
4650
var dataNodeIds = clusterState.nodes().getDataNodes().values().stream().map(node -> node.getId()).toArray(String[]::new);
47-
if (clusterState.getMinTransportVersion().onOrAfter(TransportVersions.TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION)) {
51+
if (clusterState.getMinTransportVersion().supports(TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION)) {
4852
client.execute(
4953
TransportNodeUsageStatsForThreadPoolsAction.TYPE,
5054
new NodeUsageStatsForThreadPoolsAction.Request(dataNodeIds),

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

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

1010
package org.elasticsearch.cluster.metadata;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
1415
import org.elasticsearch.cluster.Diff;
@@ -60,6 +61,8 @@ public class ComponentTemplate implements SimpleDiffable<ComponentTemplate>, ToX
6061
PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), MODIFIED_DATE_MILLIS);
6162
}
6263

64+
private static final TransportVersion COMPONENT_TEMPLATE_TRACKING_INFO = TransportVersion.fromName("component_template_tracking_info");
65+
6366
private final Template template;
6467
@Nullable
6568
private final Long version;
@@ -113,7 +116,7 @@ public ComponentTemplate(StreamInput in) throws IOException {
113116
} else {
114117
deprecated = null;
115118
}
116-
if (in.getTransportVersion().onOrAfter(TransportVersions.COMPONENT_TEMPLATE_TRACKING_INFO)) {
119+
if (in.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) {
117120
this.createdDateMillis = in.readOptionalLong();
118121
this.modifiedDateMillis = in.readOptionalLong();
119122
} else {
@@ -165,7 +168,7 @@ public void writeTo(StreamOutput out) throws IOException {
165168
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
166169
out.writeOptionalBoolean(this.deprecated);
167170
}
168-
if (out.getTransportVersion().onOrAfter(TransportVersions.COMPONENT_TEMPLATE_TRACKING_INFO)) {
171+
if (out.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) {
169172
out.writeOptionalLong(this.createdDateMillis);
170173
out.writeOptionalLong(this.modifiedDateMillis);
171174
}

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

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

1010
package org.elasticsearch.cluster.metadata;
1111

12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
1415
import org.elasticsearch.cluster.Diff;
@@ -107,6 +108,8 @@ public class ComposableIndexTemplate implements SimpleDiffable<ComposableIndexTe
107108
PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), MODIFIED_DATE_MILLIS);
108109
}
109110

111+
private static final TransportVersion INDEX_TEMPLATE_TRACKING_INFO = TransportVersion.fromName("index_template_tracking_info");
112+
110113
private final List<String> indexPatterns;
111114
@Nullable
112115
private final Template template;
@@ -181,7 +184,7 @@ public ComposableIndexTemplate(StreamInput in) throws IOException {
181184
} else {
182185
this.deprecated = null;
183186
}
184-
if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_TEMPLATE_TRACKING_INFO)) {
187+
if (in.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) {
185188
this.createdDateMillis = in.readOptionalLong();
186189
this.modifiedDateMillis = in.readOptionalLong();
187190
} else {
@@ -298,7 +301,7 @@ public void writeTo(StreamOutput out) throws IOException {
298301
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
299302
out.writeOptionalBoolean(deprecated);
300303
}
301-
if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_TEMPLATE_TRACKING_INFO)) {
304+
if (out.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) {
302305
out.writeOptionalLong(createdDateMillis);
303306
out.writeOptionalLong(modifiedDateMillis);
304307
}

‎server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterBalanceStats.java‎

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

1010
package org.elasticsearch.cluster.routing.allocation.allocator;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.cluster.ClusterInfo;
1414
import org.elasticsearch.cluster.ClusterState;
1515
import org.elasticsearch.cluster.metadata.Metadata;
@@ -214,6 +214,10 @@ public record NodeBalanceStats(
214214

215215
private static final String UNKNOWN_NODE_ID = "UNKNOWN";
216216

217+
private static final TransportVersion NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS = TransportVersion.fromName(
218+
"node_weights_added_to_node_balance_stats"
219+
);
220+
217221
private static NodeBalanceStats createFrom(
218222
RoutingNode routingNode,
219223
Metadata metadata,
@@ -272,9 +276,7 @@ public static NodeBalanceStats readFrom(StreamInput in) throws IOException {
272276
in.readDouble(),
273277
in.readLong(),
274278
in.readLong(),
275-
in.getTransportVersion().onOrAfter(TransportVersions.NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)
276-
? in.readOptionalDouble()
277-
: null
279+
in.getTransportVersion().supports(NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS) ? in.readOptionalDouble() : null
278280
);
279281
}
280282

@@ -287,7 +289,7 @@ public void writeTo(StreamOutput out) throws IOException {
287289
out.writeDouble(forecastWriteLoad);
288290
out.writeLong(forecastShardSize);
289291
out.writeLong(actualShardSize);
290-
if (out.getTransportVersion().onOrAfter(TransportVersions.NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)) {
292+
if (out.getTransportVersion().supports(NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)) {
291293
out.writeOptionalDouble(nodeWeight);
292294
}
293295
}

‎server/src/main/java/org/elasticsearch/index/query/ToChildBlockJoinQueryBuilder.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.apache.lucene.search.join.BitSetProducer;
1414
import org.apache.lucene.search.join.ToChildBlockJoinQuery;
1515
import org.elasticsearch.TransportVersion;
16-
import org.elasticsearch.TransportVersions;
1716
import org.elasticsearch.common.io.stream.StreamInput;
1817
import org.elasticsearch.common.io.stream.StreamOutput;
1918
import org.elasticsearch.common.lucene.search.Queries;
@@ -29,6 +28,9 @@
2928
*/
3029
public class ToChildBlockJoinQueryBuilder extends AbstractQueryBuilder<ToChildBlockJoinQueryBuilder> {
3130
public static final String NAME = "to_child_block_join";
31+
32+
private static final TransportVersion TO_CHILD_BLOCK_JOIN_QUERY = TransportVersion.fromName("to_child_block_join_query");
33+
3234
private final QueryBuilder parentQueryBuilder;
3335

3436
public ToChildBlockJoinQueryBuilder(QueryBuilder parentQueryBuilder) {
@@ -108,6 +110,6 @@ public String getWriteableName() {
108110

109111
@Override
110112
public TransportVersion getMinimalSupportedVersion() {
111-
return TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY;
113+
return TO_CHILD_BLOCK_JOIN_QUERY;
112114
}
113115
}

0 commit comments

Comments
 (0)