Skip to content
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
17 changes: 0 additions & 17 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -351,23 +351,6 @@ static TransportVersion def(int id) {
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);
public static final TransportVersion NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS = def(9_129_0_00);
public static final TransportVersion RERANK_SNIPPETS = def(9_130_0_00);
public static final TransportVersion PIPELINE_TRACKING_INFO = def(9_131_0_00);
public static final TransportVersion COMPONENT_TEMPLATE_TRACKING_INFO = def(9_132_0_00);
public static final TransportVersion TO_CHILD_BLOCK_JOIN_QUERY = def(9_133_0_00);
public static final TransportVersion ML_INFERENCE_AI21_COMPLETION_ADDED = def(9_134_0_00);
public static final TransportVersion TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION = def(9_135_0_00);
public static final TransportVersion INDEX_TEMPLATE_TRACKING_INFO = def(9_136_0_00);
public static final TransportVersion EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO = def(9_137_0_00);
public static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = def(9_138_0_00);
public static final TransportVersion ESQL_LOOKUP_JOIN_ON_MANY_FIELDS = def(9_139_0_00);
public static final TransportVersion SIMULATE_INGEST_EFFECTIVE_MAPPING = def(9_140_0_00);
public static final TransportVersion RESOLVE_INDEX_MODE_ADDED = def(9_141_0_00);
public static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = def(9_142_0_00);
public static final TransportVersion SCRIPT_RESCORER = def(9_143_0_00);
public static final TransportVersion ESQL_LOOKUP_OPERATOR_EMITTED_ROWS = def(9_144_0_00);
public static final TransportVersion ALLOCATION_DECISION_NOT_PREFERRED = def(9_145_0_00);

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.action.admin.indices.resolve;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionResponse;
Expand Down Expand Up @@ -73,6 +73,8 @@ public class ResolveIndexAction extends ActionType<ResolveIndexAction.Response>
public static final String NAME = "indices:admin/resolve/index";
public static final RemoteClusterActionType<Response> REMOTE_TYPE = new RemoteClusterActionType<>(NAME, Response::new);

private static final TransportVersion RESOLVE_INDEX_MODE_ADDED = TransportVersion.fromName("resolve_index_mode_added");

