diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 44d1e479c4202..9ea351a5fc844 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -61,8 +61,6 @@ static TransportVersion def(int id) { public static final TransportVersion V_7_9_0 = def(7_09_00_99); public static final TransportVersion V_7_10_0 = def(7_10_00_99); public static final TransportVersion V_8_0_0 = def(8_00_00_99); - public static final TransportVersion V_8_6_0 = def(8_06_00_99); - public static final TransportVersion V_8_6_1 = def(8_06_01_99); public static final TransportVersion V_8_7_0 = def(8_07_00_99); public static final TransportVersion V_8_7_1 = def(8_07_01_99); public static final TransportVersion V_8_8_0 = def(8_08_00_99); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java index 36fdae98f35c8..79444576c2e85 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java @@ -40,11 +40,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException { this.nodeInfo = new NodeInfo(in); this.nodeStats = new NodeStats(in); this.shardsStats = in.readArray(ShardStats::new, ShardStats[]::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchUsageStats = new SearchUsageStats(in); - } else { - searchUsageStats = new SearchUsageStats(); - } + searchUsageStats = new SearchUsageStats(in); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { repositoryUsageStats = RepositoryUsageStats.readFrom(in); searchCcsMetrics = new CCSTelemetrySnapshot(in); @@ -120,9 +116,7 @@ public void writeTo(StreamOutput out) throws IOException { nodeInfo.writeTo(out); nodeStats.writeTo(out); out.writeArray(shardsStats); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchUsageStats.writeTo(out); - } + searchUsageStats.writeTo(out); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { repositoryUsageStats.writeTo(out); searchCcsMetrics.writeTo(out); diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java index 4689ae20b5ac1..0f45712d19795 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.support.ChannelActionListener; @@ -92,8 +91,6 @@ public class PublicationTransportHandler { TransportRequestOptions.Type.STATE ); - public static final TransportVersion INCLUDES_LAST_COMMITTED_DATA_VERSION = TransportVersions.V_8_6_0; - private final SerializationStatsTracker serializationStatsTracker = new SerializationStatsTracker(); public PublicationTransportHandler( @@ -187,29 +184,20 @@ private ClusterState deserializeAndApplyDiff(BytesTransportRequest request, Stre ClusterState incomingState; try { final Diff diff; - final boolean includesLastCommittedData = request.version().onOrAfter(INCLUDES_LAST_COMMITTED_DATA_VERSION); final boolean clusterUuidCommitted; final CoordinationMetadata.VotingConfiguration lastCommittedConfiguration; // Close stream early to release resources used by the de-compression as early as possible try (StreamInput input = in) { diff = ClusterState.readDiffFrom(input, currentState.nodes().getLocalNode()); - if (includesLastCommittedData) { - clusterUuidCommitted = in.readBoolean(); - lastCommittedConfiguration = new CoordinationMetadata.VotingConfiguration(in); - } else { - clusterUuidCommitted = false; - lastCommittedConfiguration = null; - } + clusterUuidCommitted = in.readBoolean(); + lastCommittedConfiguration = new CoordinationMetadata.VotingConfiguration(in); assert input.read() == -1; } incomingState = diff.apply(currentState); // might throw IncompatibleClusterStateVersionException - if (includesLastCommittedData) { - final var adjustedMetadata = incomingState.metadata() - .withLastCommittedValues(clusterUuidCommitted, lastCommittedConfiguration); - if (adjustedMetadata != incomingState.metadata()) { - incomingState = ClusterState.builder(incomingState).metadata(adjustedMetadata).build(); - } + final var adjustedMetadata = incomingState.metadata().withLastCommittedValues(clusterUuidCommitted, lastCommittedConfiguration); + if (adjustedMetadata != incomingState.metadata()) { + incomingState = ClusterState.builder(incomingState).metadata(adjustedMetadata).build(); } } catch (IncompatibleClusterStateVersionException e) { incompatibleClusterStateDiffReceivedCount.incrementAndGet(); @@ -305,10 +293,8 @@ private ReleasableBytesReference serializeDiffClusterState( stream.setTransportVersion(version); stream.writeBoolean(false); diff.writeTo(stream); - if (version.onOrAfter(INCLUDES_LAST_COMMITTED_DATA_VERSION)) { - stream.writeBoolean(newState.metadata().clusterUUIDCommitted()); - newState.getLastCommittedConfiguration().writeTo(stream); - } + stream.writeBoolean(newState.metadata().clusterUUIDCommitted()); + newState.getLastCommittedConfiguration().writeTo(stream); uncompressedBytes = stream.position(); } catch (IOException e) { throw new ElasticsearchException("failed to serialize cluster state diff for publishing to node {}", e, node); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java index 0c0f617ff29cb..1de3df99aa60d 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java @@ -610,8 +610,6 @@ public Iterator> settings() { public static final String INDEX_STATE_FILE_PREFIX = "state-"; - static final TransportVersion STATS_AND_FORECAST_ADDED = TransportVersions.V_8_6_0; - private final int routingNumShards; private final int routingFactor; private final int routingPartitionSize; @@ -1726,15 +1724,9 @@ private static class IndexMetadataDiff implements Diff { } isSystem = in.readBoolean(); timestampRange = IndexLongFieldRange.readFrom(in); - if (in.getTransportVersion().onOrAfter(STATS_AND_FORECAST_ADDED)) { - stats = in.readOptionalWriteable(IndexMetadataStats::new); - indexWriteLoadForecast = in.readOptionalDouble(); - shardSizeInBytesForecast = in.readOptionalLong(); - } else { - stats = null; - indexWriteLoadForecast = null; - shardSizeInBytesForecast = null; - } + stats = in.readOptionalWriteable(IndexMetadataStats::new); + indexWriteLoadForecast = in.readOptionalDouble(); + shardSizeInBytesForecast = in.readOptionalLong(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) { eventIngestedRange = IndexLongFieldRange.readFrom(in); } else { @@ -1773,11 +1765,9 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeBoolean(isSystem); timestampRange.writeTo(out); - if (out.getTransportVersion().onOrAfter(STATS_AND_FORECAST_ADDED)) { - out.writeOptionalWriteable(stats); - out.writeOptionalDouble(indexWriteLoadForecast); - out.writeOptionalLong(shardSizeInBytesForecast); - } + out.writeOptionalWriteable(stats); + out.writeOptionalDouble(indexWriteLoadForecast); + out.writeOptionalLong(shardSizeInBytesForecast); eventIngestedRange.writeTo(out); if (out.getTransportVersion().supports(INDEX_RESHARDING_METADATA)) { out.writeOptionalWriteable(reshardingMetadata); @@ -1880,11 +1870,9 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function fieldStatistics) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/profile/SearchProfileQueryPhaseResult.java b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileQueryPhaseResult.java index 7146a3a50ee1b..906f45739a05c 100644 --- a/server/src/main/java/org/elasticsearch/search/profile/SearchProfileQueryPhaseResult.java +++ b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileQueryPhaseResult.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.profile; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -43,9 +42,7 @@ public SearchProfileQueryPhaseResult( } public SearchProfileQueryPhaseResult(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - searchProfileDfsPhaseResult = in.readOptionalWriteable(SearchProfileDfsPhaseResult::new); - } + searchProfileDfsPhaseResult = in.readOptionalWriteable(SearchProfileDfsPhaseResult::new); int profileSize = in.readVInt(); List queryProfileResults = new ArrayList<>(profileSize); for (int i = 0; i < profileSize; i++) { @@ -58,9 +55,7 @@ public SearchProfileQueryPhaseResult(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeOptionalWriteable(searchProfileDfsPhaseResult); - } + out.writeOptionalWriteable(searchProfileDfsPhaseResult); out.writeVInt(queryProfileResults.size()); for (QueryProfileShardResult queryShardResult : queryProfileResults) { queryShardResult.writeTo(out); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java index ea911e6f2874f..f8c6a380314d5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java @@ -278,22 +278,14 @@ public Response(StreamInput in) throws IOException { super(in); // Multiple results added in 8.6.1 - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_1)) { - results = in.readNamedWriteableCollectionAsList(InferenceResults.class); - } else { - results = List.of(in.readNamedWriteable(InferenceResults.class)); - } + results = in.readNamedWriteableCollectionAsList(InferenceResults.class); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_1)) { - out.writeNamedWriteableCollection(results); - } else { - out.writeNamedWriteable(results.get(0)); - } + out.writeNamedWriteableCollection(results); } public List getResults() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java index 6cad4457ad753..93b93d6fa732b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java @@ -176,11 +176,7 @@ public Request(StreamInput in) throws IOException { threadsPerAllocation = in.readVInt(); queueCapacity = in.readVInt(); this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.priority = in.readEnum(Priority.class); - } else { - this.priority = Priority.NORMAL; - } + this.priority = in.readEnum(Priority.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { this.deploymentId = in.readString(); } else { @@ -302,9 +298,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(threadsPerAllocation); out.writeVInt(queueCapacity); out.writeOptionalWriteable(cacheSize); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } + out.writeEnum(priority); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeString(deploymentId); } @@ -574,11 +568,7 @@ public TaskParams(StreamInput in) throws IOException { this.numberOfAllocations = in.readVInt(); this.queueCapacity = in.readVInt(); this.cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.priority = in.readEnum(Priority.class); - } else { - this.priority = Priority.NORMAL; - } + this.priority = in.readEnum(Priority.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { this.deploymentId = in.readString(); } else { @@ -638,9 +628,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(numberOfAllocations); out.writeVInt(queueCapacity); out.writeOptionalWriteable(cacheSize); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } + out.writeEnum(priority); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeString(deploymentId); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java index b6cf767f38389..7048ef26f71d6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AssignmentStats.java @@ -454,11 +454,7 @@ public AssignmentStats(StreamInput in) throws IOException { reason = in.readOptionalString(); allocationStatus = in.readOptionalWriteable(AllocationStatus::new); cacheSize = in.readOptionalWriteable(ByteSizeValue::readFrom); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - priority = in.readEnum(Priority.class); - } else { - priority = Priority.NORMAL; - } + priority = in.readEnum(Priority.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { deploymentId = in.readString(); } else { @@ -641,9 +637,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(reason); out.writeOptionalWriteable(allocationStatus); out.writeOptionalWriteable(cacheSize); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeEnum(priority); - } + out.writeEnum(priority); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeString(deploymentId); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java index 3b4d5b6a72654..18026f8fb2a26 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.results; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -217,9 +216,7 @@ public AnomalyRecord(StreamInput in) throws IOException { influences = in.readCollectionAsList(Influence::new); } geoResults = in.readOptionalWriteable(GeoResults::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - anomalyScoreExplanation = in.readOptionalWriteable(AnomalyScoreExplanation::new); - } + anomalyScoreExplanation = in.readOptionalWriteable(AnomalyScoreExplanation::new); } @Override @@ -264,9 +261,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeCollection(influences); } out.writeOptionalWriteable(geoResults); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeOptionalWriteable(anomalyScoreExplanation); - } + out.writeOptionalWriteable(anomalyScoreExplanation); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java index 16e25f031cd55..adc07655bcd0f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformStats.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -89,12 +88,8 @@ public TransformStats(StreamInput in) throws IOException { this.indexerStats = new TransformIndexerStats(in); this.checkpointingInfo = new TransformCheckpointingInfo(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - if (in.readBoolean()) { - this.health = new TransformHealth(in); - } else { - this.health = null; - } + if (in.readBoolean()) { + this.health = new TransformHealth(in); } else { this.health = null; } @@ -133,13 +128,11 @@ public void writeTo(StreamOutput out) throws IOException { } indexerStats.writeTo(out); checkpointingInfo.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - if (health != null) { - out.writeBoolean(true); - health.writeTo(out); - } else { - out.writeBoolean(false); - } + if (health != null) { + out.writeBoolean(true); + health.writeTo(out); + } else { + out.writeBoolean(false); } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java index eb373080eee4a..62d26ead2b641 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentResponseTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.xcontent.NamedXContentRegistry; @@ -68,9 +67,6 @@ protected InferTrainedModelDeploymentAction.Response mutateInstanceForVersion( InferTrainedModelDeploymentAction.Response instance, TransportVersion version ) { - if (version.before(TransportVersions.V_8_6_1)) { - return new InferTrainedModelDeploymentAction.Response(instance.getResults().subList(0, 1)); - } return instance; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java index 3462663266e9a..447140f2f9571 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java @@ -51,7 +51,6 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java index 8eef570adc732..aed156493ec97 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/FrequentItemSetsAggregationBuilder.java @@ -166,11 +166,7 @@ public FrequentItemSetsAggregationBuilder(StreamInput in) throws IOException { this.minimumSupport = in.readDouble(); this.minimumSetSize = in.readVInt(); this.size = in.readVInt(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.filter = in.readOptionalNamedWriteable(QueryBuilder.class); - } else { - this.filter = null; - } + this.filter = in.readOptionalNamedWriteable(QueryBuilder.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { this.executionHint = in.readOptionalString(); } else { @@ -199,9 +195,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeDouble(minimumSupport); out.writeVInt(minimumSetSize); out.writeVInt(size); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeOptionalNamedWriteable(filter); - } + out.writeOptionalNamedWriteable(filter); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { out.writeOptionalString(executionHint); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java index f6d62b7b0f8dd..5368796778f82 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/ImmutableTransactionStore.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.ml.aggs.frequentitemsets; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.util.BigArrays; @@ -82,11 +81,7 @@ public ImmutableTransactionStore(StreamInput in, BigArrays bigArrays) throws IOE } this.totalTransactionCount = in.readVLong(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - this.filteredTransactionCount = in.readVLong(); - } else { - this.filteredTransactionCount = 0; - } + this.filteredTransactionCount = in.readVLong(); success = true; } finally { @@ -158,9 +153,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(transactionCounts.get(i)); } out.writeVLong(totalTransactionCount); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_6_0)) { - out.writeVLong(filteredTransactionCount); - } + out.writeVLong(filteredTransactionCount); } } diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java index 549c7ffab7f29..379ca2954ea33 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.ql.execution.search.extractor; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -76,11 +75,7 @@ protected AbstractFieldHitExtractor(StreamInput in) throws IOException { String typeName = in.readOptionalString(); dataType = typeName != null ? loadTypeFromName(typeName) : null; hitName = in.readOptionalString(); - if (in.getTransportVersion().before(TransportVersions.V_8_6_0)) { - this.multiValueSupport = in.readBoolean() ? MultiValueSupport.LENIENT : MultiValueSupport.NONE; - } else { - this.multiValueSupport = in.readEnum(MultiValueSupport.class); - } + this.multiValueSupport = in.readEnum(MultiValueSupport.class); zoneId = readZoneId(in); } @@ -95,11 +90,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(fieldName); out.writeOptionalString(dataType == null ? null : dataType.typeName()); out.writeOptionalString(hitName); - if (out.getTransportVersion().before(TransportVersions.V_8_6_0)) { - out.writeBoolean(multiValueSupport != MultiValueSupport.NONE); - } else { - out.writeEnum(multiValueSupport); - } + out.writeEnum(multiValueSupport); } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianBoundsAggregationBuilder.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianBoundsAggregationBuilder.java index cbb02d6d7821c..4c0d9b2a72c36 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianBoundsAggregationBuilder.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianBoundsAggregationBuilder.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.spatial.search.aggregations.metrics; 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.search.aggregations.AggregationBuilder; @@ -35,6 +34,7 @@ public class CartesianBoundsAggregationBuilder extends ValuesSourceAggregationBu NAME, CartesianBoundsAggregationBuilder::new ); + static { ValuesSourceAggregationBuilder.declareFields(PARSER, false, false, false); } @@ -101,6 +101,6 @@ public String getType() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_6_0; + return TransportVersion.minimumCompatible(); } } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianCentroidAggregationBuilder.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianCentroidAggregationBuilder.java index 340d80695458f..e26a696f7c829 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianCentroidAggregationBuilder.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/CartesianCentroidAggregationBuilder.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.spatial.search.aggregations.metrics; 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.search.aggregations.AggregationBuilder; @@ -38,6 +37,7 @@ public class CartesianCentroidAggregationBuilder extends ValuesSourceAggregation NAME, CartesianCentroidAggregationBuilder::new ); + static { ValuesSourceAggregationBuilder.declareFields(PARSER, true, false, false); } @@ -108,6 +108,6 @@ public String getType() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_6_0; + return TransportVersion.minimumCompatible(); } }