Remove LegacyESVersion.V_6_3_x constants (#1691)

This commit removes LegacyESVersion.V_6_3_x constants including all pre-release versions and bug fixes. Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Dec 17, 2021 · 3f210dc · 3f210dc
1 parent 4a82eb9
commit 3f210dc
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 209 deletions.
diff --git a/server/src/main/java/org/opensearch/Build.java b/server/src/main/java/org/opensearch/Build.java
@@ -215,15 +215,11 @@ public static Build readBuild(StreamInput in) throws IOException {
         // (Integ test zip still write OSS as distribution)
         // See issue: https://github.com/opendistro-for-elasticsearch/search/issues/159
         // todo change to V_1_3_0 after backporting
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0) && in.getVersion().before(Version.V_2_0_0)) {
+        if (in.getVersion().before(Version.V_2_0_0)) {
             String flavor = in.readString();
         }
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            // be lenient when reading on the wire, the enumeration values from other versions might be different than what we know
-            type = Type.fromDisplayName(in.readString(), false);
-        } else {
-            type = Type.UNKNOWN;
-        }
+        // be lenient when reading on the wire, the enumeration values from other versions might be different than what we know
+        type = Type.fromDisplayName(in.readString(), false);
         String hash = in.readString();
         String date = in.readString();
         boolean snapshot = in.readBoolean();
@@ -247,18 +243,16 @@ public static void writeBuild(Build build, StreamOutput out) throws IOException
         // TODO - clean up this code when we remove all v6 bwc tests.
         // TODO - clean this up when OSS flavor is removed in all of the code base
         // todo change to V_1_3_0 after backporting
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0) && out.getVersion().before(Version.V_2_0_0)) {
+        if (out.getVersion().before(Version.V_2_0_0)) {
             out.writeString("oss");
         }
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            final Type buildType;
-            if (out.getVersion().before(LegacyESVersion.V_6_7_0) && build.type() == Type.DOCKER) {
-                buildType = Type.TAR;
-            } else {
-                buildType = build.type();
-            }
-            out.writeString(buildType.displayName());
+        final Type buildType;
+        if (out.getVersion().before(LegacyESVersion.V_6_7_0) && build.type() == Type.DOCKER) {
+            buildType = Type.TAR;
+        } else {
+            buildType = build.type();
         }
+        out.writeString(buildType.displayName());
         out.writeString(build.hash());
         out.writeString(build.date());
         out.writeBoolean(build.isSnapshot());

diff --git a/server/src/main/java/org/opensearch/LegacyESVersion.java b/server/src/main/java/org/opensearch/LegacyESVersion.java
@@ -46,9 +46,6 @@
  */
 public class LegacyESVersion extends Version {
 
-    public static final LegacyESVersion V_6_3_0 = new LegacyESVersion(6030099, org.apache.lucene.util.Version.LUCENE_7_3_1);
-    public static final LegacyESVersion V_6_3_1 = new LegacyESVersion(6030199, org.apache.lucene.util.Version.LUCENE_7_3_1);
-    public static final LegacyESVersion V_6_3_2 = new LegacyESVersion(6030299, org.apache.lucene.util.Version.LUCENE_7_3_1);
     public static final LegacyESVersion V_6_4_0 = new LegacyESVersion(6040099, org.apache.lucene.util.Version.LUCENE_7_4_0);
     public static final LegacyESVersion V_6_4_1 = new LegacyESVersion(6040199, org.apache.lucene.util.Version.LUCENE_7_4_0);
     public static final LegacyESVersion V_6_4_2 = new LegacyESVersion(6040299, org.apache.lucene.util.Version.LUCENE_7_4_0);

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/reroute/ClusterRerouteResponse.java
@@ -34,7 +34,6 @@
 
 import org.opensearch.LegacyESVersion;
 import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.cluster.ClusterModule;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.routing.allocation.RoutingExplanations;
 import org.opensearch.common.io.stream.StreamInput;
@@ -89,11 +88,7 @@ public void writeTo(StreamOutput out) throws IOException {
             state.writeTo(out);
             RoutingExplanations.writeTo(explanations, out);
         } else {
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                state.writeTo(out);
-            } else {
-                ClusterModule.filterCustomsForPre63Clients(state).writeTo(out);
-            }
+            state.writeTo(out);
             out.writeBoolean(acknowledged);
             RoutingExplanations.writeTo(explanations, out);
         }

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateResponse.java
@@ -34,7 +34,6 @@
 
 import org.opensearch.LegacyESVersion;
 import org.opensearch.action.ActionResponse;
-import org.opensearch.cluster.ClusterModule;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNodes;
@@ -105,11 +104,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(LegacyESVersion.V_6_6_0)) {
             out.writeOptionalWriteable(clusterState);
         } else {
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                clusterState.writeTo(out);
-            } else {
-                ClusterModule.filterCustomsForPre63Clients(clusterState).writeTo(out);
-            }
+            clusterState.writeTo(out);
         }
         if (out.getVersion().before(LegacyESVersion.V_7_0_0)) {
             ByteSizeValue.ZERO.writeTo(out);

diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
@@ -235,9 +235,7 @@ public SearchRequest(StreamInput in) throws IOException {
         } else {
             preFilterShardSize = in.readVInt();
         }
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            allowPartialSearchResults = in.readOptionalBoolean();
-        }
+        allowPartialSearchResults = in.readOptionalBoolean();
         if (in.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
             localClusterAlias = in.readOptionalString();
             if (localClusterAlias != null) {
@@ -280,9 +278,7 @@ public void writeTo(StreamOutput out) throws IOException {
         } else {
             out.writeVInt(preFilterShardSize == null ? DEFAULT_BATCHED_REDUCE_SIZE : preFilterShardSize);
         }
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeOptionalBoolean(allowPartialSearchResults);
-        }
+        out.writeOptionalBoolean(allowPartialSearchResults);
         if (out.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
             out.writeOptionalString(localClusterAlias);
             if (localClusterAlias != null) {

diff --git a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
@@ -566,11 +566,7 @@ public static class FailedShardEntry extends TransportRequest {
             primaryTerm = in.readVLong();
             message = in.readString();
             failure = in.readException();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                markAsStale = in.readBoolean();
-            } else {
-                markAsStale = true;
-            }
+            markAsStale = in.readBoolean();
         }
 
         public FailedShardEntry(
@@ -605,9 +601,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVLong(primaryTerm);
             out.writeString(message);
             out.writeException(failure);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                out.writeBoolean(markAsStale);
-            }
+            out.writeBoolean(markAsStale);
         }
 
         @Override
@@ -825,19 +819,12 @@ public static class StartedShardEntry extends TransportRequest {
             super(in);
             shardId = new ShardId(in);
             allocationId = in.readString();
-            if (in.getVersion().before(LegacyESVersion.V_6_3_0)) {
-                primaryTerm = in.readVLong();
-                assert primaryTerm == UNASSIGNED_PRIMARY_TERM : "shard is only started by itself: primary term [" + primaryTerm + "]";
-            } else if (in.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
+            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
                 primaryTerm = in.readVLong();
             } else {
                 primaryTerm = UNASSIGNED_PRIMARY_TERM;
             }
             this.message = in.readString();
-            if (in.getVersion().before(LegacyESVersion.V_6_3_0)) {
-                final Exception ex = in.readException();
-                assert ex == null : "started shard must not have failure [" + ex + "]";
-            }
         }
 
         public StartedShardEntry(final ShardId shardId, final String allocationId, final long primaryTerm, final String message) {
@@ -852,15 +839,10 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             shardId.writeTo(out);
             out.writeString(allocationId);
-            if (out.getVersion().before(LegacyESVersion.V_6_3_0)) {
-                out.writeVLong(0L);
-            } else if (out.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
+            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_7_0)) {
                 out.writeVLong(primaryTerm);
             }
             out.writeString(message);
-            if (out.getVersion().before(LegacyESVersion.V_6_3_0)) {
-                out.writeException(null);
-            }
         }
 
         @Override

