[9.1] Roll up 8.18.0 transport versions (elastic#136651) (elastic#136715)

* Roll up 8.18.0 transport versions (elastic#136651)

ES-12334

* fix test

Author: jdconrad

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/AddIndexBlockRollingUpgradeIT.java

@@ -39,7 +39,7 @@ public void testAddBlock() throws Exception {
         } else if (isMixedCluster()) {
             blockWrites();
             // this is used both for upgrading from 9.0.0 to current and from 8.18 to current.
-            if (minimumTransportVersion().before(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
+            if (minimumTransportVersion().supports(TransportVersions.V_8_18_0) == false) {
                 assertNull(verifiedSettingValue());
             } else {
                 assertThat(verifiedSettingValue(), Matchers.equalTo("true"));

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

@@ -97,49 +97,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05);
-    public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_0_00);
-    public static final TransportVersion REINDEX_DATA_STREAMS = def(8_799_0_00);
-    public static final TransportVersion ESQL_REMOVE_NODE_LEVEL_PLAN = def(8_800_0_00);
-    public static final TransportVersion LOGSDB_TELEMETRY_CUSTOM_CUTOFF_DATE = def(8_801_0_00);
-    public static final TransportVersion SOURCE_MODE_TELEMETRY = def(8_802_0_00);
-    public static final TransportVersion NEW_REFRESH_CLUSTER_BLOCK = def(8_803_0_00);
-    public static final TransportVersion RETRIES_AND_OPERATIONS_IN_BLOBSTORE_STATS = def(8_804_0_00);
-    public static final TransportVersion ADD_DATA_STREAM_OPTIONS_TO_TEMPLATES = def(8_805_0_00);
-    public static final TransportVersion KNN_QUERY_RESCORE_OVERSAMPLE = def(8_806_0_00);
-    public static final TransportVersion SEMANTIC_QUERY_LENIENT = def(8_807_0_00);
-    public static final TransportVersion ESQL_QUERY_BUILDER_IN_SEARCH_FUNCTIONS = def(8_808_0_00);
-    public static final TransportVersion EQL_ALLOW_PARTIAL_SEARCH_RESULTS = def(8_809_0_00);
-    public static final TransportVersion NODE_VERSION_INFORMATION_WITH_MIN_READ_ONLY_INDEX_VERSION = def(8_810_0_00);
-    public static final TransportVersion ERROR_TRACE_IN_TRANSPORT_HEADER = def(8_811_0_00);
-    public static final TransportVersion FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING = def(8_812_0_00);
-    public static final TransportVersion SIMULATE_IGNORED_FIELDS = def(8_813_0_00);
-    public static final TransportVersion TRANSFORMS_UPGRADE_MODE = def(8_814_0_00);
-    public static final TransportVersion NODE_SHUTDOWN_EPHEMERAL_ID_ADDED = def(8_815_0_00);
-    public static final TransportVersion ESQL_CCS_TELEMETRY_STATS = def(8_816_0_00);
-    public static final TransportVersion TEXT_EMBEDDING_QUERY_VECTOR_BUILDER_INFER_MODEL_ID = def(8_817_0_00);
-    public static final TransportVersion ESQL_ENABLE_NODE_LEVEL_REDUCTION = def(8_818_0_00);
-    public static final TransportVersion JINA_AI_INTEGRATION_ADDED = def(8_819_0_00);
-    public static final TransportVersion TRACK_INDEX_FAILED_DUE_TO_VERSION_CONFLICT_METRIC = def(8_820_0_00);
-    public static final TransportVersion REPLACE_FAILURE_STORE_OPTIONS_WITH_SELECTOR_SYNTAX = def(8_821_0_00);
-    public static final TransportVersion ELASTIC_INFERENCE_SERVICE_UNIFIED_CHAT_COMPLETIONS_INTEGRATION = def(8_822_0_00);
-    public static final TransportVersion KQL_QUERY_TECH_PREVIEW = def(8_823_0_00);
-    public static final TransportVersion ESQL_PROFILE_ROWS_PROCESSED = def(8_824_0_00);
-    public static final TransportVersion BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1 = def(8_825_0_00);
-    public static final TransportVersion REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1 = def(8_826_0_00);
-    public static final TransportVersion ESQL_SKIP_ES_INDEX_SERIALIZATION = def(8_827_0_00);
-    public static final TransportVersion ADD_INDEX_BLOCK_TWO_PHASE = def(8_828_0_00);
-    public static final TransportVersion RESOLVE_CLUSTER_NO_INDEX_EXPRESSION = def(8_829_0_00);
-    public static final TransportVersion ML_ROLLOVER_LEGACY_INDICES = def(8_830_0_00);
-    public static final TransportVersion ADD_INCLUDE_FAILURE_INDICES_OPTION = def(8_831_0_00);
-    public static final TransportVersion ESQL_RESPONSE_PARTIAL = def(8_832_0_00);
-    public static final TransportVersion RANK_DOC_OPTIONAL_METADATA_FOR_EXPLAIN = def(8_833_0_00);
-    public static final TransportVersion ILM_ADD_SEARCHABLE_SNAPSHOT_ADD_REPLICATE_FOR = def(8_834_0_00);
-    public static final TransportVersion INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR = def(8_835_0_00);
-    public static final TransportVersion RESOURCE_DEPRECATION_CHECKS = def(8_836_0_00);
-    public static final TransportVersion LINEAR_RETRIEVER_SUPPORT = def(8_837_0_00);
-    public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
-    public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
-    public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
+    public static final TransportVersion V_8_18_0 = def(8_840_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java

@@ -52,7 +52,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
             repositoryUsageStats = RepositoryUsageStats.EMPTY;
             searchCcsMetrics = new CCSTelemetrySnapshot();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
+        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             esqlCcsMetrics = new CCSTelemetrySnapshot(in);
         } else {
             esqlCcsMetrics = new CCSTelemetrySnapshot();
@@ -131,7 +131,7 @@ public void writeTo(StreamOutput out) throws IOException {
             repositoryUsageStats.writeTo(out);
             searchCcsMetrics.writeTo(out);
         } // else just drop these stats, ok for bwc
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
+        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             esqlCcsMetrics.writeTo(out);
         }
     }

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java

@@ -291,7 +291,7 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     private static boolean canReadOrWriteSourceModeTelemetry(TransportVersion version) {
-        return version.isPatchFrom(TransportVersions.V_8_17_0) || version.onOrAfter(TransportVersions.SOURCE_MODE_TELEMETRY);
+        return version.isPatchFrom(TransportVersions.V_8_17_0) || version.supports(TransportVersions.V_8_18_0);
     }
 
     private static OptionalLong ofNullable(Long l) {

server/src/main/java/org/elasticsearch/action/admin/indices/readonly/AddIndexBlockRequest.java

@@ -40,7 +40,7 @@ public AddIndexBlockRequest(StreamInput in) throws IOException {
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         block = APIBlock.readFrom(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
+        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             markVerified = in.readBoolean();
         } else {
             markVerified = false;
@@ -132,7 +132,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArray(indices);
         indicesOptions.writeIndicesOptions(out);
         block.writeTo(out);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
+        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             out.writeBoolean(markVerified);
         }
     }

server/src/main/java/org/elasticsearch/action/admin/indices/readonly/TransportVerifyShardIndexBlockAction.java

@@ -181,7 +181,7 @@ public static final class ShardRequest extends ReplicationRequest<ShardRequest>
         ShardRequest(StreamInput in) throws IOException {
             super(in);
             clusterBlock = new ClusterBlock(in);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
+            if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
                 phase1 = in.readBoolean();
             } else {
                 phase1 = true; // does not matter, not verified anyway
@@ -204,7 +204,7 @@ public String toString() {
         public void writeTo(final StreamOutput out) throws IOException {
             super.writeTo(out);
             clusterBlock.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.ADD_INDEX_BLOCK_TWO_PHASE)) {
+            if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
                 out.writeBoolean(phase1);
             }
         }

server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java

@@ -84,16 +84,14 @@ public ResolveClusterActionRequest(StreamInput in) throws IOException {
         this.names = in.readStringArray();
         this.indicesOptions = IndicesOptions.readIndicesOptions(in);
         this.localIndicesRequested = localIndicesPresent(names);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_CLUSTER_NO_INDEX_EXPRESSION)) {
+        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             this.clusterInfoOnly = in.readBoolean();
             this.isQueryingCluster = in.readBoolean();
+            this.timeout = in.readOptionalTimeValue();
         } else {
             this.clusterInfoOnly = false;
             this.isQueryingCluster = false;
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER)) {
-            this.timeout = in.readOptionalTimeValue();
-        }
     }
 
     @Override
@@ -104,11 +102,9 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeStringArray(names);
         indicesOptions.writeIndicesOptions(out);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_CLUSTER_NO_INDEX_EXPRESSION)) {
+        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             out.writeBoolean(clusterInfoOnly);
             out.writeBoolean(isQueryingCluster);
-        }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER)) {
             out.writeOptionalTimeValue(timeout);
         }
     }

