Skip to content

Collapse all transport versions between 8.11 and 8.12 into a constant for 8.12 #104937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/Build.java
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public static Build readBuild(StreamInput in) throws IOException {
final String minWireVersion;
final String minIndexVersion;
final String displayString;
if (in.getTransportVersion().onOrAfter(TransportVersions.BUILD_QUALIFIER_SEPARATED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
version = in.readString();
qualifier = in.readOptionalString();
snapshot = in.readBoolean();
Expand Down Expand Up @@ -257,7 +257,7 @@ public static void writeBuild(Build build, StreamOutput out) throws IOException
out.writeString(build.type().displayName());
out.writeString(build.hash());
out.writeString(build.date());
if (out.getTransportVersion().onOrAfter(TransportVersions.BUILD_QUALIFIER_SEPARATED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeString(build.version());
out.writeOptionalString(build.qualifier());
out.writeBoolean(build.isSnapshot());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1884,19 +1884,19 @@ private enum ElasticsearchExceptionHandle {
TooManyScrollContextsException.class,
TooManyScrollContextsException::new,
173,
TransportVersions.TOO_MANY_SCROLL_CONTEXTS_EXCEPTION_ADDED
TransportVersions.V_8_12_0
),
INVALID_BUCKET_PATH_EXCEPTION(
AggregationExecutionException.InvalidPath.class,
AggregationExecutionException.InvalidPath::new,
174,
TransportVersions.INVALID_BUCKET_PATH_EXCEPTION_INTRODUCED
TransportVersions.V_8_12_0
),
MISSED_INDICES_UPDATE_EXCEPTION(
AutoscalingMissedIndicesUpdateException.class,
AutoscalingMissedIndicesUpdateException::new,
175,
TransportVersions.MISSED_INDICES_UPDATE_EXCEPTION_ADDED
TransportVersions.V_8_12_0
),
SEARCH_TIMEOUT_EXCEPTION(
SearchTimeoutException.class,
Expand Down
49 changes: 1 addition & 48 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,54 +96,7 @@ static TransportVersion def(int id) {
public static final TransportVersion V_8_9_X = def(8_500_020);
public static final TransportVersion V_8_10_X = def(8_500_061);
public static final TransportVersion V_8_11_X = def(8_512_00_1);
public static final TransportVersion PLUGIN_DESCRIPTOR_OPTIONAL_CLASSNAME = def(8_513_00_0);
public static final TransportVersion UNIVERSAL_PROFILING_LICENSE_ADDED = def(8_514_00_0);
public static final TransportVersion ELSER_SERVICE_MODEL_VERSION_ADDED = def(8_515_00_0);
public static final TransportVersion NODE_STATS_HTTP_ROUTE_STATS_ADDED = def(8_516_00_0);
public static final TransportVersion INCLUDE_SHARDS_STATS_ADDED = def(8_517_00_0);
public static final TransportVersion BUILD_QUALIFIER_SEPARATED = def(8_518_00_0);
public static final TransportVersion PIPELINES_IN_BULK_RESPONSE_ADDED = def(8_519_00_0);
public static final TransportVersion PLUGIN_DESCRIPTOR_STRING_VERSION = def(8_520_00_0);
public static final TransportVersion TOO_MANY_SCROLL_CONTEXTS_EXCEPTION_ADDED = def(8_521_00_0);
public static final TransportVersion UNCONTENDED_REGISTER_ANALYSIS_ADDED = def(8_522_00_0);
public static final TransportVersion TRANSFORM_GET_CHECKPOINT_TIMEOUT_ADDED = def(8_523_00_0);
public static final TransportVersion IP_ADDRESS_WRITEABLE = def(8_524_00_0);
public static final TransportVersion PRIMARY_TERM_ADDED = def(8_525_00_0);
public static final TransportVersion CLUSTER_FEATURES_ADDED = def(8_526_00_0);
public static final TransportVersion DSL_ERROR_STORE_INFORMATION_ENHANCED = def(8_527_00_0);
public static final TransportVersion INVALID_BUCKET_PATH_EXCEPTION_INTRODUCED = def(8_528_00_0);
public static final TransportVersion KNN_AS_QUERY_ADDED = def(8_529_00_0);
public static final TransportVersion UNDESIRED_SHARD_ALLOCATIONS_COUNT_ADDED = def(8_530_00_0);
public static final TransportVersion ML_INFERENCE_TASK_SETTINGS_OPTIONAL_ADDED = def(8_531_00_0);
public static final TransportVersion DEPRECATED_COMPONENT_TEMPLATES_ADDED = def(8_532_00_0);
public static final TransportVersion UPDATE_NON_DYNAMIC_SETTINGS_ADDED = def(8_533_00_0);
public static final TransportVersion REPO_ANALYSIS_REGISTER_OP_COUNT_ADDED = def(8_534_00_0);
public static final TransportVersion ML_TRAINED_MODEL_PREFIX_STRINGS_ADDED = def(8_535_00_0);
public static final TransportVersion COUNTED_KEYWORD_ADDED = def(8_536_00_0);
public static final TransportVersion SHAPE_VALUE_SERIALIZATION_ADDED = def(8_537_00_0);
public static final TransportVersion INFERENCE_MULTIPLE_INPUTS = def(8_538_00_0);
public static final TransportVersion ADDITIONAL_DESIRED_BALANCE_RECONCILIATION_STATS = def(8_539_00_0);
public static final TransportVersion ML_STATE_CHANGE_TIMESTAMPS = def(8_540_00_0);
public static final TransportVersion DATA_STREAM_FAILURE_STORE_ADDED = def(8_541_00_0);
public static final TransportVersion ML_INFERENCE_OPENAI_ADDED = def(8_542_00_0);
public static final TransportVersion SHUTDOWN_MIGRATION_STATUS_INCLUDE_COUNTS = def(8_543_00_0);
public static final TransportVersion TRANSFORM_GET_CHECKPOINT_QUERY_AND_CLUSTER_ADDED = def(8_544_00_0);
public static final TransportVersion GRANT_API_KEY_CLIENT_AUTHENTICATION_ADDED = def(8_545_00_0);
public static final TransportVersion PIT_WITH_INDEX_FILTER = def(8_546_00_0);
public static final TransportVersion NODE_INFO_VERSION_AS_STRING = def(8_547_00_0);
public static final TransportVersion GET_API_KEY_INVALIDATION_TIME_ADDED = def(8_548_00_0);
public static final TransportVersion ML_INFERENCE_GET_MULTIPLE_MODELS = def(8_549_00_0);
public static final TransportVersion INFERENCE_SERVICE_RESULTS_ADDED = def(8_550_00_0);
public static final TransportVersion ESQL_PROFILE = def(8_551_00_0);
public static final TransportVersion CLUSTER_STATS_RESCORER_USAGE_ADDED = def(8_552_00_0);
public static final TransportVersion ML_INFERENCE_HF_SERVICE_ADDED = def(8_553_00_0);
public static final TransportVersion INFERENCE_USAGE_ADDED = def(8_554_00_0);
public static final TransportVersion UPGRADE_TO_LUCENE_9_9 = def(8_555_00_0);
public static final TransportVersion HEALTH_INFO_ENRICHED_WITH_DSL_STATUS = def(8_556_00_0);
public static final TransportVersion SOURCE_IN_SINGLE_VALUE_QUERY_ADDED = def(8_557_00_0);
public static final TransportVersion MISSED_INDICES_UPDATE_EXCEPTION_ADDED = def(8_558_00_0);
public static final TransportVersion INFERENCE_SERVICE_EMBEDDING_SIZE_ADDED = def(8_559_00_0);
public static final TransportVersion ENRICH_ELASTICSEARCH_VERSION_REMOVED = def(8_560_00_0);
public static final TransportVersion V_8_12_0 = def(8_560_00_0);
public static final TransportVersion DATE_HISTOGRAM_SUPPORT_DOWNSAMPLED_TZ_8_12_PATCH = def(8_560_00_1);
public static final TransportVersion NODE_STATS_REQUEST_SIMPLIFIED = def(8_561_00_0);
public static final TransportVersion TEXT_EXPANSION_TOKEN_PRUNING_CONFIG_ADDED = def(8_562_00_0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class NodeInfo extends BaseNodeResponse {

public NodeInfo(StreamInput in) throws IOException {
super(in);
if (in.getTransportVersion().onOrAfter(TransportVersions.NODE_INFO_VERSION_AS_STRING)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
version = in.readString();
transportVersion = TransportVersion.readVersion(in);
indexVersion = IndexVersion.readVersion(in);
Expand Down Expand Up @@ -234,7 +234,7 @@ private <T extends ReportingService.Info> void addInfoIfNonNull(Class<T> clazz,
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.NODE_INFO_VERSION_AS_STRING)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeString(version);
} else {
Version.writeVersion(Version.fromString(version), out);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public NodesStatsRequestParameters(StreamInput in) throws IOException {
indices = new CommonStatsFlags(in);
requestedMetrics.clear();
requestedMetrics.addAll(in.readStringCollectionAsList());
if (in.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_SHARDS_STATS_ADDED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
includeShardsStats = in.readBoolean();
} else {
includeShardsStats = true;
Expand All @@ -45,7 +45,7 @@ public NodesStatsRequestParameters(StreamInput in) throws IOException {
public void writeTo(StreamOutput out) throws IOException {
indices.writeTo(out);
out.writeStringCollection(requestedMetrics);
if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_SHARDS_STATS_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeBoolean(includeShardsStats);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.Map;
import java.util.Objects;

import static org.elasticsearch.TransportVersions.CLUSTER_STATS_RESCORER_USAGE_ADDED;
import static org.elasticsearch.TransportVersions.V_8_12_0;

/**
* Holds a snapshot of the search usage statistics.
Expand Down Expand Up @@ -59,9 +59,7 @@ public SearchUsageStats(StreamInput in) throws IOException {
this.queries = in.readMap(StreamInput::readLong);
this.sections = in.readMap(StreamInput::readLong);
this.totalSearchCount = in.readVLong();
this.rescorers = in.getTransportVersion().onOrAfter(CLUSTER_STATS_RESCORER_USAGE_ADDED)
? in.readMap(StreamInput::readLong)
: Map.of();
this.rescorers = in.getTransportVersion().onOrAfter(V_8_12_0) ? in.readMap(StreamInput::readLong) : Map.of();
}

@Override
Expand All @@ -70,7 +68,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeMap(sections, StreamOutput::writeLong);
out.writeVLong(totalSearchCount);

if (out.getTransportVersion().onOrAfter(CLUSTER_STATS_RESCORER_USAGE_ADDED)) {
if (out.getTransportVersion().onOrAfter(V_8_12_0)) {
out.writeMap(rescorers, StreamOutput::writeLong);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ public UnpromotableShardRefreshRequest(
public UnpromotableShardRefreshRequest(StreamInput in) throws IOException {
super(in);
segmentGeneration = in.readVLong();
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)
? in.readVLong()
: Engine.UNKNOWN_PRIMARY_TERM;
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0) ? in.readVLong() : Engine.UNKNOWN_PRIMARY_TERM;
}

@Override
Expand All @@ -58,7 +56,7 @@ public ActionRequestValidationException validate() {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeVLong(segmentGeneration);
if (out.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeVLong(primaryTerm);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public UpdateSettingsRequest(StreamInput in) throws IOException {
settings = readSettingsFromStream(in);
preserveExisting = in.readBoolean();
origin = in.readString();
if (in.getTransportVersion().onOrAfter(TransportVersions.UPDATE_NON_DYNAMIC_SETTINGS_ADDED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
reopen = in.readBoolean();
}
}
Expand Down Expand Up @@ -199,7 +199,7 @@ public void writeTo(StreamOutput out) throws IOException {
settings.writeTo(out);
out.writeBoolean(preserveExisting);
out.writeString(origin);
if (out.getTransportVersion().onOrAfter(TransportVersions.UPDATE_NON_DYNAMIC_SETTINGS_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeBoolean(reopen);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Objects;
import java.util.function.Supplier;

import static org.elasticsearch.TransportVersions.DSL_ERROR_STORE_INFORMATION_ENHANCED;
import static org.elasticsearch.TransportVersions.V_8_12_0;

/**
* Encapsulates the information that describes an index from its data stream lifecycle perspective.
Expand Down Expand Up @@ -81,7 +81,7 @@ public ExplainIndexDataStreamLifecycle(StreamInput in) throws IOException {
this.rolloverDate = in.readOptionalLong();
this.generationDateMillis = in.readOptionalLong();
this.lifecycle = in.readOptionalWriteable(DataStreamLifecycle::new);
if (in.getTransportVersion().onOrAfter(DSL_ERROR_STORE_INFORMATION_ENHANCED)) {
if (in.getTransportVersion().onOrAfter(V_8_12_0)) {
this.error = in.readOptionalWriteable(ErrorEntry::new);
} else {
String bwcErrorMessage = in.readOptionalString();
Expand Down Expand Up @@ -151,7 +151,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalLong(rolloverDate);
out.writeOptionalLong(generationDateMillis);
out.writeOptionalWriteable(lifecycle);
if (out.getTransportVersion().onOrAfter(DSL_ERROR_STORE_INFORMATION_ENHANCED)) {
if (out.getTransportVersion().onOrAfter(V_8_12_0)) {
out.writeOptionalWriteable(error);
} else {
String errorMessage = error != null ? error.error() : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,14 @@ public Response(StreamInput in) throws IOException {
super(in);
segmentGeneration = in.readZLong();
getResult = in.readOptionalWriteable(GetResult::new);
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)
? in.readVLong()
: Engine.UNKNOWN_PRIMARY_TERM;
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0) ? in.readVLong() : Engine.UNKNOWN_PRIMARY_TERM;
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeZLong(segmentGeneration);
out.writeOptionalWriteable(getResult);
if (out.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeVLong(primaryTerm);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,14 @@ public Response(StreamInput in) throws IOException {
super(in);
segmentGeneration = in.readZLong();
multiGetShardResponse = new MultiGetShardResponse(in);
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)
? in.readVLong()
: Engine.UNKNOWN_PRIMARY_TERM;
primaryTerm = in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0) ? in.readVLong() : Engine.UNKNOWN_PRIMARY_TERM;
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeZLong(segmentGeneration);
multiGetShardResponse.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.PRIMARY_TERM_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeVLong(primaryTerm);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
if (in.getTransportVersion().onOrAfter(PIPELINES_HAVE_RUN_FIELD_ADDED)) {
pipelinesHaveRun = in.readBoolean();
}
if (in.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
this.listExecutedPipelines = in.readBoolean();
if (listExecutedPipelines) {
List<String> possiblyImmutableExecutedPipelines = in.readOptionalCollectionAsList(StreamInput::readString);
Expand Down Expand Up @@ -764,7 +764,7 @@ private void writeBody(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(PIPELINES_HAVE_RUN_FIELD_ADDED)) {
out.writeBoolean(pipelinesHaveRun);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeBoolean(listExecutedPipelines);
if (listExecutedPipelines) {
out.writeOptionalCollection(executedPipelines, StreamOutput::writeString);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class IndexResponse extends DocWriteResponse {

public IndexResponse(ShardId shardId, StreamInput in) throws IOException {
super(shardId, in);
if (in.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString);
} else {
executedPipelines = null;
Expand All @@ -50,7 +50,7 @@ public IndexResponse(ShardId shardId, StreamInput in) throws IOException {

public IndexResponse(StreamInput in) throws IOException {
super(in);
if (in.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
executedPipelines = in.readOptionalCollectionAsList(StreamInput::readString);
} else {
executedPipelines = null;
Expand Down Expand Up @@ -89,15 +89,15 @@ private IndexResponse(
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeOptionalCollection(executedPipelines, StreamOutput::writeString);
}
}

@Override
public void writeThin(StreamOutput out) throws IOException {
super.writeThin(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.PIPELINES_IN_BULK_RESPONSE_ADDED)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeOptionalCollection(executedPipelines, StreamOutput::writeString);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public OpenPointInTimeRequest(StreamInput in) throws IOException {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
this.maxConcurrentShardRequests = in.readVInt();
}
if (in.getTransportVersion().onOrAfter(TransportVersions.PIT_WITH_INDEX_FILTER)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
this.indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class);
}
}
Expand All @@ -73,7 +73,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
out.writeVInt(maxConcurrentShardRequests);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.PIT_WITH_INDEX_FILTER)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeOptionalWriteable(indexFilter);
}
}
Expand Down
Loading