Skip to content

Commit 7c957c3

Browse files
jdconradjdconrad
authored
Migrate more transport versions (elastic#134340)
Migrates more 9.2 transport versions. ES-12334
1 parent 3e2af4e commit 7c957c3

File tree

27 files changed

+103
-51
lines changed

27 files changed

+103
-51
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,6 @@ static TransportVersion def(int id) {
343343
public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00);
344344
public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
345345
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00);
346-
public static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = def(9_147_0_00);
347-
public static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = def(9_148_0_00);
348-
public static final TransportVersion RESOLVE_INDEX_MODE_FILTER = def(9_149_0_00);
349-
public static final TransportVersion SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS = def(9_150_0_00);
350-
public static final TransportVersion ESQL_LOOKUP_JOIN_PRE_JOIN_FILTER = def(9_151_0_00);
351-
public static final TransportVersion INFERENCE_API_DISABLE_EIS_RATE_LIMITING = def(9_152_0_00);
352-
public static final TransportVersion GEMINI_THINKING_BUDGET_ADDED = def(9_153_0_00);
353-
public static final TransportVersion VISIT_PERCENTAGE = def(9_154_0_00);
354346
public static final TransportVersion TIME_SERIES_TELEMETRY = def(9_155_0_00);
355347
public static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = def(9_156_0_00);
356348

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.action.admin.indices.resolve;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.ActionListener;
1514
import org.elasticsearch.action.ActionRequestValidationException;
1615
import org.elasticsearch.action.ActionResponse;
@@ -78,6 +77,7 @@ public class ResolveIndexAction extends ActionType<ResolveIndexAction.Response>
7877
public static final RemoteClusterActionType<Response> REMOTE_TYPE = new RemoteClusterActionType<>(NAME, Response::new);
7978

8079
private static final TransportVersion RESOLVE_INDEX_MODE_ADDED = TransportVersion.fromName("resolve_index_mode_added");
80+
private static final TransportVersion RESOLVE_INDEX_MODE_FILTER = TransportVersion.fromName("resolve_index_mode_filter");
8181

