Explorar o código

Migrate transport versions 9115_000, 9114_000, 9113_000 (#134570)

ES-12334
Jack Conradson hai 1 mes
pai
achega
0699e77a59

+ 0 - 3
server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -322,9 +322,6 @@ public class TransportVersions {
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
     public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
     public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
-    public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
-    public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
-    public static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = def(9_115_0_00);
     public static final TransportVersion INFERENCE_API_EIS_DIAGNOSTICS = def(9_156_0_00);
     public static final TransportVersion ML_INFERENCE_ENDPOINT_CACHE = def(9_157_0_00);
 

+ 5 - 2
server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

@@ -51,6 +51,9 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<Custom> implemen
     public static final ProjectStateRegistry EMPTY = new ProjectStateRegistry(Collections.emptyMap(), Collections.emptySet(), 0);
     private static final Entry EMPTY_ENTRY = new Entry(Settings.EMPTY, ImmutableOpenMap.of());
 
+    private static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = TransportVersion.fromName(
+        "project_state_registry_records_deletions"
+    );
     private static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = TransportVersion.fromName("project_state_registry_entry");
     private static final TransportVersion PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY = TransportVersion.fromName(
         "project_reserved_state_move_to_registry"
@@ -78,7 +81,7 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<Custom> implemen
                 .stream()
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> new Entry(e.getValue(), ImmutableOpenMap.of())));
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
+        if (in.getTransportVersion().supports(PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
             projectsMarkedForDeletion = in.readCollectionAsImmutableSet(ProjectId::readFrom);
             projectsMarkedForDeletionGeneration = in.readVLong();
         } else {
@@ -186,7 +189,7 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<Custom> implemen
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().settings()));
             out.writeMap(settingsMap);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
+        if (out.getTransportVersion().supports(PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
             out.writeCollection(projectsMarkedForDeletion);
             out.writeVLong(projectsMarkedForDeletionGeneration);
         } else {

+ 1 - 0
server/src/main/resources/transport/definitions/referable/esql_serialize_timeseries_field_type.csv

@@ -0,0 +1 @@
+9114000

+ 1 - 0
server/src/main/resources/transport/definitions/referable/ml_inference_ibm_watsonx_completion_added.csv

@@ -0,0 +1 @@
+9115000

+ 1 - 0
server/src/main/resources/transport/definitions/referable/project_state_registry_records_deletions.csv

@@ -0,0 +1 @@
+9113000

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

@@ -6,6 +6,7 @@
  */
 package org.elasticsearch.xpack.esql.core.type;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.fieldcaps.IndexFieldCapabilities;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -27,6 +28,10 @@ import static org.elasticsearch.xpack.esql.core.util.PlanStreamOutput.writeCache
  */
 public class EsField implements Writeable {
 
+    private static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = TransportVersion.fromName(
+        "esql_serialize_timeseries_field_type"
+    );
+
     /**
      * Fields in a TSDB can be either dimensions or metrics.  This enum provides a way to store, serialize, and operate on those field
      * roles within the ESQL query processing pipeline.
@@ -200,13 +205,13 @@ public class EsField implements Writeable {
     }
 
     protected void writeTimeSeriesFieldType(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
+        if (out.getTransportVersion().supports(ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
             this.timeSeriesFieldType.writeTo(out);
         }
     }
 
     protected static TimeSeriesFieldType readTimeSeriesFieldType(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
+        if (in.getTransportVersion().supports(ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE)) {
             return TimeSeriesFieldType.readFromStream(in);
         } else {
             return TimeSeriesFieldType.UNKNOWN;

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

@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.inference.services.ibmwatsonx.completion;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -40,6 +39,9 @@ public class IbmWatsonxChatCompletionServiceSettings extends FilteredXContentObj
         ServiceSettings,
         IbmWatsonxRateLimitServiceSettings {
     public static final String NAME = "ibm_watsonx_completion_service_settings";
+    private static final TransportVersion ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED = TransportVersion.fromName(
+        "ml_inference_ibm_watsonx_completion_added"
+    );
 
     /**
      * Rate limits are defined at
@@ -160,7 +162,7 @@ public class IbmWatsonxChatCompletionServiceSettings extends FilteredXContentObj
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED;
+        return ML_INFERENCE_IBM_WATSONX_COMPLETION_ADDED;
     }
 
     @Override