[Remove] LegacyESVersion.V_7_8_* and V_7_9_* constants (#4855)

* [Remove] LegacyESVersion.V_7_8_* and V_7_9_* constants Removes all usages of LegacyESVersion.V_7_8_ and LegacyESVersion.V_7_9 version constants along with ancient API logic. Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * update changelog Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * revert masterNodeTimeout method call Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * cleanup MappingUpdatedAction to remove unexecuted code Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * revert timeout deletion Signed-off-by: Nicholas Walter Knize <nknize@apache.org> Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Nov 1, 2022 · db418fb · db418fb
1 parent 34b6b09
commit db418fb
Show file tree

Hide file tree

Showing 40 changed files with 92 additions and 371 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -125,6 +125,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Remove deprecated serialization logic from pipeline aggs ([#4847](https://github.com/opensearch-project/OpenSearch/pull/4847))
 - Remove unused private methods ([#4926](https://github.com/opensearch-project/OpenSearch/pull/4926))
 - Revert PR 4656 to unblock Windows CI ([#4949](https://github.com/opensearch-project/OpenSearch/pull/4949))
+- Remove LegacyESVersion.V_7_8_ and V_7_9_ Constants ([#4855](https://github.com/opensearch-project/OpenSearch/pull/4855))
 
 ### Fixed
 - `opensearch-service.bat start` and `opensearch-service.bat manager` failing to run ([#4289](https://github.com/opensearch-project/OpenSearch/pull/4289))

diff --git a/server/src/main/java/org/opensearch/LegacyESVersion.java b/server/src/main/java/org/opensearch/LegacyESVersion.java
@@ -53,12 +53,6 @@ public class LegacyESVersion extends Version {
     public static final LegacyESVersion V_7_6_2 = new LegacyESVersion(7060299, org.apache.lucene.util.Version.LUCENE_8_4_0);
     public static final LegacyESVersion V_7_7_0 = new LegacyESVersion(7070099, org.apache.lucene.util.Version.LUCENE_8_5_1);
     public static final LegacyESVersion V_7_7_1 = new LegacyESVersion(7070199, org.apache.lucene.util.Version.LUCENE_8_5_1);
-    public static final LegacyESVersion V_7_8_0 = new LegacyESVersion(7080099, org.apache.lucene.util.Version.LUCENE_8_5_1);
-    public static final LegacyESVersion V_7_8_1 = new LegacyESVersion(7080199, org.apache.lucene.util.Version.LUCENE_8_5_1);
-    public static final LegacyESVersion V_7_9_0 = new LegacyESVersion(7090099, org.apache.lucene.util.Version.LUCENE_8_6_0);
-    public static final LegacyESVersion V_7_9_1 = new LegacyESVersion(7090199, org.apache.lucene.util.Version.LUCENE_8_6_2);
-    public static final LegacyESVersion V_7_9_2 = new LegacyESVersion(7090299, org.apache.lucene.util.Version.LUCENE_8_6_2);
-    public static final LegacyESVersion V_7_9_3 = new LegacyESVersion(7090399, org.apache.lucene.util.Version.LUCENE_8_6_2);
     public static final LegacyESVersion V_7_10_0 = new LegacyESVersion(7100099, org.apache.lucene.util.Version.LUCENE_8_7_0);
     public static final LegacyESVersion V_7_10_1 = new LegacyESVersion(7100199, org.apache.lucene.util.Version.LUCENE_8_7_0);
     public static final LegacyESVersion V_7_10_2 = new LegacyESVersion(7100299, org.apache.lucene.util.Version.LUCENE_8_7_0);

diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java
@@ -1576,13 +1576,13 @@ private enum OpenSearchExceptionHandle {
             org.opensearch.indices.recovery.PeerRecoveryNotFound.class,
             org.opensearch.indices.recovery.PeerRecoveryNotFound::new,
             158,
-            LegacyESVersion.V_7_9_0
+            UNKNOWN_VERSION_ADDED
         ),
         NODE_HEALTH_CHECK_FAILURE_EXCEPTION(
             org.opensearch.cluster.coordination.NodeHealthCheckFailureException.class,
             org.opensearch.cluster.coordination.NodeHealthCheckFailureException::new,
             159,
-            LegacyESVersion.V_7_9_0
+            UNKNOWN_VERSION_ADDED
         ),
         NO_SEED_NODE_LEFT_EXCEPTION(
             org.opensearch.transport.NoSeedNodeLeftException.class,

diff --git a/server/src/main/java/org/opensearch/action/DocWriteRequest.java b/server/src/main/java/org/opensearch/action/DocWriteRequest.java
@@ -231,8 +231,7 @@ public static OpType fromString(String sOpType) {
      * Read a document write (index/delete/update) request
      *
      * @param shardId shard id of the request. {@code null} when reading as part of a {@link org.opensearch.action.bulk.BulkRequest}
-     *                that does not have a unique shard id or when reading from a stream of version older than
-     *                {@link org.opensearch.action.bulk.BulkShardRequest#COMPACT_SHARD_ID_VERSION}
+     *                that does not have a unique shard id
      */
     static DocWriteRequest<?> readDocumentRequest(@Nullable ShardId shardId, StreamInput in) throws IOException {
         byte type = in.readByte();

diff --git a/...a/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java b/...a/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.action.admin.cluster.configuration;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
 import org.opensearch.cluster.ClusterState;
@@ -110,13 +109,8 @@ public AddVotingConfigExclusionsRequest(String[] nodeDescriptions, String[] node
     public AddVotingConfigExclusionsRequest(StreamInput in) throws IOException {
         super(in);
         nodeDescriptions = in.readStringArray();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            nodeIds = in.readStringArray();
-            nodeNames = in.readStringArray();
-        } else {
-            nodeIds = Strings.EMPTY_ARRAY;
-            nodeNames = Strings.EMPTY_ARRAY;
-        }
+        nodeIds = in.readStringArray();
+        nodeNames = in.readStringArray();
         timeout = in.readTimeValue();
 
         if (nodeDescriptions.length > 0) {
@@ -249,10 +243,8 @@ public ActionRequestValidationException validate() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(nodeDescriptions);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            out.writeStringArray(nodeIds);
-            out.writeStringArray(nodeNames);
-        }
+        out.writeStringArray(nodeIds);
+        out.writeStringArray(nodeNames);
         out.writeTimeValue(timeout);
     }
 

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.admin.cluster.node.stats;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
 import org.opensearch.action.support.nodes.BaseNodeResponse;
 import org.opensearch.cluster.node.DiscoveryNode;
@@ -138,18 +137,10 @@ public NodeStats(StreamInput in) throws IOException {
         ingestStats = in.readOptionalWriteable(IngestStats::new);
         adaptiveSelectionStats = in.readOptionalWriteable(AdaptiveSelectionStats::new);
         scriptCacheStats = null;
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            if (in.getVersion().before(LegacyESVersion.V_7_9_0)) {
-                scriptCacheStats = in.readOptionalWriteable(ScriptCacheStats::new);
-            } else if (scriptStats != null) {
-                scriptCacheStats = scriptStats.toScriptCacheStats();
-            }
-        }
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-            indexingPressureStats = in.readOptionalWriteable(IndexingPressureStats::new);
-        } else {
-            indexingPressureStats = null;
+        if (scriptStats != null) {
+            scriptCacheStats = scriptStats.toScriptCacheStats();
         }
+        indexingPressureStats = in.readOptionalWriteable(IndexingPressureStats::new);
         if (in.getVersion().onOrAfter(Version.V_1_2_0)) {
             shardIndexingPressureStats = in.readOptionalWriteable(ShardIndexingPressureStats::new);
         } else {
@@ -327,12 +318,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(discoveryStats);
         out.writeOptionalWriteable(ingestStats);
         out.writeOptionalWriteable(adaptiveSelectionStats);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0) && out.getVersion().before(LegacyESVersion.V_7_9_0)) {
-            out.writeOptionalWriteable(scriptCacheStats);
-        }
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-            out.writeOptionalWriteable(indexingPressureStats);
-        }
+        out.writeOptionalWriteable(indexingPressureStats);
         if (out.getVersion().onOrAfter(Version.V_1_2_0)) {
             out.writeOptionalWriteable(shardIndexingPressureStats);
         }

diff --git a/...c/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java b/...c/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.admin.cluster.node.tasks.cancel;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.action.support.tasks.BaseTasksRequest;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -60,18 +59,14 @@ public CancelTasksRequest() {}
     public CancelTasksRequest(StreamInput in) throws IOException {
         super(in);
         this.reason = in.readString();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            waitForCompletion = in.readBoolean();
-        }
+        waitForCompletion = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeString(reason);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            out.writeBoolean(waitForCompletion);
-        }
+        out.writeBoolean(waitForCompletion);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodeUsage.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodeUsage.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.admin.cluster.node.usage;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.action.support.nodes.BaseNodeResponse;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.io.stream.StreamInput;
@@ -61,11 +60,7 @@ public NodeUsage(StreamInput in) throws IOException {
         timestamp = in.readLong();
         sinceTime = in.readLong();
         restUsage = (Map<String, Long>) in.readGenericValue();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            aggregationUsage = (Map<String, Object>) in.readGenericValue();
-        } else {
-            aggregationUsage = null;
-        }
+        aggregationUsage = (Map<String, Object>) in.readGenericValue();
     }
 
     /**
@@ -144,9 +139,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeLong(timestamp);
         out.writeLong(sinceTime);
         out.writeGenericValue(restUsage);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            out.writeGenericValue(aggregationUsage);
-        }
+        out.writeGenericValue(aggregationUsage);
     }
 
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.admin.cluster.node.usage;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.action.support.nodes.BaseNodesRequest;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -52,9 +51,7 @@ public class NodesUsageRequest extends BaseNodesRequest<NodesUsageRequest> {
     public NodesUsageRequest(StreamInput in) throws IOException {
         super(in);
         this.restActions = in.readBoolean();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            this.aggregations = in.readBoolean();
-        }
+        this.aggregations = in.readBoolean();
     }
 
     /**
@@ -116,8 +113,6 @@ public NodesUsageRequest aggregations(boolean aggregations) {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeBoolean(restActions);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            out.writeBoolean(aggregations);
-        }
+        out.writeBoolean(aggregations);
     }
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
@@ -281,11 +281,7 @@ public AliasActions(StreamInput in) throws IOException {
                 isHidden = in.readOptionalBoolean();
             }
             originalAliases = in.readStringArray();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-                mustExist = in.readOptionalBoolean();
-            } else {
-                mustExist = null;
-            }
+            mustExist = in.readOptionalBoolean();
         }
 
         @Override
@@ -303,9 +299,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeOptionalBoolean(isHidden);
             }
             out.writeStringArray(originalAliases);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-                out.writeOptionalBoolean(mustExist);
-            }
+            out.writeOptionalBoolean(mustExist);
         }
 
         /**

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexResponse.java
@@ -33,7 +33,6 @@
 package org.opensearch.action.admin.indices.get;
 
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.cluster.metadata.AliasMetadata;
@@ -152,14 +151,12 @@ public GetIndexResponse(
         }
         defaultSettings = defaultSettingsMapBuilder.build();
 
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            ImmutableOpenMap.Builder<String, String> dataStreamsMapBuilder = ImmutableOpenMap.builder();
-            int dataStreamsSize = in.readVInt();
-            for (int i = 0; i < dataStreamsSize; i++) {
-                dataStreamsMapBuilder.put(in.readString(), in.readOptionalString());
-            }
-            dataStreams = dataStreamsMapBuilder.build();
+        ImmutableOpenMap.Builder<String, String> dataStreamsMapBuilder = ImmutableOpenMap.builder();
+        int dataStreamsSize = in.readVInt();
+        for (int i = 0; i < dataStreamsSize; i++) {
+            dataStreamsMapBuilder.put(in.readString(), in.readOptionalString());
         }
+        dataStreams = dataStreamsMapBuilder.build();
     }
 
     public String[] indices() {
@@ -272,12 +269,10 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(indexEntry.key);
             Settings.writeSettingsToStream(indexEntry.value, out);
         }
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_8_0)) {
-            out.writeVInt(dataStreams.size());
-            for (ObjectObjectCursor<String, String> indexEntry : dataStreams) {
-                out.writeString(indexEntry.key);
-                out.writeOptionalString(indexEntry.value);
-            }
+        out.writeVInt(dataStreams.size());
+        for (ObjectObjectCursor<String, String> indexEntry : dataStreams) {
+            out.writeString(indexEntry.key);
+            out.writeOptionalString(indexEntry.value);
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java
@@ -33,7 +33,6 @@
 package org.opensearch.action.admin.indices.mapping.put;
 
 import com.carrotsearch.hppc.ObjectHashSet;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.OpenSearchGenerationException;
 import org.opensearch.Version;
 import org.opensearch.action.ActionRequestValidationException;
@@ -119,9 +118,7 @@ public PutMappingRequest(StreamInput in) throws IOException {
         source = in.readString();
         concreteIndex = in.readOptionalWriteable(Index::new);
         origin = in.readOptionalString();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-            writeIndexOnly = in.readBoolean();
-        }
+        writeIndexOnly = in.readBoolean();
     }
 
     public PutMappingRequest() {}
@@ -348,9 +345,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(source);
         out.writeOptionalWriteable(concreteIndex);
         out.writeOptionalString(origin);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_7_9_0)) {
-            out.writeBoolean(writeIndexOnly);
-        }
+        out.writeBoolean(writeIndexOnly);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java b/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java
@@ -59,8 +59,7 @@ public class BulkItemRequest implements Writeable, Accountable {
     private volatile BulkItemResponse primaryResponse;
 
     /**
-     * @param shardId {@code null} if reading from a stream before {@link BulkShardRequest#COMPACT_SHARD_ID_VERSION} to force BwC read
-     *                            that includes shard id
+     * @param shardId the shard id
      */
     BulkItemRequest(@Nullable ShardId shardId, StreamInput in) throws IOException {
         id = in.readVInt();

diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkShardRequest.java b/server/src/main/java/org/opensearch/action/bulk/BulkShardRequest.java
@@ -34,8 +34,6 @@
 
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.RamUsageEstimator;
-import org.opensearch.LegacyESVersion;
-import org.opensearch.Version;
 import org.opensearch.action.support.replication.ReplicatedWriteRequest;
 import org.opensearch.action.support.replication.ReplicationRequest;
 import org.opensearch.common.io.stream.StreamInput;
@@ -54,14 +52,13 @@
  */
 public class BulkShardRequest extends ReplicatedWriteRequest<BulkShardRequest> implements Accountable {
 
-    public static final Version COMPACT_SHARD_ID_VERSION = LegacyESVersion.V_7_9_0;
     private static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(BulkShardRequest.class);
 
     private final BulkItemRequest[] items;
 
     public BulkShardRequest(StreamInput in) throws IOException {
         super(in);
-        final ShardId itemShardId = in.getVersion().onOrAfter(COMPACT_SHARD_ID_VERSION) ? shardId : null;
+        final ShardId itemShardId = shardId;
         items = in.readArray(i -> i.readOptionalWriteable(inpt -> new BulkItemRequest(itemShardId, inpt)), BulkItemRequest[]::new);
     }
 
@@ -95,14 +92,14 @@ public String[] indices() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeArray(out.getVersion().onOrAfter(COMPACT_SHARD_ID_VERSION) ? (o, item) -> {
+        out.writeArray((o, item) -> {
             if (item != null) {
                 o.writeBoolean(true);
                 item.writeThin(o);
             } else {
                 o.writeBoolean(false);
             }
-        } : StreamOutput::writeOptionalWriteable, items);
+        }, items);
     }
 
     @Override