diff --git a/server/src/main/java/org/opensearch/index/flush/FlushStats.java b/server/src/main/java/org/opensearch/index/flush/FlushStats.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.index.flush;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
@@ -55,9 +54,7 @@ public FlushStats() {
     public FlushStats(StreamInput in) throws IOException {
         total = in.readVLong();
         totalTimeInMillis = in.readVLong();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            periodic = in.readVLong();
-        }
+        periodic = in.readVLong();
     }
 
     public FlushStats(long total, long periodic, long totalTimeInMillis) {
@@ -135,8 +132,6 @@ static final class Fields {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(total);
         out.writeVLong(totalTimeInMillis);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeVLong(periodic);
-        }
+        out.writeVLong(periodic);
     }
 }
diff --git a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java
@@ -693,26 +693,15 @@ public CheckpointState(StreamInput in) throws IOException {
             this.localCheckpoint = in.readZLong();
             this.globalCheckpoint = in.readZLong();
             this.inSync = in.readBoolean();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                this.tracked = in.readBoolean();
-            } else {
-                // Every in-sync shard copy is also tracked (see invariant). This was the case even in earlier OpenSearch versions.
-                // Non in-sync shard copies might be tracked or not. As this information here is only serialized during relocation hand-off,
-                // after which replica recoveries cannot complete anymore (i.e. they cannot move from in-sync == false to in-sync == true),
-                // we can treat non in-sync replica shard copies as untracked. They will go through a fresh recovery against the new
-                // primary and will become tracked again under this primary before they are marked as in-sync.
-                this.tracked = inSync;
-            }
+            this.tracked = in.readBoolean();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeZLong(localCheckpoint);
             out.writeZLong(globalCheckpoint);
             out.writeBoolean(inSync);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                out.writeBoolean(tracked);
