Skip to content

Commit 0699e77

Browse files
authored
Migrate transport versions 9115_000, 9114_000, 9113_000 (#134570)
ES-12334
1 parent f6547d6 commit 0699e77

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,6 @@ static TransportVersion def(int id) {
322322
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
323323
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
324324
public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
325-
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
326-
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
327-
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = def(9_115_0_00);
328325
public static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = def(9_156_0_00);
329326
public static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = def(9_157_0_00);
330327

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ 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_STATE_REGISTRY_RECORDS_DELETIONS = TransportVersion.fromName(
55+
"project_state_registry_records_deletions"
56+
);
5457
private static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = TransportVersion.fromName("project_state_registry_entry");
5558
private static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = TransportVersion.fromName(
5659
"project_reserved_state_move_to_registry"
@@ -78,7 +81,7 @@ public ProjectStateRegistry(StreamInput in) throws IOException {
7881
.stream()
7982
.collect(Collectors.toMap(Map.Entry::getKey, e -> new Entry(e.getValue(), ImmutableOpenMap.of())));
8083
}
81-
if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
84+
if (in.getTransportVersion().supports(PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
8285
projectsMarkedForDeletion = in.readCollectionAsImmutableSet(ProjectId::readFrom);
8386
projectsMarkedForDeletionGeneration = in.readVLong();
8487
} else {
@@ -186,7 +189,7 @@ public void writeTo(StreamOutput out) throws IOException {
186189
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().settings()));
187190
out.writeMap(settingsMap);
188191
}
189-
if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
192+
if (out.getTransportVersion().supports(PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
190193
out.writeCollection(projectsMarkedForDeletion);
191194
out.writeVLong(projectsMarkedForDeletionGeneration);
192195
} else {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9114000
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9115000
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9113000

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/EsField.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.elasticsearch.xpack.esql.core.type;
88

9+
import org.elasticsearch.TransportVersion;
910
import org.elasticsearch.TransportVersions;
1011
import org.elasticsearch.action.fieldcaps.IndexFieldCapabilities;
1112
import org.elasticsearch.common.io.stream.StreamInput;
@@ -27,6 +28,10 @@
2728
*/
2829
public class EsField implements Writeable {
2930

31+
private static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = TransportVersion.fromName(
32+
"esql_serialize_timeseries_field_type"
33+
);
34+
3035
/**
3136
* Fields in a TSDB can be either dimensions or metrics. This enum provides a way to store, serialize, and operate on those field
3237
* roles within the ESQL query processing pipeline.
@@ -200,13 +205,13 @@ public void writeContent(StreamOutput out) throws IOException {
200205
}
201206

202207
protected void writeTimeSeriesFieldType(StreamOutput out) throws IOException {
203-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
208+
if (out.getTransportVersion().supports(ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
204209
this.timeSeriesFieldType.writeTo(out);
205210
}
206211
}
207212

208213
protected static TimeSeriesFieldType readTimeSeriesFieldType(StreamInput in) throws IOException {
209-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
214+
if (in.getTransportVersion().supports(ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
210215
return TimeSeriesFieldType.readFromStream(in);
211216
} else {
212217
return TimeSeriesFieldType.UNKNOWN;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ibmwatsonx/completion/IbmWatsonxChatCompletionServiceSettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.inference.services.ibmwatsonx.completion;
99

1010
import org.elasticsearch.TransportVersion;
11-
import org.elasticsearch.TransportVersions;
1211
import org.elasticsearch.common.ValidationException;
1312
import org.elasticsearch.common.io.stream.StreamInput;
1413
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -40,6 +39,9 @@ public class IbmWatsonxChatCompletionServiceSettings extends FilteredXContentObj
4039
ServiceSettings,
4140
IbmWatsonxRateLimitServiceSettings {
4241
public static final String NAME = "ibm_watsonx_completion_service_settings";
42+
private static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = TransportVersion.fromName(
43+
"ml_inference_ibm_watsonx_completion_added"
44+
);
4345

4446
/**
4547
* Rate limits are defined at
@@ -160,7 +162,7 @@ protected XContentBuilder toXContentFragmentOfExposedFields(XContentBuilder buil
160162

161163
@Override
162164
public TransportVersion getMinimalSupportedVersion() {
163-
return TransportVersions.ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED;
165+
return ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED;
164166
}
165167

166168
@Override

0 commit comments

Comments
 (0)