server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -105,7 +105,7 @@ public BulkRequest(StreamInput in) throws IOException {
         } else {
             incrementalState = BulkRequest.IncrementalState.EMPTY;
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
+        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             includeSourceOnError = in.readBoolean();
         } // else default value is true
     }
@@ -471,7 +471,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
             incrementalState.writeTo(out);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
+        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             out.writeBoolean(includeSourceOnError);
         }
     }

server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java

@@ -337,7 +337,7 @@ public String getIndexModeName() {
             @Override
             public void writeTo(StreamOutput out) throws IOException {
                 dataStream.writeTo(out);
-                if (out.getTransportVersion().onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING)) {
+                if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
                     out.writeBoolean(failureStoreEffectivelyEnabled);
                 }
                 dataStreamStatus.writeTo(out);

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -213,7 +213,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
             }
         }
 
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
+        if (in.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             includeSourceOnError = in.readBoolean();
         } // else default value is true
     }
@@ -812,7 +812,7 @@ private void writeBody(StreamOutput out) throws IOException {
                 out.writeBoolean(false); // obsolete originatesFromUpdateByDoc
             }
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_REQUEST_INCLUDE_SOURCE_ON_ERROR)) {
+        if (out.getTransportVersion().supports(TransportVersions.V_8_18_0)) {
             out.writeBoolean(includeSourceOnError);
         }
     }