-            }
+            out.writeBoolean(tracked);
         }
 
         /**

diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogStats.java b/server/src/main/java/org/opensearch/index/translog/TranslogStats.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.index.translog;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -57,9 +56,7 @@ public TranslogStats(StreamInput in) throws IOException {
         translogSizeInBytes = in.readVLong();
         uncommittedOperations = in.readVInt();
         uncommittedSizeInBytes = in.readVLong();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            earliestLastModifiedAge = in.readVLong();
-        }
+        earliestLastModifiedAge = in.readVLong();
     }
 
     public TranslogStats(
@@ -152,8 +149,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(translogSizeInBytes);
         out.writeVInt(uncommittedOperations);
         out.writeVLong(uncommittedSizeInBytes);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeVLong(earliestLastModifiedAge);
-        }
+        out.writeVLong(earliestLastModifiedAge);
     }
 }
diff --git a/server/src/main/java/org/opensearch/indices/flush/SyncedFlushService.java b/server/src/main/java/org/opensearch/indices/flush/SyncedFlushService.java
@@ -36,7 +36,6 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.OpenSearchException;
-import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.admin.indices.flush.FlushRequest;
@@ -700,9 +699,7 @@ static final class PreSyncedFlushResponse extends TransportResponse {
             super(in);
             commitId = new Engine.CommitId(in);
             numDocs = in.readInt();
-            if (includeExistingSyncId(in.getVersion())) {
-                existingSyncId = in.readOptionalString();
-            }
+            existingSyncId = in.readOptionalString();
         }
 
         PreSyncedFlushResponse(Engine.CommitId commitId, int numDocs, String existingSyncId) {
@@ -711,17 +708,11 @@ static final class PreSyncedFlushResponse extends TransportResponse {
             this.existingSyncId = existingSyncId;
         }
 
-        boolean includeExistingSyncId(Version version) {
-            return version.onOrAfter(LegacyESVersion.V_6_3_0);
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             commitId.writeTo(out);
             out.writeInt(numDocs);
-            if (includeExistingSyncId(out.getVersion())) {
-                out.writeOptionalString(existingSyncId);
-            }
+            out.writeOptionalString(existingSyncId);
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/persistent/PersistentTasksCustomMetadata.java b/server/src/main/java/org/opensearch/persistent/PersistentTasksCustomMetadata.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.persistent;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.ResourceNotFoundException;
 import org.opensearch.Version;
@@ -382,11 +381,7 @@ public PersistentTask(StreamInput in) throws IOException {
             id = in.readString();
             allocationId = in.readLong();
             taskName = in.readString();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                params = (P) in.readNamedWriteable(PersistentTaskParams.class);
-            } else {
-                params = (P) in.readOptionalNamedWriteable(PersistentTaskParams.class);
-            }
+            params = (P) in.readNamedWriteable(PersistentTaskParams.class);
             state = in.readOptionalNamedWriteable(PersistentTaskState.class);
             assignment = new Assignment(in.readOptionalString(), in.readString());
             allocationIdOnLastStatusUpdate = in.readOptionalLong();
@@ -397,11 +392,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(id);
             out.writeLong(allocationId);
             out.writeString(taskName);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                out.writeNamedWriteable(params);
-            } else {
-                out.writeOptionalNamedWriteable(params);
-            }
+            out.writeNamedWriteable(params);
             out.writeOptionalNamedWriteable(state);
             out.writeOptionalString(assignment.executorNode);
             out.writeString(assignment.explanation);

diff --git a/server/src/main/java/org/opensearch/persistent/StartPersistentTaskAction.java b/server/src/main/java/org/opensearch/persistent/StartPersistentTaskAction.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.persistent;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.ActionType;
@@ -83,11 +82,7 @@ public Request(StreamInput in) throws IOException {
             super(in);
             taskId = in.readString();
             taskName = in.readString();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                params = in.readNamedWriteable(PersistentTaskParams.class);
-            } else {
-                params = in.readOptionalNamedWriteable(PersistentTaskParams.class);
-            }
+            params = in.readNamedWriteable(PersistentTaskParams.class);
         }
 
         public Request(String taskId, String taskName, PersistentTaskParams params) {
@@ -101,11 +96,7 @@ public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(taskId);
             out.writeString(taskName);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-                out.writeNamedWriteable(params);
-            } else {
-                out.writeOptionalNamedWriteable(params);
-            }
+            out.writeNamedWriteable(params);
         }
 
         @Override