private ResolveIndexAction() {
super(NAME);
}
Expand Down Expand Up @@ -190,7 +192,7 @@ public static class ResolvedIndex extends ResolvedIndexAbstraction implements Wr
this.aliases = in.readStringArray();
this.attributes = in.readStringArray();
this.dataStream = in.readOptionalString();
if (in.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_ADDED)) {
if (in.getTransportVersion().supports(RESOLVE_INDEX_MODE_ADDED)) {
this.mode = IndexMode.readFrom(in);
} else {
this.mode = null;
Expand Down Expand Up @@ -231,7 +233,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeStringArray(aliases);
out.writeStringArray(attributes);
out.writeOptionalString(dataStream);
if (out.getTransportVersion().onOrAfter(TransportVersions.RESOLVE_INDEX_MODE_ADDED)) {
if (out.getTransportVersion().supports(RESOLVE_INDEX_MODE_ADDED)) {
IndexMode.writeTo(mode, out);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.action.bulk;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.cluster.metadata.ComponentTemplate;
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
Expand Down Expand Up @@ -99,6 +100,11 @@
* processor definitions.
*/
public class SimulateBulkRequest extends BulkRequest {

private static final TransportVersion SIMULATE_INGEST_MAPPING_MERGE_TYPE = TransportVersion.fromName(
"simulate_ingest_mapping_merge_type"
);

private final Map<String, Map<String, Object>> pipelineSubstitutions;
private final Map<String, Map<String, Object>> componentTemplateSubstitutions;
private final Map<String, Map<String, Object>> indexTemplateSubstitutions;
Expand Down Expand Up @@ -150,7 +156,7 @@ public SimulateBulkRequest(StreamInput in) throws IOException {
} else {
mappingAddition = Map.of();
}
if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
if (in.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
mappingMergeType = in.readOptionalString();
} else {
mappingMergeType = null;
Expand All @@ -168,7 +174,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_17_0)) {
out.writeGenericValue(mappingAddition);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
if (out.getTransportVersion().supports(SIMULATE_INGEST_MAPPING_MERGE_TYPE)) {
out.writeOptionalString(mappingMergeType);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.action.datastreams;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.ActionType;
Expand Down Expand Up @@ -41,6 +42,10 @@ public class UpdateDataStreamSettingsAction extends ActionType<UpdateDataStreamS
public static final String NAME = "indices:admin/data_stream/settings/update";
public static final UpdateDataStreamSettingsAction INSTANCE = new UpdateDataStreamSettingsAction();

private static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = TransportVersion.fromName(
"data_stream_write_index_only_settings"
);

public UpdateDataStreamSettingsAction() {
super(NAME);
}
Expand Down Expand Up @@ -242,9 +247,7 @@ public record IndicesSettingsResult(
public IndicesSettingsResult(StreamInput in) throws IOException {
this(
in.readStringCollectionAsList(),
in.getTransportVersion().onOrAfter(TransportVersions.DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)
? in.readStringCollectionAsList()
: List.of(),
in.getTransportVersion().supports(DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS) ? in.readStringCollectionAsList() : List.of(),
in.readStringCollectionAsList(),
in.readCollectionAsList(IndexSettingError::new)
);
Expand All @@ -264,7 +267,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeStringCollection(appliedToDataStreamOnly);
if (out.getTransportVersion().onOrAfter(TransportVersions.DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)) {
if (out.getTransportVersion().supports(DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS)) {
out.writeStringCollection(appliedToDataStreamAndWriteIndex);
}
out.writeStringCollection(appliedToDataStreamAndBackingIndices);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package org.elasticsearch.action.ingest;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.bulk.IndexDocFailureStoreStatus;
import org.elasticsearch.action.index.IndexResponse;
Expand All @@ -35,6 +36,11 @@
* BulkItemResponse in IngestService.
*/
public class SimulateIndexResponse extends IndexResponse {

private static final TransportVersion SIMULATE_INGEST_EFFECTIVE_MAPPING = TransportVersion.fromName(
"simulate_ingest_effective_mapping"
);

private final BytesReference source;
private final XContentType sourceXContentType;
private final Collection<String> ignoredFields;
Expand All @@ -57,7 +63,7 @@ public SimulateIndexResponse(StreamInput in) throws IOException {
} else {
this.ignoredFields = List.of();
}
if (in.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
if (in.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
if (in.readBoolean()) {
this.effectiveMapping = CompressedXContent.readCompressedString(in);
} else {
Expand Down Expand Up @@ -149,7 +155,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_IGNORED_FIELDS)) {
out.writeStringCollection(ignoredFields);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
if (out.getTransportVersion().supports(SIMULATE_INGEST_EFFECTIVE_MAPPING)) {
out.writeBoolean(effectiveMapping != null);
if (effectiveMapping != null) {
effectiveMapping.writeTo(out);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.cluster;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.node.usage.NodeUsageStatsForThreadPoolsAction;
import org.elasticsearch.action.admin.cluster.node.usage.TransportNodeUsageStatsForThreadPoolsAction;
Expand All @@ -33,6 +33,10 @@ public void collectUsageStats(
}
};

private static final TransportVersion TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION = TransportVersion.fromName(
"transport_node_usage_stats_for_thread_pools_action"
);

/**
* Collects the thread pool usage stats ({@link NodeUsageStatsForThreadPools}) for each node in the cluster.
*
Expand All @@ -44,7 +48,7 @@ public void collectUsageStats(
ActionListener<Map<String, NodeUsageStatsForThreadPools>> listener
) {
var dataNodeIds = clusterState.nodes().getDataNodes().values().stream().map(node -> node.getId()).toArray(String[]::new);
if (clusterState.getMinTransportVersion().onOrAfter(TransportVersions.TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION)) {
if (clusterState.getMinTransportVersion().supports(TRANSPORT_NODE_USAGE_STATS_FOR_THREAD_POOLS_ACTION)) {
client.execute(
TransportNodeUsageStatsForThreadPoolsAction.TYPE,
new NodeUsageStatsForThreadPoolsAction.Request(dataNodeIds),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.cluster.metadata;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
import org.elasticsearch.cluster.Diff;
Expand Down Expand Up @@ -60,6 +61,8 @@ public class ComponentTemplate implements SimpleDiffable<ComponentTemplate>, ToX
PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), MODIFIED_DATE_MILLIS);
}

private static final TransportVersion COMPONENT_TEMPLATE_TRACKING_INFO = TransportVersion.fromName("component_template_tracking_info");

private final Template template;
@Nullable
private final Long version;
Expand Down Expand Up @@ -113,7 +116,7 @@ public ComponentTemplate(StreamInput in) throws IOException {
} else {
deprecated = null;
}
if (in.getTransportVersion().onOrAfter(TransportVersions.COMPONENT_TEMPLATE_TRACKING_INFO)) {
if (in.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) {
this.createdDateMillis = in.readOptionalLong();
this.modifiedDateMillis = in.readOptionalLong();
} else {
Expand Down Expand Up @@ -165,7 +168,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeOptionalBoolean(this.deprecated);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.COMPONENT_TEMPLATE_TRACKING_INFO)) {
if (out.getTransportVersion().supports(COMPONENT_TEMPLATE_TRACKING_INFO)) {
out.writeOptionalLong(this.createdDateMillis);
out.writeOptionalLong(this.modifiedDateMillis);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.cluster.metadata;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
import org.elasticsearch.cluster.Diff;
Expand Down Expand Up @@ -107,6 +108,8 @@ public class ComposableIndexTemplate implements SimpleDiffable<ComposableIndexTe
PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), MODIFIED_DATE_MILLIS);
}

private static final TransportVersion INDEX_TEMPLATE_TRACKING_INFO = TransportVersion.fromName("index_template_tracking_info");

private final List<String> indexPatterns;
@Nullable
private final Template template;
Expand Down Expand Up @@ -181,7 +184,7 @@ public ComposableIndexTemplate(StreamInput in) throws IOException {
} else {
this.deprecated = null;
}
if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_TEMPLATE_TRACKING_INFO)) {
if (in.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) {
this.createdDateMillis = in.readOptionalLong();
this.modifiedDateMillis = in.readOptionalLong();
} else {
Expand Down Expand Up @@ -298,7 +301,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeOptionalBoolean(deprecated);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_TEMPLATE_TRACKING_INFO)) {
if (out.getTransportVersion().supports(INDEX_TEMPLATE_TRACKING_INFO)) {
out.writeOptionalLong(createdDateMillis);
out.writeOptionalLong(modifiedDateMillis);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.cluster.routing.allocation.allocator;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.cluster.ClusterInfo;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.Metadata;
Expand Down Expand Up @@ -214,6 +214,10 @@ public record NodeBalanceStats(

private static final String UNKNOWN_NODE_ID = "UNKNOWN";

private static final TransportVersion NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS = TransportVersion.fromName(
"node_weights_added_to_node_balance_stats"
);

private static NodeBalanceStats createFrom(
RoutingNode routingNode,
Metadata metadata,
Expand Down Expand Up @@ -272,9 +276,7 @@ public static NodeBalanceStats readFrom(StreamInput in) throws IOException {
in.readDouble(),
in.readLong(),
in.readLong(),
in.getTransportVersion().onOrAfter(TransportVersions.NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)
? in.readOptionalDouble()
: null
in.getTransportVersion().supports(NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS) ? in.readOptionalDouble() : null
);
}

Expand All @@ -287,7 +289,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeDouble(forecastWriteLoad);
out.writeLong(forecastShardSize);
out.writeLong(actualShardSize);
if (out.getTransportVersion().onOrAfter(TransportVersions.NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)) {
if (out.getTransportVersion().supports(NODE_WEIGHTS_ADDED_TO_NODE_BALANCE_STATS)) {
out.writeOptionalDouble(nodeWeight);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ToChildBlockJoinQuery;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.search.Queries;
Expand All @@ -29,6 +28,9 @@
*/
public class ToChildBlockJoinQueryBuilder extends AbstractQueryBuilder<ToChildBlockJoinQueryBuilder> {
public static final String NAME = "to_child_block_join";

private static final TransportVersion TO_CHILD_BLOCK_JOIN_QUERY = TransportVersion.fromName("to_child_block_join_query");

private final QueryBuilder parentQueryBuilder;

public ToChildBlockJoinQueryBuilder(QueryBuilder parentQueryBuilder) {
Expand Down Expand Up @@ -108,6 +110,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY;
return TO_CHILD_BLOCK_JOIN_QUERY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ PipelineConfiguration build() {
}
}

private static final TransportVersion PIPELINE_TRACKING_INFO = TransportVersion.fromName("pipeline_tracking_info");

private final String id;
private final Map<String, Object> config;

Expand Down Expand Up @@ -253,7 +255,7 @@ PipelineConfiguration maybeUpgradeProcessors(String type, IngestMetadata.Process

/** Remove system properties from config if they aren't supported by the transport version */
private Map<String, Object> configForTransport(final TransportVersion transportVersion) {
final boolean transportSupportsNewProperties = transportVersion.onOrAfter(TransportVersions.PIPELINE_TRACKING_INFO);
final boolean transportSupportsNewProperties = transportVersion.supports(PIPELINE_TRACKING_INFO);
final boolean noNewProperties = config.containsKey(Pipeline.CREATED_DATE_MILLIS) == false
&& config.containsKey(Pipeline.MODIFIED_DATE_MILLIS) == false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.repositories;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -70,12 +71,16 @@ public record SnapshotStats(
long totalUploadReadTimeInMillis
) implements ToXContentObject, Writeable {

private static final TransportVersion EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO = TransportVersion.fromName(
"extended_snapshot_stats_in_node_info"
);

public static final SnapshotStats ZERO = new SnapshotStats(0, 0);

public static SnapshotStats readFrom(StreamInput in) throws IOException {
final long totalReadThrottledNanos = in.readVLong();
final long totalWriteThrottledNanos = in.readVLong();
if (in.getTransportVersion().onOrAfter(TransportVersions.EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO)) {
if (in.getTransportVersion().supports(EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO)) {
return new SnapshotStats(
in.readVLong(),
in.readVLong(),
Expand Down Expand Up @@ -128,7 +133,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(totalReadThrottledNanos);
out.writeVLong(totalWriteThrottledNanos);
if (out.getTransportVersion().onOrAfter(TransportVersions.EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO)) {
if (out.getTransportVersion().supports(EXTENDED_SNAPSHOT_STATS_IN_NODE_INFO)) {
out.writeVLong(shardSnapshotsStarted);
out.writeVLong(shardSnapshotsCompleted);
out.writeVLong(shardSnapshotsInProgress);
Expand Down
Loading