name fixes

Author: jdconrad

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

@@ -258,7 +258,7 @@ public boolean supports(TransportVersion version) {
         }
         TransportVersion nextPatchVersion = version.nextPatchVersion;
         while (nextPatchVersion != null) {
-            if (isPatchFrom(version)) {
+            if (isPatchFrom(nextPatchVersion)) {
                 return true;
             }
             nextPatchVersion = nextPatchVersion.nextPatchVersion;

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

@@ -338,11 +338,12 @@ static TransportVersion def(int id) {
     public static final TransportVersion LOOKUP_JOIN_CCS = def(9_120_0_00);
     public static final TransportVersion NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = def(9_121_0_00);
     public static final TransportVersion ESQL_CATEGORIZE_OPTIONS = def(9_122_0_00);
+    public static final TransportVersion ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED = def(9_123_0_00);
     public static final TransportVersion PROJECT_STATE_REGISTRY_ENTRY = def(9_124_0_00);
     public static final TransportVersion ML_INFERENCE_LLAMA_ADDED = def(9_125_0_00);
     public static final TransportVersion SHARD_WRITE_LOAD_IN_CLUSTER_INFO = def(9_126_0_00);
     public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS = def(9_127_0_00);
-
+    public static final TransportVersion ESQL_TOPN_TIMINGS = def(9_128_0_00);
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

server/src/main/resources/transport/generated/generated-transport-versions-files-manifest.txt

@@ -1,3 +1 @@
 esql-split-on-big-values.json
-ml-inference-azure-ai-studio-rerank-added.json
-esql-topn-timings.json

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java

@@ -20,13 +20,15 @@
 import java.io.IOException;
 import java.util.Objects;
 
+import static org.elasticsearch.TransportVersions.ESQL_TOPN_TIMINGS;
+
 public class TopNOperatorStatus implements Operator.Status {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Operator.Status.class,
         "topn",
         TopNOperatorStatus::new
     );
-    public static final TransportVersion ESQL_TOPN_TIMINGS = TransportVersion.fromName("esql-topn-timings");
+    //public static final TransportVersion ESQL_TOPN_TIMINGS = TransportVersion.fromName("esql-topn-timings");
     private final long receiveNanos;
     private final long emitNanos;
     private final int occupiedRows;
@@ -57,7 +59,7 @@ public TopNOperatorStatus(
     }
 
     TopNOperatorStatus(StreamInput in) throws IOException {
-        if (in.getTransportVersion().supports(ESQL_TOPN_TIMINGS)) {
+        if (in.getTransportVersion().onOrAfter(ESQL_TOPN_TIMINGS)) {
             this.receiveNanos = in.readVLong();
             this.emitNanos = in.readVLong();
         } else {
@@ -82,7 +84,7 @@ public TopNOperatorStatus(
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().supports(ESQL_TOPN_TIMINGS)) {
+        if (out.getTransportVersion().onOrAfter(ESQL_TOPN_TIMINGS)) {
             out.writeVLong(receiveNanos);
             out.writeVLong(emitNanos);
         }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankServiceSettings.java

@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.inference.services.azureaistudio.rerank;
 
 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;
@@ -79,7 +80,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added");
+        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;//TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added");
     }
 
     @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankTaskSettings.java

@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.inference.services.azureaistudio.rerank;
 
 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;
@@ -93,7 +94,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added");
+        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;//TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added");
     }
 
     @Override