8282
private ResolveIndexAction() {
8383
super(NAME);
@@ -117,7 +117,7 @@ public Request(StreamInput in) throws IOException {
117117
super(in);
118118
this.names = in.readStringArray();
119119
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
120-
if (in.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_FILTER)) {
120+
if (in.getTransportVersion().supports(RESOLVE_INDEX_MODE_FILTER)) {
121121
this.indexModes = in.readEnumSet(IndexMode.class);
122122
} else {
123123
this.indexModes = EnumSet.noneOf(IndexMode.class);
@@ -129,7 +129,7 @@ public void writeTo(StreamOutput out) throws IOException {
129129
super.writeTo(out);
130130
out.writeStringArray(names);
131131
indicesOptions.writeIndicesOptions(out);
132-
if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_FILTER)) {
132+
if (out.getTransportVersion().supports(RESOLVE_INDEX_MODE_FILTER)) {
133133
out.writeEnumSet(indexModes);
134134
}
135135
}

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

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

1212
import org.apache.lucene.util.Accountable;
1313
import org.apache.lucene.util.RamUsageEstimator;
14+
import org.elasticsearch.TransportVersion;
1415
import org.elasticsearch.TransportVersions;
1516
import org.elasticsearch.action.ActionRequest;
1617
import org.elasticsearch.action.ActionRequestValidationException;
@@ -65,6 +66,10 @@ public class BulkRequest extends LegacyActionRequest
6566
Accountable,
6667
RawIndexingDataTransportRequest {
6768

69+
private static final TransportVersion STREAMS_ENDPOINT_PARAM_RESTRICTIONS = TransportVersion.fromName(
70+
"streams_endpoint_param_restrictions"
71+
);
72+
6873
private static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(BulkRequest.class);
6974

7075
private static final int REQUEST_OVERHEAD = 50;
@@ -110,7 +115,7 @@ public BulkRequest(StreamInput in) throws IOException {
110115
if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
111116
includeSourceOnError = in.readBoolean();
112117
} // else default value is true
113-
if (in.getTransportVersion().onOrAfter(TransportVersions.STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
118+
if (in.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
114119
paramsUsed = in.readCollectionAsImmutableSet(StreamInput::readString);
115120
}
116121
}
@@ -479,7 +484,7 @@ public void writeTo(StreamOutput out) throws IOException {
479484
if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
480485
out.writeBoolean(includeSourceOnError);
481486
}
482-
if (out.getTransportVersion().onOrAfter(TransportVersions.STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
487+
if (out.getTransportVersion().supports(STREAMS_ENDPOINT_PARAM_RESTRICTIONS)) {
483488
out.writeCollection(paramsUsed, StreamOutput::writeString);
484489
}
485490
}

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

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

1212
import org.apache.lucene.util.CollectionUtil;
13+
import org.elasticsearch.TransportVersion;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.cluster.Diff;
1516
import org.elasticsearch.cluster.Diffable;
@@ -87,6 +88,10 @@ public class ProjectMetadata implements Iterable<IndexMetadata>, Diffable<Projec
8788
private static final NamedDiffableValueSerializer<Metadata.ProjectCustom> PROJECT_CUSTOM_VALUE_SERIALIZER =
8889
new NamedDiffableValueSerializer<>(Metadata.ProjectCustom.class);
8990

91+
private static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = TransportVersion.fromName(
92+
"project_reserved_state_move_to_registry"
93+
);
94+
9095
private final ProjectId id;
9196

9297
private final ImmutableOpenMap<String, IndexMetadata> indices;
@@ -2171,7 +2176,7 @@ public static ProjectMetadata readFrom(StreamInput in) throws IOException {
21712176

21722177
readProjectCustoms(in, builder);
21732178

2174-
if (in.getTransportVersion().before(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
2179+
if (in.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY) == false) {
21752180
int reservedStateSize = in.readVInt();
21762181
for (int i = 0; i < reservedStateSize; i++) {
21772182
ReservedStateMetadata.readFrom(in);
@@ -2212,7 +2217,7 @@ public void writeTo(StreamOutput out) throws IOException {
22122217
}
22132218
out.writeCollection(templates.values());
22142219
VersionedNamedWriteable.writeVersionedWriteables(out, customs.values());
2215-
if (out.getTransportVersion().before(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
2220+
if (out.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY) == false) {
22162221
out.writeCollection(Collections.emptySet());
22172222
}
22182223

@@ -2265,7 +2270,7 @@ private ProjectMetadataDiff(ProjectMetadata before, ProjectMetadata after) {
22652270
indices = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), INDEX_METADATA_DIFF_VALUE_READER);
22662271
templates = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), TEMPLATES_DIFF_VALUE_READER);
22672272
customs = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), PROJECT_CUSTOM_VALUE_SERIALIZER);
2268-
if (in.getTransportVersion().before(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
2273+
if (in.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY) == false) {
22692274
DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), RESERVED_DIFF_VALUE_READER);
22702275
}
22712276
if (in.getTransportVersion()
@@ -2291,7 +2296,7 @@ public void writeTo(StreamOutput out) throws IOException {
22912296
indices.writeTo(out);
22922297
templates.writeTo(out);
22932298
customs.writeTo(out);
2294-
if (out.getTransportVersion().before(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
2299+
if (out.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY) == false) {
22952300
DiffableUtils.emptyDiff().writeTo(out);
22962301
}
22972302
if (out.getTransportVersion()

‎server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<Custom> implemen
5151
public static final ProjectStateRegistry EMPTY = new ProjectStateRegistry(Collections.emptyMap(), Collections.emptySet(), 0);
5252
private static final Entry EMPTY_ENTRY = new Entry(Settings.EMPTY, ImmutableOpenMap.of());
5353

54+
private static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = TransportVersion.fromName(
55+
"project_reserved_state_move_to_registry"
56+
);
57+
5458
public static final DiffableUtils.DiffableValueReader<String, ReservedStateMetadata> RESERVED_DIFF_VALUE_READER =
5559
new DiffableUtils.DiffableValueReader<>(ReservedStateMetadata::readFrom, ReservedStateMetadata::readDiffFrom);
5660

@@ -377,7 +381,7 @@ public static Entry readFrom(StreamInput in) throws IOException {
377381
Settings settings = Settings.readSettingsFromStream(in);
378382

379383
ImmutableOpenMap<String, ReservedStateMetadata> reservedStateMetadata;
380-
if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
384+
if (in.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
381385
int reservedStateSize = in.readVInt();
382386
ImmutableOpenMap.Builder<String, ReservedStateMetadata> builder = ImmutableOpenMap.builder(reservedStateSize);
383387
for (int i = 0; i < reservedStateSize; i++) {
@@ -406,7 +410,7 @@ public Entry withReservedStateMetadata(ReservedStateMetadata reservedStateMetada
406410
@Override
407411
public void writeTo(StreamOutput out) throws IOException {
408412
out.writeWriteable(settings);
409-
if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
413+
if (out.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
410414
out.writeCollection(reservedStateMetadata.values());
411415
}
412416
}
@@ -446,7 +450,7 @@ public static EntryDiff readFrom(StreamInput in) throws IOException {
446450
Diff<Settings> settingsDiff = Settings.readSettingsDiffFromStream(in);
447451

448452
DiffableUtils.MapDiff<String, ReservedStateMetadata, ImmutableOpenMap<String, ReservedStateMetadata>> reservedStateMetadata;
449-
if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
453+
if (in.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
450454
reservedStateMetadata = DiffableUtils.readImmutableOpenMapDiff(
451455
in,
452456
DiffableUtils.getStringKeySerializer(),
@@ -467,7 +471,7 @@ public Entry apply(Entry part) {
467471
@Override
468472
public void writeTo(StreamOutput out) throws IOException {
469473
out.writeWriteable(settingsDiff);
470-
if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
474+
if (out.getTransportVersion().supports(PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
471475
reservedStateMetadata.writeTo(out);
472476
}
473477
}

‎server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java‎

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

1212
import org.apache.lucene.util.SetOnce;
13+
import org.elasticsearch.TransportVersion;
1314
import org.elasticsearch.TransportVersions;
1415
import org.elasticsearch.common.io.stream.StreamInput;
1516
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -128,6 +129,8 @@ public static KnnSearchBuilder.Builder fromXContent(XContentParser parser) throw
128129
return PARSER.parse(parser, null);
129130
}
130131

132+
private static final TransportVersion VISIT_PERCENTAGE = TransportVersion.fromName("visit_percentage");
133+
131134
final String field;
132135
final VectorData queryVector;
133136
final QueryVectorBuilder queryVectorBuilder;
@@ -337,7 +340,7 @@ public KnnSearchBuilder(StreamInput in) throws IOException {
337340
this.field = in.readString();
338341
this.k = in.readVInt();
339342
this.numCands = in.readVInt();
340-
if (in.getTransportVersion().onOrAfter(TransportVersions.VISIT_PERCENTAGE)) {
343+
if (in.getTransportVersion().supports(VISIT_PERCENTAGE)) {
341344
this.visitPercentage = in.readOptionalFloat();
342345
} else {
343346
this.visitPercentage = null;
@@ -610,7 +613,7 @@ public void writeTo(StreamOutput out) throws IOException {
610613
out.writeString(field);
611614
out.writeVInt(k);
612615
out.writeVInt(numCands);
613-
if (out.getTransportVersion().onOrAfter(TransportVersions.VISIT_PERCENTAGE)) {
616+
if (out.getTransportVersion().supports(VISIT_PERCENTAGE)) {
614617
out.writeOptionalFloat(visitPercentage);
615618
}
616619
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {

‎server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ public static KnnVectorQueryBuilder fromXContent(XContentParser parser) {
138138
return PARSER.apply(parser, null);
139139
}
140140

141+
private static final TransportVersion VISIT_PERCENTAGE = TransportVersion.fromName("visit_percentage");
142+
141143
private final String fieldName;
142144
private final VectorData queryVector;
143145
private final Integer k;
@@ -282,7 +284,7 @@ public KnnVectorQueryBuilder(StreamInput in) throws IOException {
282284
} else {
283285
this.numCands = in.readVInt();
284286
}
285-
if (in.getTransportVersion().onOrAfter(TransportVersions.VISIT_PERCENTAGE)) {
287+
if (in.getTransportVersion().supports(VISIT_PERCENTAGE)) {
286288
this.visitPercentage = in.readOptionalFloat();
287289
} else {
288290
this.visitPercentage = null;
@@ -396,7 +398,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
396398
out.writeVInt(numCands);
397399
}
398400
}
399-
if (out.getTransportVersion().onOrAfter(TransportVersions.VISIT_PERCENTAGE)) {
401+
if (out.getTransportVersion().supports(VISIT_PERCENTAGE)) {
400402
out.writeOptionalFloat(visitPercentage);
401403
}
402404
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {

‎server/src/main/resources/transport/definitions/referable/esql_lookup_join_pre_join_filter.csv‎

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

‎server/src/main/resources/transport/definitions/referable/gemini_thinking_budget_added.csv‎

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

‎server/src/main/resources/transport/definitions/referable/inference_api_disable_eis_rate_limiting.csv‎

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

0 commit comments

Comments
 (0)