Reapply "Remove references to V8_1_0 transport version (#136239)" (#136560) (#139008)

This reverts commit efb3549.

Author: jdconrad

modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/timeseries/TimeSeriesAggregationBuilder.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.aggregations.bucket.timeseries;
 
 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.AbstractAggregationBuilder;
@@ -155,6 +154,6 @@ public int hashCode() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_1_0;
+        return TransportVersion.minimumCompatible();
     }
 }

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

@@ -64,7 +64,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_1_0 = def(8_01_00_99);
     public static final TransportVersion V_8_2_0 = def(8_02_00_99);
     public static final TransportVersion V_8_3_0 = def(8_03_00_99);
     public static final TransportVersion V_8_4_0 = def(8_04_00_99);

server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.action.admin.indices.stats;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ClusterStatsLevel;
 import org.elasticsearch.action.admin.indices.stats.IndexStats.IndexStatsBuilder;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
@@ -56,15 +55,10 @@ public class IndicesStatsResponse extends ChunkedBroadcastResponse {
     IndicesStatsResponse(StreamInput in) throws IOException {
         super(in);
         shards = in.readArray(ShardStats::new, ShardStats[]::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response
-            // where we only had health and state available.
-            indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
-            indexStateMap = in.readMap(IndexMetadata.State::readFrom);
-        } else {
-            indexHealthMap = Map.of();
-            indexStateMap = Map.of();
-        }
+        // Between 8.1 and INDEX_STATS_ADDITIONAL_FIELDS, we had a different format for the response
+        // where we only had health and state available.
+        indexHealthMap = in.readMap(ClusterHealthStatus::readFrom);
+        indexStateMap = in.readMap(IndexMetadata.State::readFrom);
     }
 
     @FixForMultiProject(description = "we can pass ProjectMetadata here")
@@ -179,10 +173,8 @@ public CommonStats getPrimaries() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeArray(shards);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
-            out.writeMap(indexStateMap, StreamOutput::writeWriteable);
-        }
+        out.writeMap(indexHealthMap, StreamOutput::writeWriteable);
+        out.writeMap(indexStateMap, StreamOutput::writeWriteable);
     }
 
     @Override

server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java

