Skip to content

Commit 41770b7

Browse files
thecoopthecoop
authored
Collapse transport versions for 8.16 (#117991) (#118053)
1 parent fa7ac36 commit 41770b7

File tree

131 files changed

+259
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+259
-414
lines changed

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpTaskState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public String getWriteableName() {
123123

124124
@Override
125125
public TransportVersion getMinimalSupportedVersion() {
126-
return TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER;
126+
return TransportVersions.V_8_16_0;
127127
}
128128

129129
@Override

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class GeoIpTaskState implements PersistentTaskState, VersionedNamedWriteable {
4545

4646
private static boolean includeSha256(TransportVersion version) {
47-
return version.isPatchFrom(TransportVersions.V_8_15_0) || version.onOrAfter(TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER);
47+
return version.onOrAfter(TransportVersions.V_8_15_0);
4848
}
4949

5050
private static final ParseField DATABASES = new ParseField("databases");

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpMetadata.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String getWriteableName() {
6969

7070
@Override
7171
public TransportVersion getMinimalSupportedVersion() {
72-
return TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER;
72+
return TransportVersions.V_8_16_0;
7373
}
7474

7575
public Map<String, DatabaseConfigurationMetadata> getDatabases() {
@@ -138,7 +138,7 @@ public String getWriteableName() {
138138

139139
@Override
140140
public TransportVersion getMinimalSupportedVersion() {
141-
return TransportVersions.ENTERPRISE_GEOIP_DOWNLOADER;
141+
return TransportVersions.V_8_16_0;
142142
}
143143
}
144144

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/DatabaseConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public DatabaseConfiguration(StreamInput in) throws IOException {
138138
}
139139

140140
private static Provider readProvider(StreamInput in) throws IOException {
141-
if (in.getTransportVersion().onOrAfter(TransportVersions.INGEST_GEO_DATABASE_PROVIDERS)) {
141+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
142142
return in.readNamedWriteable(Provider.class);
143143
} else {
144144
// prior to the above version, everything was always a maxmind, so this half of the if is logical
@@ -154,7 +154,7 @@ public static DatabaseConfiguration parse(XContentParser parser, String id) {
154154
public void writeTo(StreamOutput out) throws IOException {
155155
out.writeString(id);
156156
out.writeString(name);
157-
if (out.getTransportVersion().onOrAfter(TransportVersions.INGEST_GEO_DATABASE_PROVIDERS)) {
157+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
158158
out.writeNamedWriteable(provider);
159159
} else {
160160
if (provider instanceof Maxmind maxmind) {

‎server/src/main/java/org/elasticsearch/ElasticsearchException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,13 +1929,13 @@ private enum ElasticsearchExceptionHandle {
19291929
org.elasticsearch.ingest.IngestPipelineException.class,
19301930
org.elasticsearch.ingest.IngestPipelineException::new,
19311931
182,
1932-
TransportVersions.INGEST_PIPELINE_EXCEPTION_ADDED
1932+
TransportVersions.V_8_16_0
19331933
),
19341934
INDEX_RESPONSE_WRAPPER_EXCEPTION(
19351935
IndexDocFailureStoreStatus.ExceptionWithFailureStoreStatus.class,
19361936
IndexDocFailureStoreStatus.ExceptionWithFailureStoreStatus::new,
19371937
183,
1938-
TransportVersions.FAILURE_STORE_STATUS_IN_INDEX_RESPONSE
1938+
TransportVersions.V_8_16_0
19391939
);
19401940

19411941
final Class<? extends ElasticsearchException> exceptionClass;

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

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -104,78 +104,7 @@ static TransportVersion def(int id) {
104104
public static final TransportVersion V_8_14_0 = def(8_636_00_1);
105105
public static final TransportVersion V_8_15_0 = def(8_702_00_2);
106106
public static final TransportVersion V_8_15_2 = def(8_702_00_3);
107-
public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_15 = def(8_702_00_4);
108-
public static final TransportVersion ML_INFERENCE_DONT_DELETE_WHEN_SEMANTIC_TEXT_EXISTS = def(8_703_00_0);
109-
public static final TransportVersion INFERENCE_ADAPTIVE_ALLOCATIONS = def(8_704_00_0);
110-
public static final TransportVersion INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN = def(8_705_00_0);
111-
public static final TransportVersion ML_INFERENCE_COHERE_UNUSED_RERANK_SETTINGS_REMOVED = def(8_706_00_0);
112-
public static final TransportVersion ENRICH_CACHE_STATS_SIZE_ADDED = def(8_707_00_0);
113-
public static final TransportVersion ENTERPRISE_GEOIP_DOWNLOADER = def(8_708_00_0);
114-
public static final TransportVersion NODES_STATS_ENUM_SET = def(8_709_00_0);
115-
public static final TransportVersion MASTER_NODE_METRICS = def(8_710_00_0);
116-
public static final TransportVersion SEGMENT_LEVEL_FIELDS_STATS = def(8_711_00_0);
117-
public static final TransportVersion ML_ADD_DETECTION_RULE_PARAMS = def(8_712_00_0);
118-
public static final TransportVersion FIX_VECTOR_SIMILARITY_INNER_HITS = def(8_713_00_0);
119-
public static final TransportVersion INDEX_REQUEST_UPDATE_BY_DOC_ORIGIN = def(8_714_00_0);
120-
public static final TransportVersion ESQL_ATTRIBUTE_CACHED_SERIALIZATION = def(8_715_00_0);
121-
public static final TransportVersion REGISTER_SLM_STATS = def(8_716_00_0);
122-
public static final TransportVersion ESQL_NESTED_UNSUPPORTED = def(8_717_00_0);
123-
public static final TransportVersion ESQL_SINGLE_VALUE_QUERY_SOURCE = def(8_718_00_0);
124-
public static final TransportVersion ESQL_ORIGINAL_INDICES = def(8_719_00_0);
125-
public static final TransportVersion ML_INFERENCE_EIS_INTEGRATION_ADDED = def(8_720_00_0);
126-
public static final TransportVersion INGEST_PIPELINE_EXCEPTION_ADDED = def(8_721_00_0);
127-
public static final TransportVersion ZDT_NANOS_SUPPORT_BROKEN = def(8_722_00_0);
128-
public static final TransportVersion REMOVE_GLOBAL_RETENTION_FROM_TEMPLATES = def(8_723_00_0);
129-
public static final TransportVersion RANDOM_RERANKER_RETRIEVER = def(8_724_00_0);
130-
public static final TransportVersion ESQL_PROFILE_SLEEPS = def(8_725_00_0);
131-
public static final TransportVersion ZDT_NANOS_SUPPORT = def(8_726_00_0);
132-
public static final TransportVersion LTR_SERVERLESS_RELEASE = def(8_727_00_0);
133-
public static final TransportVersion ALLOW_PARTIAL_SEARCH_RESULTS_IN_PIT = def(8_728_00_0);
134-
public static final TransportVersion RANK_DOCS_RETRIEVER = def(8_729_00_0);
135-
public static final TransportVersion ESQL_ES_FIELD_CACHED_SERIALIZATION = def(8_730_00_0);
136-
public static final TransportVersion ADD_MANAGE_ROLES_PRIVILEGE = def(8_731_00_0);
137-
public static final TransportVersion REPOSITORIES_TELEMETRY = def(8_732_00_0);
138-
public static final TransportVersion ML_INFERENCE_ALIBABACLOUD_SEARCH_ADDED = def(8_733_00_0);
139-
public static final TransportVersion FIELD_CAPS_RESPONSE_INDEX_MODE = def(8_734_00_0);
140-
public static final TransportVersion GET_DATA_STREAMS_VERBOSE = def(8_735_00_0);
141-
public static final TransportVersion ESQL_ADD_INDEX_MODE_CONCRETE_INDICES = def(8_736_00_0);
142-
public static final TransportVersion UNASSIGNED_PRIMARY_COUNT_ON_CLUSTER_HEALTH = def(8_737_00_0);
143-
public static final TransportVersion ESQL_AGGREGATE_EXEC_TRACKS_INTERMEDIATE_ATTRS = def(8_738_00_0);
144-
public static final TransportVersion CCS_TELEMETRY_STATS = def(8_739_00_0);
145-
public static final TransportVersion GLOBAL_RETENTION_TELEMETRY = def(8_740_00_0);
146-
public static final TransportVersion ROUTING_TABLE_VERSION_REMOVED = def(8_741_00_0);
147-
public static final TransportVersion ML_SCHEDULED_EVENT_TIME_SHIFT_CONFIGURATION = def(8_742_00_0);
148-
public static final TransportVersion SIMULATE_COMPONENT_TEMPLATES_SUBSTITUTIONS = def(8_743_00_0);
149-
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_EMBEDDINGS_ADDED = def(8_744_00_0);
150-
public static final TransportVersion BULK_INCREMENTAL_STATE = def(8_745_00_0);
151-
public static final TransportVersion FAILURE_STORE_STATUS_IN_INDEX_RESPONSE = def(8_746_00_0);
152-
public static final TransportVersion ESQL_AGGREGATION_OPERATOR_STATUS_FINISH_NANOS = def(8_747_00_0);
153-
public static final TransportVersion ML_TELEMETRY_MEMORY_ADDED = def(8_748_00_0);
154-
public static final TransportVersion ILM_ADD_SEARCHABLE_SNAPSHOT_TOTAL_SHARDS_PER_NODE = def(8_749_00_0);
155-
public static final TransportVersion SEMANTIC_TEXT_SEARCH_INFERENCE_ID = def(8_750_00_0);
156-
public static final TransportVersion ML_INFERENCE_CHUNKING_SETTINGS = def(8_751_00_0);
157-
public static final TransportVersion SEMANTIC_QUERY_INNER_HITS = def(8_752_00_0);
158-
public static final TransportVersion RETAIN_ILM_STEP_INFO = def(8_753_00_0);
159-
public static final TransportVersion ADD_DATA_STREAM_OPTIONS = def(8_754_00_0);
160-
public static final TransportVersion CCS_REMOTE_TELEMETRY_STATS = def(8_755_00_0);
161-
public static final TransportVersion ESQL_CCS_EXECUTION_INFO = def(8_756_00_0);
162-
public static final TransportVersion REGEX_AND_RANGE_INTERVAL_QUERIES = def(8_757_00_0);
163-
public static final TransportVersion RRF_QUERY_REWRITE = def(8_758_00_0);
164-
public static final TransportVersion SEARCH_FAILURE_STATS = def(8_759_00_0);
165-
public static final TransportVersion INGEST_GEO_DATABASE_PROVIDERS = def(8_760_00_0);
166-
public static final TransportVersion DATE_TIME_DOC_VALUES_LOCALES = def(8_761_00_0);
167-
public static final TransportVersion FAST_REFRESH_RCO = def(8_762_00_0);
168-
public static final TransportVersion TEXT_SIMILARITY_RERANKER_QUERY_REWRITE = def(8_763_00_0);
169-
public static final TransportVersion SIMULATE_INDEX_TEMPLATES_SUBSTITUTIONS = def(8_764_00_0);
170-
public static final TransportVersion RETRIEVERS_TELEMETRY_ADDED = def(8_765_00_0);
171-
public static final TransportVersion ESQL_CACHED_STRING_SERIALIZATION = def(8_766_00_0);
172-
public static final TransportVersion CHUNK_SENTENCE_OVERLAP_SETTING_ADDED = def(8_767_00_0);
173-
public static final TransportVersion OPT_IN_ESQL_CCS_EXECUTION_INFO = def(8_768_00_0);
174-
public static final TransportVersion QUERY_RULE_TEST_API = def(8_769_00_0);
175-
public static final TransportVersion ESQL_PER_AGGREGATE_FILTER = def(8_770_00_0);
176-
public static final TransportVersion ML_INFERENCE_ATTACH_TO_EXISTSING_DEPLOYMENT = def(8_771_00_0);
177-
public static final TransportVersion CONVERT_FAILURE_STORE_OPTIONS_TO_SELECTOR_OPTIONS_INTERNALLY = def(8_772_00_0);
178-
public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ_BACKPORT_8_16 = def(8_772_00_1);
107+
public static final TransportVersion V_8_16_0 = def(8_772_00_1);
179108
public static final TransportVersion ADD_COMPATIBILITY_VERSIONS_TO_NODE_INFO_BACKPORT_8_16 = def(8_772_00_2);
180109
public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16 = def(8_772_00_3);
181110
public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_16 = def(8_772_00_4);

‎server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public Request(TimeValue masterNodeTimeout, TaskId parentTaskId, EnumSet<Metric>
118118

119119
public Request(StreamInput in) throws IOException {
120120
super(in);
121-
this.metrics = in.getTransportVersion().onOrAfter(TransportVersions.MASTER_NODE_METRICS)
121+
this.metrics = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)
122122
? in.readEnumSet(Metric.class)
123123
: EnumSet.of(Metric.ALLOCATIONS, Metric.FS);
124124
}
@@ -127,7 +127,7 @@ public Request(StreamInput in) throws IOException {
127127
public void writeTo(StreamOutput out) throws IOException {
128128
assert out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0);
129129
super.writeTo(out);
130-
if (out.getTransportVersion().onOrAfter(TransportVersions.MASTER_NODE_METRICS)) {
130+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
131131
out.writeEnumSet(metrics);
132132
}
133133
}

‎server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ public static Metric get(String name) {
117117
}
118118

119119
public static void writeSetTo(StreamOutput out, EnumSet<Metric> metrics) throws IOException {
120-
if (out.getTransportVersion().onOrAfter(TransportVersions.NODES_STATS_ENUM_SET)) {
120+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
121121
out.writeEnumSet(metrics);
122122
} else {
123123
out.writeCollection(metrics, (output, metric) -> output.writeString(metric.metricName));
124124
}
125125
}
126126

127127
public static EnumSet<Metric> readSetFrom(StreamInput in) throws IOException {
128-
if (in.getTransportVersion().onOrAfter(TransportVersions.NODES_STATS_ENUM_SET)) {
128+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
129129
return in.readEnumSet(Metric.class);
130130
} else {
131131
return in.readCollection((i) -> EnumSet.noneOf(Metric.class), (is, out) -> {

‎server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public CreateSnapshotRequest(StreamInput in) throws IOException {
118118
waitForCompletion = in.readBoolean();
119119
partial = in.readBoolean();
120120
userMetadata = in.readGenericMap();
121-
uuid = in.getTransportVersion().onOrAfter(TransportVersions.REGISTER_SLM_STATS) ? in.readOptionalString() : null;
121+
uuid = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) ? in.readOptionalString() : null;
122122
}
123123

124124
@Override
@@ -136,7 +136,7 @@ public void writeTo(StreamOutput out) throws IOException {
136136
out.writeBoolean(waitForCompletion);
137137
out.writeBoolean(partial);
138138
out.writeGenericMap(userMetadata);
139-
if (out.getTransportVersion().onOrAfter(TransportVersions.REGISTER_SLM_STATS)) {
139+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
140140
out.writeOptionalString(uuid);
141141
}
142142
}

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,11 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
4444
} else {
4545
searchUsageStats = new SearchUsageStats();
4646
}
47-
if (in.getTransportVersion().onOrAfter(TransportVersions.REPOSITORIES_TELEMETRY)) {
47+
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
4848
repositoryUsageStats = RepositoryUsageStats.readFrom(in);
49-
} else {
50-
repositoryUsageStats = RepositoryUsageStats.EMPTY;
51-
}
52-
if (in.getTransportVersion().onOrAfter(TransportVersions.CCS_TELEMETRY_STATS)) {
5349
ccsMetrics = new CCSTelemetrySnapshot(in);
5450
} else {
51+
repositoryUsageStats = RepositoryUsageStats.EMPTY;
5552
ccsMetrics = new CCSTelemetrySnapshot();
5653
}
5754
}
@@ -118,12 +115,10 @@ public void writeTo(StreamOutput out) throws IOException {
118115
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) {
119116
searchUsageStats.writeTo(out);
120117
}
121-
if (out.getTransportVersion().onOrAfter(TransportVersions.REPOSITORIES_TELEMETRY)) {
118+
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
122119
repositoryUsageStats.writeTo(out);
123-
} // else just drop these stats, ok for bwc
124-
if (out.getTransportVersion().onOrAfter(TransportVersions.CCS_TELEMETRY_STATS)) {
125120
ccsMetrics.writeTo(out);
126-
}
121+
} // else just drop these stats, ok for bwc
127122
}
128123

129124
}

0 commit comments

Comments
 (0)