move examples to tests

jdconrad · jdconrad · commit 76e3f0d5fbdf · 2025-07-22T12:10:40.000-07:00
diff --git a/server/src/main/java/org/elasticsearch/TransportVersion.java b/server/src/main/java/org/elasticsearch/TransportVersion.java
@@ -69,33 +69,7 @@
  * different version value. If you need to know whether the cluster as a whole speaks a new enough {@link TransportVersion} to understand a
  * newly-added feature, use {@link org.elasticsearch.cluster.ClusterState#getMinTransportVersion}.
  */
-public class TransportVersion implements VersionId<TransportVersion> {
-
-    private final String name;
-    private final int id;
-    private final TransportVersion nextPatchVersion;
-
-    public TransportVersion(int id) {
-        this(null, id, null);
-    }
-
-    public TransportVersion(String name, int id, TransportVersion patchVersion) {
-        this.name = name;
-        this.id = id;
-        this.nextPatchVersion = patchVersion;
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public int id() {
-        return id;
-    }
-
-    public TransportVersion nextPatchVersion() {
-        return nextPatchVersion;
-    }
+public record TransportVersion(String name, int id, TransportVersion nextPatchVersion) implements VersionId<TransportVersion> {
 
     private static final ParseField NAME = new ParseField("name");
     private static final ParseField IDS = new ParseField("ids");
@@ -288,7 +262,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "" + id;
+        return Integer.toString(id);
     }
 
     private static class VersionsHolder {
@@ -332,38 +306,56 @@ private static class VersionsHolder {
         private static Map<String, TransportVersion> loadTransportVersionsByName() {
             Map<String, TransportVersion> transportVersions = new HashMap<>();
 
-            String latestLocation = "/transport/latest/" + Version.CURRENT.major + "." + Version.CURRENT.minor + "-LATEST.json";
-            int latestId;
+            String latestLocation = "/transport/latest/" + Version.CURRENT.major + "." + Version.CURRENT.minor + ".json";
+            int latestId = -1;
             try (InputStream inputStream = TransportVersion.class.getResourceAsStream(latestLocation)) {
-                TransportVersion latest = fromXContent(inputStream, Integer.MAX_VALUE);
-                if (latest == null) {
-                    throw new IllegalStateException(
-                        "invalid latest transport version for release version [" + Version.CURRENT.major + "." + Version.CURRENT.minor + "]"
-                    );
+                // this check is required until bootstrapping for the new transport versions format is completed;
+                // when load is false, we will only use the transport versions in the legacy format;
+                // load becomes false if we don't find the latest or manifest files required for the new format
+                if (inputStream != null) {
+                    TransportVersion latest = fromXContent(inputStream, Integer.MAX_VALUE);
+                    if (latest == null) {
+                        throw new IllegalStateException(
+                            "invalid latest transport version for release version ["
+                                + Version.CURRENT.major
+                                + "."
+                                + Version.CURRENT.minor
+                                + "]"
+                        );
+                    }
+                    latestId = latest.id();
                 }
-                latestId = latest.id();
             } catch (IOException ioe) {
                 throw new UncheckedIOException("latest transport version file not found at [" + latestLocation + "]", ioe);
             }
 
-            String manifestLocation = "/transport/generated/generated-transport-versions-files-manifest.txt";
-            List<String> versionFileNames;
-            try (InputStream transportVersionsManifest = TransportVersion.class.getResourceAsStream(manifestLocation)) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(transportVersionsManifest, StandardCharsets.UTF_8));
-                versionFileNames = reader.lines().filter(line -> line.isBlank() == false).toList();
-            } catch (IOException ioe) {
-                throw new UncheckedIOException("transport version manifest file not found at [" + manifestLocation + "]", ioe);
+            String manifestLocation = "/transport/constant/constant-transport-versions-files-manifest.txt";
+            List<String> versionFileNames = null;
+            if (latestId > -1) {
+                try (InputStream inputStream = TransportVersion.class.getResourceAsStream(manifestLocation)) {
+                    if (inputStream == null) {
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+                        versionFileNames = reader.lines().filter(line -> line.isBlank() == false).toList();
+                    }
+                } catch (IOException ioe) {
+                    throw new UncheckedIOException("transport version manifest file not found at [" + manifestLocation + "]", ioe);
+                }
             }
 
-            for (String name : versionFileNames) {
-                String versionLocation = "/transport/generated/" + name;
-                try (InputStream inputStream = TransportVersion.class.getResourceAsStream(versionLocation)) {
-                    TransportVersion transportVersion = TransportVersion.fromXContent(inputStream, latestId);
-                    if (transportVersion != null) {
-                        transportVersions.put(transportVersion.name(), transportVersion);
+            if (versionFileNames != null) {
+                for (String name : versionFileNames) {
+                    String versionLocation = "/transport/constant/" + name;
+                    try (InputStream inputStream = TransportVersion.class.getResourceAsStream(versionLocation)) {
+                        if (inputStream == null) {
+                            throw new IllegalStateException("transport version file not found at [" + versionLocation + "]");
+                        }
+                        TransportVersion transportVersion = TransportVersion.fromXContent(inputStream, latestId);
+                        if (transportVersion != null) {
+                            transportVersions.put(transportVersion.name(), transportVersion);
+                        }
+                    } catch (IOException ioe) {
+                        throw new UncheckedIOException("transport version file not found at [ " + versionLocation + "]", ioe);
                     }
-                } catch (IOException ioe) {
-                    throw new UncheckedIOException("transport version set file not found at [ " + versionLocation + "]", ioe);
                 }
             }
 
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -209,6 +209,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
     public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
     public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
+    public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
     public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
@@ -326,12 +327,14 @@ static TransportVersion def(int id) {
     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 ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
     public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
     public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03);
     // Below is the first version in 9.2 and NOT in 9.1.
     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 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 ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
@@ -344,6 +347,7 @@ static TransportVersion def(int id) {
     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,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _
diff --git a/server/src/main/resources/transport/generated/esql-split-on-big-values.json b/server/src/main/resources/transport/generated/esql-split-on-big-values.json
diff --git a/server/src/main/resources/transport/generated/esql-topn-timings.json b/server/src/main/resources/transport/generated/esql-topn-timings.json
diff --git a/server/src/main/resources/transport/generated/generated-transport-versions-files-manifest.txt b/server/src/main/resources/transport/generated/generated-transport-versions-files-manifest.txt
diff --git a/server/src/main/resources/transport/generated/ml-inference-azure-ai-studio-rerank-added.json b/server/src/main/resources/transport/generated/ml-inference-azure-ai-studio-rerank-added.json
diff --git a/server/src/main/resources/transport/latest/9.2-LATEST.json b/server/src/main/resources/transport/latest/9.2-LATEST.json
diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java
@@ -53,16 +53,16 @@ public void testVersionComparison() {
     }
 
     public static class CorrectFakeVersion {
-        public static final TransportVersion V_0_00_01 = new TransportVersion(199);
-        public static final TransportVersion V_0_000_002 = new TransportVersion(2);
-        public static final TransportVersion V_0_000_003 = new TransportVersion(3);
-        public static final TransportVersion V_0_000_004 = new TransportVersion(4);
+        public static final TransportVersion V_0_00_01 = new TransportVersion(null, 199, null);
+        public static final TransportVersion V_0_000_002 = new TransportVersion(null, 2, null);
+        public static final TransportVersion V_0_000_003 = new TransportVersion(null, 3, null);
+        public static final TransportVersion V_0_000_004 = new TransportVersion(null, 4, null);
     }
 
     public static class DuplicatedIdFakeVersion {
-        public static final TransportVersion V_0_000_001 = new TransportVersion(1);
-        public static final TransportVersion V_0_000_002 = new TransportVersion(2);
-        public static final TransportVersion V_0_000_003 = new TransportVersion(2);
+        public static final TransportVersion V_0_000_001 = new TransportVersion(null, 1, null);
+        public static final TransportVersion V_0_000_002 = new TransportVersion(null, 2, null);
+        public static final TransportVersion V_0_000_003 = new TransportVersion(null, 2, null);
     }
 
     public void testStaticTransportVersionChecks() {
@@ -220,24 +220,4 @@ public void testDuplicateConstants() {
             previous = next;
         }
     }
-
-    public void testNamedVersions() {
-        assertEquals(
-            new TransportVersion("esql-split-on-big-values", 9116000, null),
-            TransportVersion.fromName("esql-split-on-big-values")
-        );
-        assertEquals(
-            new TransportVersion("esql-split-on-big-values", 9112001, null),
-            TransportVersion.fromName("esql-split-on-big-values").nextPatchVersion()
-        );
-        assertEquals(
-            new TransportVersion("esql-split-on-big-values", 8841063, null),
-            TransportVersion.fromName("esql-split-on-big-values").nextPatchVersion().nextPatchVersion()
-        );
-        assertEquals(
-            new TransportVersion("ml-inference-azure-ai-studio-rerank-added", 9123000, null),
-            TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added")
-        );
-        assertEquals(new TransportVersion("esql-topn-timings", 9128000, null), TransportVersion.fromName("esql-topn-timings"));
-    }
 }
diff --git a/server/src/test/resources/transport/constant/constant-transport-versions-files-manifest.txt b/server/src/test/resources/transport/constant/constant-transport-versions-files-manifest.txt
@@ -0,0 +1,5 @@
+test-0.json
+test-1.json
+test-2.json
+test-3.json
+test-4.json
diff --git a/server/src/test/resources/transport/constant/test-0.json b/server/src/test/resources/transport/constant/test-0.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-0",
+  "ids": [
+  ]
+}
diff --git a/server/src/test/resources/transport/constant/test-1.json b/server/src/test/resources/transport/constant/test-1.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-1",
+  "ids": [
+  ]
+}
diff --git a/server/src/test/resources/transport/constant/test-2.json b/server/src/test/resources/transport/constant/test-2.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-2",
+  "ids": [
+  ]
+}
diff --git a/server/src/test/resources/transport/constant/test-3.json b/server/src/test/resources/transport/constant/test-3.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-3",
+  "ids": [
+  ]
+}
diff --git a/server/src/test/resources/transport/constant/test-4.json b/server/src/test/resources/transport/constant/test-4.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-4",
+  "ids": [
+  ]
+}
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/read/ValuesSourceReaderOperatorStatus.java
@@ -23,14 +23,16 @@
 
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED;
 import static org.elasticsearch.TransportVersions.ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19;
+import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES;
+import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_8_19;
+import static org.elasticsearch.TransportVersions.ESQL_SPLIT_ON_BIG_VALUES_9_1;
 
 public class ValuesSourceReaderOperatorStatus extends AbstractPageMappingToIteratorOperator.Status {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Operator.Status.class,
         "values_source_reader",
         ValuesSourceReaderOperatorStatus::readFrom
     );
-    public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES = TransportVersion.fromName("esql-split-on-big-values");
 
     private final Map<String, Integer> readersBuilt;
     private final long valuesLoaded;
@@ -55,7 +57,7 @@ static ValuesSourceReaderOperatorStatus readFrom(StreamInput in) throws IOExcept
         int pagesEmitted;
         long rowsReceived;
         long rowsEmitted;
-        if (in.getTransportVersion().supports(ESQL_SPLIT_ON_BIG_VALUES)) {
+        if (supportsSplitOnBigValues(in.getTransportVersion())) {
             AbstractPageMappingToIteratorOperator.Status status = new AbstractPageMappingToIteratorOperator.Status(in);
             processNanos = status.processNanos();
             pagesReceived = status.pagesReceived();
@@ -85,7 +87,7 @@ static ValuesSourceReaderOperatorStatus readFrom(StreamInput in) throws IOExcept
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().supports(ESQL_SPLIT_ON_BIG_VALUES)) {
+        if (supportsSplitOnBigValues(out.getTransportVersion())) {
             super.writeTo(out);
         } else {
             /*
@@ -100,6 +102,12 @@ public void writeTo(StreamOutput out) throws IOException {
         }
     }
 
+    private static boolean supportsSplitOnBigValues(TransportVersion version) {
+        return version.onOrAfter(ESQL_SPLIT_ON_BIG_VALUES)
+            || version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_9_1)
+            || version.isPatchFrom(ESQL_SPLIT_ON_BIG_VALUES_8_19);
+    }
+
     private static boolean supportsValuesLoaded(TransportVersion version) {
         return version.onOrAfter(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED)
             || version.isPatchFrom(ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java
@@ -20,15 +20,12 @@
 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");
     private final long receiveNanos;
     private final long emitNanos;
     private final int occupiedRows;
@@ -59,7 +56,7 @@ public TopNOperatorStatus(
     }
 
     TopNOperatorStatus(StreamInput in) throws IOException {
-        if (in.getTransportVersion().onOrAfter(ESQL_TOPN_TIMINGS)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_TOPN_TIMINGS)) {
             this.receiveNanos = in.readVLong();
             this.emitNanos = in.readVLong();
         } else {
@@ -84,7 +81,7 @@ public TopNOperatorStatus(
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(ESQL_TOPN_TIMINGS)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_TOPN_TIMINGS)) {
             out.writeVLong(receiveNanos);
             out.writeVLong(emitNanos);
         }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankServiceSettings.java
@@ -80,7 +80,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;//TransportVersion.fromName("ml-inference-azure-ai-studio-rerank-added");
+        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/rerank/AzureAiStudioRerankTaskSettings.java
@@ -94,7 +94,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_AZURE_AI_STUDIO_RERANK_ADDED;//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

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "name": "test-0",
 +  "ids": [
 +  ]
 +}