@@ -501,19 +501,7 @@ public DataStreamTemplate(boolean hidden, boolean allowCustomRouting) {
 
         DataStreamTemplate(StreamInput in) throws IOException {
             hidden = in.readBoolean();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-                allowCustomRouting = in.readBoolean();
-            } else {
-                allowCustomRouting = false;
-            }
-            if (in.getTransportVersion().between(TransportVersions.V_8_1_0, TransportVersions.V_8_3_0)) {
-                // Accidentally included index_mode to binary node to node protocol in previous releases.
-                // (index_mode is removed and was part of code based when tsdb was behind a feature flag)
-                // (index_mode was behind a feature in the xcontent parser, so it could never actually used)
-                // (this used to be an optional enum, so just need to (de-)serialize a false boolean value here)
-                boolean value = in.readBoolean();
-                assert value == false : "expected false, because this used to be an optional enum that never got set";
-            }
+            allowCustomRouting = in.readBoolean();
         }
 
         /**
@@ -545,13 +533,7 @@ public boolean isAllowCustomRouting() {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(hidden);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-                out.writeBoolean(allowCustomRouting);
-            }
-            if (out.getTransportVersion().between(TransportVersions.V_8_1_0, TransportVersions.V_8_3_0)) {
-                // See comment in constructor.
-                out.writeBoolean(false);
-            }
+            out.writeBoolean(allowCustomRouting);
         }
 
         @Override

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

@@ -271,8 +271,8 @@ public static DataStream read(StreamInput in) throws IOException {
         var hidden = in.readBoolean();
         var replicated = in.readBoolean();
         var system = in.readBoolean();
-        var allowCustomRouting = in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0) ? in.readBoolean() : false;
-        var indexMode = in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0) ? in.readOptionalEnum(IndexMode.class) : null;
+        var allowCustomRouting = in.readBoolean();
+        var indexMode = in.readOptionalEnum(IndexMode.class);
         var lifecycle = in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)
             ? in.readOptionalWriteable(DataStreamLifecycle::new)
             : null;
@@ -1361,12 +1361,8 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(hidden);
         out.writeBoolean(replicated);
         out.writeBoolean(system);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-            out.writeBoolean(allowCustomRouting);
-        }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            out.writeOptionalEnum(indexMode);
-        }
+        out.writeBoolean(allowCustomRouting);
+        out.writeOptionalEnum(indexMode);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
             out.writeOptionalWriteable(lifecycle);
         }

server/src/main/java/org/elasticsearch/cluster/metadata/DesiredNodesMetadata.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.cluster.metadata;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.AbstractNamedDiffable;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.NamedDiff;
@@ -29,7 +28,6 @@
 import java.util.Objects;
 
 public class DesiredNodesMetadata extends AbstractNamedDiffable<Metadata.ClusterCustom> implements Metadata.ClusterCustom {
-    private static final TransportVersion MIN_SUPPORTED_VERSION = TransportVersions.V_8_1_0;
     public static final String TYPE = "desired_nodes";
 
     public static final DesiredNodesMetadata EMPTY = new DesiredNodesMetadata((DesiredNodes) null);
@@ -96,7 +94,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return MIN_SUPPORTED_VERSION;
+        return TransportVersion.minimumCompatible();
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/search/stats/FieldUsageStats.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.index.search.stats;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -211,11 +210,7 @@ public PerFieldUsageStats(StreamInput in) throws IOException {
             payloads = in.readVLong();
             termVectors = in.readVLong();
             points = in.readVLong();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-                knnVectors = in.readVLong();
-            } else {
-                knnVectors = 0;
-            }
+            knnVectors = in.readVLong();
         }
 
         @Override
@@ -233,9 +228,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVLong(payloads);
             out.writeVLong(termVectors);
             out.writeVLong(points);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-                out.writeVLong(knnVectors);
-            }
+            out.writeVLong(knnVectors);
         }
 
         @Override

server/src/main/java/org/elasticsearch/script/ScriptContextStats.java

@@ -61,16 +61,8 @@ public static ScriptContextStats read(StreamInput in) throws IOException {
         var compilationLimitTriggered = in.readVLong();
         TimeSeries compilationsHistory;
         TimeSeries cacheEvictionsHistory;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            compilationsHistory = new TimeSeries(in);
-            cacheEvictionsHistory = new TimeSeries(in);
-        } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) {
-            compilationsHistory = new TimeSeries(in).withTotal(compilations);
-            cacheEvictionsHistory = new TimeSeries(in).withTotal(cacheEvictions);
-        } else {
-            compilationsHistory = new TimeSeries(compilations);
-            cacheEvictionsHistory = new TimeSeries(cacheEvictions);
-        }
+        compilationsHistory = new TimeSeries(in);
+        cacheEvictionsHistory = new TimeSeries(in);
         return new ScriptContextStats(
             context,
             compilations,

server/src/main/java/org/elasticsearch/script/ScriptStats.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.script;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -130,17 +129,10 @@ public static ScriptStats read(StreamInput in) throws IOException {
         TimeSeries cacheEvictionsHistory;
         long compilations;
         long cacheEvictions;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            compilationsHistory = new TimeSeries(in);
-            cacheEvictionsHistory = new TimeSeries(in);
-            compilations = compilationsHistory.total;
-            cacheEvictions = cacheEvictionsHistory.total;
-        } else {
-            compilations = in.readVLong();
-            cacheEvictions = in.readVLong();
-            compilationsHistory = new TimeSeries(compilations);
-            cacheEvictionsHistory = new TimeSeries(cacheEvictions);
-        }
+        compilationsHistory = new TimeSeries(in);
+        cacheEvictionsHistory = new TimeSeries(in);
+        compilations = compilationsHistory.total;
+        cacheEvictions = cacheEvictionsHistory.total;
         var compilationLimitTriggered = in.readVLong();
         var contextStats = in.readCollectionAsList(ScriptContextStats::read);
         return new ScriptStats(
@@ -155,13 +147,8 @@ public static ScriptStats read(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            compilationsHistory.writeTo(out);
-            cacheEvictionsHistory.writeTo(out);
-        } else {
-            out.writeVLong(compilations);
-            out.writeVLong(cacheEvictions);
-        }
+        compilationsHistory.writeTo(out);
+        cacheEvictionsHistory.writeTo(out);
         out.writeVLong(compilationLimitTriggered);
         out.writeCollection(contextStats);
     }

server/src/main/java/org/elasticsearch/script/TimeSeries.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.script;
 
-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;
@@ -59,11 +58,7 @@ public TimeSeries(StreamInput in) throws IOException {
         fiveMinutes = in.readVLong();
         fifteenMinutes = in.readVLong();
         twentyFourHours = in.readVLong();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            total = in.readVLong();
-        } else {
-            total = 0;
-        }
+        total = in.readVLong();
     }
 
     @Override
@@ -80,9 +75,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(fiveMinutes);
         out.writeVLong(fifteenMinutes);
         out.writeVLong(twentyFourHours);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_1_0)) {
-            out.writeVLong(total);
-        }
+        out.writeVLong(total);
     }
 
     public boolean areTimingsEmpty() {