Migrate tranport versions 9155_000, 9118_000, and 9117_000 (#134499)

jdconrad · web-flow · commit f7f8045a958b · 2025-09-10T14:01:51.000-07:00
ES-12334
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -328,9 +328,6 @@ static TransportVersion def(int id) {
     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 ESQL_SPLIT_ON_BIG_VALUES = def(9_116_0_00);
-    public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00);
-    public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = def(9_118_0_00);
-    public static final TransportVersion TIME_SERIES_TELEMETRY = def(9_155_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);
 
diff --git a/server/src/main/resources/transport/definitions/referable/esql_local_relation_with_new_blocks.csv b/server/src/main/resources/transport/definitions/referable/esql_local_relation_with_new_blocks.csv
@@ -0,0 +1 @@
+9117000
diff --git a/server/src/main/resources/transport/definitions/referable/ml_inference_custom_service_embedding_type.csv b/server/src/main/resources/transport/definitions/referable/ml_inference_custom_service_embedding_type.csv
@@ -0,0 +1 @@
+9118000
diff --git a/server/src/main/resources/transport/definitions/referable/time_series_telemetry.csv b/server/src/main/resources/transport/definitions/referable/time_series_telemetry.csv
@@ -0,0 +1 @@
+9155000
diff --git a/server/src/main/resources/transport/upper_bounds/9.2.csv b/server/src/main/resources/transport/upper_bounds/9.2.csv
@@ -1 +1 @@
-visit_percentage,9154000
+time_series_telemetry,9155000
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/TimeSeriesFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/TimeSeriesFeatureSetUsage.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.core.datastreams;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -71,6 +70,8 @@
  */
 public class TimeSeriesFeatureSetUsage extends XPackFeatureUsage {
 
+    private static final TransportVersion TIME_SERIES_TELEMETRY = TransportVersion.fromName("time_series_telemetry");
+
     private final long timeSeriesDataStreamCount;
     private final long timeSeriesIndexCount;
     private final DownsamplingUsage downsamplingUsage;
@@ -138,7 +139,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.TIME_SERIES_TELEMETRY;
+        return TIME_SERIES_TELEMETRY;
     }
 
     public long getTimeSeriesDataStreamCount() {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalRelation.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalRelation.java
@@ -6,7 +6,7 @@
  */
 package org.elasticsearch.xpack.esql.plan.logical.local;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -29,6 +29,10 @@ public class LocalRelation extends LeafPlan {
         LocalRelation::new
     );
 
+    private static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = TransportVersion.fromName(
+        "esql_local_relation_with_new_blocks"
+    );
+
     private final List<Attribute> output;
     private final LocalSupplier supplier;
 
@@ -41,7 +45,7 @@ public LocalRelation(Source source, List<Attribute> output, LocalSupplier suppli
     public LocalRelation(StreamInput in) throws IOException {
         super(Source.readFrom((PlanStreamInput) in));
         this.output = in.readNamedWriteableCollectionAsList(Attribute.class);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (in.getTransportVersion().supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             this.supplier = in.readNamedWriteable(LocalSupplier.class);
         } else {
             this.supplier = LocalSourceExec.readLegacyLocalSupplierFrom((PlanStreamInput) in);
@@ -52,7 +56,7 @@ public LocalRelation(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         source().writeTo(out);
         out.writeNamedWriteableCollection(output);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (out.getTransportVersion().supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             out.writeNamedWriteable(supplier);
         } else {
             if (hasEmptySupplier()) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/LocalSourceExec.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/LocalSourceExec.java
@@ -7,7 +7,7 @@
 
 package org.elasticsearch.xpack.esql.plan.physical;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -31,6 +31,10 @@ public class LocalSourceExec extends LeafExec {
         LocalSourceExec::new
     );
 
+    private static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = TransportVersion.fromName(
+        "esql_local_relation_with_new_blocks"
+    );
+
     private final List<Attribute> output;
     private final LocalSupplier supplier;
 
@@ -43,7 +47,7 @@ public LocalSourceExec(Source source, List<Attribute> output, LocalSupplier supp
     public LocalSourceExec(StreamInput in) throws IOException {
         super(Source.readFrom((PlanStreamInput) in));
         this.output = in.readNamedWriteableCollectionAsList(Attribute.class);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (in.getTransportVersion().supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             this.supplier = in.readNamedWriteable(LocalSupplier.class);
         } else {
             this.supplier = readLegacyLocalSupplierFrom((PlanStreamInput) in);
@@ -67,7 +71,7 @@ public static LocalSupplier readLegacyLocalSupplierFrom(PlanStreamInput in) thro
     public void writeTo(StreamOutput out) throws IOException {
         source().writeTo(out);
         out.writeNamedWriteableCollection(output);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (out.getTransportVersion().supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             out.writeNamedWriteable(supplier);
         } else {
             if (supplier == EmptyLocalSupplier.EMPTY) {
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/CopyingLocalSupplierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/CopyingLocalSupplierTests.java
@@ -8,13 +8,16 @@
 package org.elasticsearch.xpack.esql.plan.logical.local;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.compute.data.Block;
 
 import static org.hamcrest.Matchers.equalTo;
 
 public class CopyingLocalSupplierTests extends LocalSupplierTests {
 
+    private static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = TransportVersion.fromName(
+        "esql_local_relation_with_new_blocks"
+    );
+
     @Override
     protected LocalSupplier createTestInstance() {
         Block[] blocks = randomList(1, 10, LocalSupplierTests::randomBlock).toArray(Block[]::new);
@@ -23,7 +26,7 @@ protected LocalSupplier createTestInstance() {
 
     protected void assertOnBWCObject(LocalSupplier testInstance, LocalSupplier bwcDeserializedObject, TransportVersion version) {
         assertNotSame(version.toString(), bwcDeserializedObject, testInstance);
-        if (version.onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (version.supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             assertThat(testInstance, equalTo(bwcDeserializedObject));
         } else {
             assertTrue(version.toString(), bwcDeserializedObject instanceof ImmediateLocalSupplier);
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/EmptyLocalSupplierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/EmptyLocalSupplierTests.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.esql.plan.logical.local;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.xpack.esql.io.stream.PlanStreamOutput;
 
@@ -18,6 +17,10 @@
 
 public class EmptyLocalSupplierTests extends LocalSupplierTests {
 
+    private static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = TransportVersion.fromName(
+        "esql_local_relation_with_new_blocks"
+    );
+
     @Override
     protected LocalSupplier createTestInstance() {
         return EmptyLocalSupplier.EMPTY;
@@ -31,7 +34,7 @@ protected void assertOnBWCObject(LocalSupplier testInstance, LocalSupplier bwcDe
 
     @Override
     protected void writeTo(BytesStreamOutput output, LocalSupplier instance, TransportVersion version) throws IOException {
-        if (version.onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (version.supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             new PlanStreamOutput(output, null).writeNamedWriteable(instance);
         } else {
             output.writeVInt(0);
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplierTests.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.esql.plan.logical.local;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.breaker.NoopCircuitBreaker;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -31,6 +30,9 @@
 public abstract class LocalSupplierTests extends AbstractWireTestCase<LocalSupplier> {
 
     private static final NavigableSet<TransportVersion> DEFAULT_BWC_VERSIONS = getAllBWCVersions();
+    private static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = TransportVersion.fromName(
+        "esql_local_relation_with_new_blocks"
+    );
 
     private static final BlockFactory BLOCK_FACTORY = BlockFactory.getInstance(
         new NoopCircuitBreaker("noop-esql-breaker"),
@@ -70,15 +72,15 @@ protected LocalSupplier copyInstance(LocalSupplier instance, TransportVersion ve
     }
 
     protected void writeTo(BytesStreamOutput output, LocalSupplier instance, TransportVersion version) throws IOException {
-        if (version.onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (version.supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             new PlanStreamOutput(output, null).writeNamedWriteable(instance);
         } else {
             instance.writeTo(new PlanStreamOutput(output, null));
         }
     }
 
     protected LocalSupplier readFrom(StreamInput input, TransportVersion version) throws IOException {
-        if (version.onOrAfter(TransportVersions.ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
+        if (version.supports(ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS)) {
             return new PlanStreamInput(input, getNamedWriteableRegistry(), null).readNamedWriteable(LocalSupplier.class);
         } else {
             return LocalSourceExec.readLegacyLocalSupplierFrom(new PlanStreamInput(input, getNamedWriteableRegistry(), null));
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettings.java
@@ -139,6 +139,10 @@ public static class TextEmbeddingSettings implements ToXContentFragment, Writeab
         // This refers to settings that are not related to the text embedding task type (all the settings should be null)
         public static final TextEmbeddingSettings NON_TEXT_EMBEDDING_TASK_TYPE_SETTINGS = new TextEmbeddingSettings(null, null, null);
 
+        private static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = TransportVersion.fromName(
+            "ml_inference_custom_service_embedding_type"
+        );
+
         public static TextEmbeddingSettings fromMap(Map<String, Object> map, TaskType taskType, ValidationException validationException) {
             if (taskType != TaskType.TEXT_EMBEDDING) {
                 return NON_TEXT_EMBEDDING_TASK_TYPE_SETTINGS;
@@ -169,7 +173,7 @@ public TextEmbeddingSettings(StreamInput in) throws IOException {
             this.dimensions = in.readOptionalVInt();
             this.maxInputTokens = in.readOptionalVInt();
 
-            if (in.getTransportVersion().before(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
+            if (in.getTransportVersion().supports(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE) == false) {
                 in.readOptionalEnum(DenseVectorFieldMapper.ElementType.class);
             }
         }
@@ -180,7 +184,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeOptionalVInt(dimensions);
             out.writeOptionalVInt(maxInputTokens);
 
-            if (out.getTransportVersion().before(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
+            if (out.getTransportVersion().supports(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE) == false) {
                 out.writeOptionalEnum(null);
             }
         }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/TextEmbeddingResponseParser.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/TextEmbeddingResponseParser.java
@@ -7,7 +7,7 @@
 
 package org.elasticsearch.xpack.inference.services.custom.response;
 
-import org.elasticsearch.TransportVersions;
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -37,6 +37,10 @@ public class TextEmbeddingResponseParser extends BaseCustomResponseParser {
     public static final String TEXT_EMBEDDING_PARSER_EMBEDDINGS = "text_embeddings";
     public static final String EMBEDDING_TYPE = "embedding_type";
 
+    private static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = TransportVersion.fromName(
+        "ml_inference_custom_service_embedding_type"
+    );
+
     public static TextEmbeddingResponseParser fromMap(
         Map<String, Object> responseParserMap,
         String scope,
@@ -79,7 +83,7 @@ public TextEmbeddingResponseParser(String textEmbeddingsPath, CustomServiceEmbed
 
     public TextEmbeddingResponseParser(StreamInput in) throws IOException {
         this.textEmbeddingsPath = in.readString();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
+        if (in.getTransportVersion().supports(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
             this.embeddingType = in.readEnum(CustomServiceEmbeddingType.class);
         } else {
             this.embeddingType = CustomServiceEmbeddingType.FLOAT;
@@ -89,7 +93,7 @@ public TextEmbeddingResponseParser(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(textEmbeddingsPath);
 
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
+        if (out.getTransportVersion().supports(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
             out.writeEnum(embeddingType);
         }
     }
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/custom/response/TextEmbeddingResponseParserTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/custom/response/TextEmbeddingResponseParserTests.java
@@ -29,14 +29,17 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.TransportVersions.ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE;
 import static org.elasticsearch.xpack.inference.services.custom.response.TextEmbeddingResponseParser.EMBEDDING_TYPE;
 import static org.elasticsearch.xpack.inference.services.custom.response.TextEmbeddingResponseParser.TEXT_EMBEDDING_PARSER_EMBEDDINGS;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.mock;
 
 public class TextEmbeddingResponseParserTests extends AbstractBWCWireSerializationTestCase<TextEmbeddingResponseParser> {
 
+    private static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = TransportVersion.fromName(
+        "ml_inference_custom_service_embedding_type"
+    );
+
     public static TextEmbeddingResponseParser createRandom() {
         return new TextEmbeddingResponseParser("$." + randomAlphaOfLength(5), randomFrom(CustomServiceEmbeddingType.values()));
     }
@@ -317,7 +320,7 @@ public void testParse_ThrowsException_WhenExtractedField_IsNotAList() {
 
     @Override
     protected TextEmbeddingResponseParser mutateInstanceForVersion(TextEmbeddingResponseParser instance, TransportVersion version) {
-        if (version.before(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE)) {
+        if (version.supports(ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE) == false) {
             return new TextEmbeddingResponseParser(instance.getTextEmbeddingsPath(), CustomServiceEmbeddingType.FLOAT);
         }
         return instance;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-visit_percentage,9154000`
	`1`	`+time_series_telemetry,9155000`