[Remove] Version.V_1_ constants (#5021)

* [Remove] Version.V_1_ constants Removes all usages of Version.V_1_ 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> * retain version utils version 1 check Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * remove v1 test from mincompat testing Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * fix versions and remove bwc test from pluginsInfoTests Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * remove unused es warning check Signed-off-by: Nicholas Walter Knize <nknize@apache.org> * improve legibility of removed v1 constant Signed-off-by: Nicholas Walter Knize <nknize@apache.org> Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Nov 2, 2022 · 8bbb194 · 8bbb194
1 parent 1466350
commit 8bbb194
Show file tree

Hide file tree

Showing 34 changed files with 87 additions and 322 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -134,6 +134,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Remove LegacyESVersion.V_7_8_ and V_7_9_ Constants ([#4855](https://github.com/opensearch-project/OpenSearch/pull/4855))
 - Remove LegacyESVersion.V_7_6_ and V_7_7_ Constants ([#4837](https://github.com/opensearch-project/OpenSearch/pull/4837))
 - Remove LegacyESVersion.V_7_10_ Constants ([#5018](https://github.com/opensearch-project/OpenSearch/pull/5018))
+- Remove Version.V_1_ Constants ([#5021](https://github.com/opensearch-project/OpenSearch/pull/5021))
 
 ### 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/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java
@@ -46,21 +46,16 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class MainResponseTests extends AbstractResponseTestCase<org.opensearch.action.main.MainResponse, MainResponse> {
+    private static String DISTRIBUTION = "opensearch";
+
     @Override
     protected org.opensearch.action.main.MainResponse createServerTestInstance(XContentType xContentType) {
         String clusterUuid = randomAlphaOfLength(10);
         ClusterName clusterName = new ClusterName(randomAlphaOfLength(10));
         String nodeName = randomAlphaOfLength(10);
         final String date = new Date(randomNonNegativeLong()).toString();
-        Version version = VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT);
-        Build build = new Build(
-            Build.Type.UNKNOWN,
-            randomAlphaOfLength(8),
-            date,
-            randomBoolean(),
-            version.toString(),
-            version.before(Version.V_1_0_0) ? null : "opensearch"
-        );
+        Version version = VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT);
+        Build build = new Build(Build.Type.UNKNOWN, randomAlphaOfLength(8), date, randomBoolean(), version.toString(), DISTRIBUTION);
         return new org.opensearch.action.main.MainResponse(nodeName, version, clusterName, clusterUuid, build);
     }
 

diff --git a/...analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/...analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java
@@ -83,7 +83,7 @@ public void testPreConfiguredTokenizer() throws IOException {
         {
             try (
                 IndexAnalyzers indexAnalyzers = buildAnalyzers(
-                    VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, VersionUtils.getPreviousVersion(Version.V_3_0_0)),
+                    VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, VersionUtils.getPreviousVersion(Version.V_3_0_0)),
                     "edgeNGram"
                 )
             ) {

diff --git a/...s/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java b/...s/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
@@ -230,7 +230,7 @@ public void testChainedSynonymFilters() throws IOException {
     public void testShingleFilters() {
 
         Settings settings = Settings.builder()
-            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT))
+            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT))
             .put("path.home", createTempDir().toString())
             .put("index.analysis.filter.synonyms.type", "synonym")
             .putList("index.analysis.filter.synonyms.synonyms", "programmer, developer")
@@ -289,7 +289,7 @@ public void testPreconfiguredTokenFilters() throws IOException {
         );
 
         Settings settings = Settings.builder()
-            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT))
+            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT))
             .put("path.home", createTempDir().toString())
             .build();
         IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@@ -313,7 +313,7 @@ public void testPreconfiguredTokenFilters() throws IOException {
     public void testDisallowedTokenFilters() throws IOException {
 
         Settings settings = Settings.builder()
-            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT))
+            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT))
             .put("path.home", createTempDir().toString())
             .putList("common_words", "a", "b")
             .put("output_unigrams", "true")

diff --git a/...is-phonetic/src/test/java/org/opensearch/index/analysis/AnalysisPhoneticFactoryTests.java b/...is-phonetic/src/test/java/org/opensearch/index/analysis/AnalysisPhoneticFactoryTests.java
@@ -64,7 +64,7 @@ public void testDisallowedWithSynonyms() throws IOException {
         AnalysisPhoneticPlugin plugin = new AnalysisPhoneticPlugin();
 
         Settings settings = Settings.builder()
-            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_1_0_0, Version.CURRENT))
+            .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT))
             .put("path.home", createTempDir().toString())
             .build();
         IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);

diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -75,20 +75,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final int V_EMPTY_ID = 0;
     public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
 
-    public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2);
-    public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0);
-    public static final Version V_1_2_0 = new Version(1020099, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_2_1 = new Version(1020199, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_2_2 = new Version(1020299, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_2_3 = new Version(1020399, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_2_4 = new Version(1020499, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_2_5 = new Version(1020599, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_0 = new Version(1030099, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_1 = new Version(1030199, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_2 = new Version(1030299, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_3 = new Version(1030399, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_4 = new Version(1030499, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_3_5 = new Version(1030599, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_2_0_1 = new Version(2000199, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_2_0_2 = new Version(2000299, org.apache.lucene.util.Version.LUCENE_9_1_0);

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.Version;
 import org.opensearch.action.support.nodes.BaseNodeResponse;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
@@ -141,12 +140,7 @@ public NodeStats(StreamInput in) throws IOException {
             scriptCacheStats = scriptStats.toScriptCacheStats();
         }
         indexingPressureStats = in.readOptionalWriteable(IndexingPressureStats::new);
-        if (in.getVersion().onOrAfter(Version.V_1_2_0)) {
-            shardIndexingPressureStats = in.readOptionalWriteable(ShardIndexingPressureStats::new);
-        } else {
-            shardIndexingPressureStats = null;
-        }
-
+        shardIndexingPressureStats = in.readOptionalWriteable(ShardIndexingPressureStats::new);
     }
 
     public NodeStats(
@@ -319,9 +313,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(ingestStats);
         out.writeOptionalWriteable(adaptiveSelectionStats);
         out.writeOptionalWriteable(indexingPressureStats);
-        if (out.getVersion().onOrAfter(Version.V_1_2_0)) {
-            out.writeOptionalWriteable(shardIndexingPressureStats);
-        }
+        out.writeOptionalWriteable(shardIndexingPressureStats);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java
@@ -87,10 +87,8 @@ public CommonStatsFlags(StreamInput in) throws IOException {
         completionDataFields = in.readStringArray();
         includeSegmentFileSizes = in.readBoolean();
         includeUnloadedSegments = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_1_2_0)) {
-            includeAllShardIndexingPressureTrackers = in.readBoolean();
-            includeOnlyTopIndexingPressureMetrics = in.readBoolean();
-        }
+        includeAllShardIndexingPressureTrackers = in.readBoolean();
+        includeOnlyTopIndexingPressureMetrics = in.readBoolean();
     }
 
     @Override
@@ -109,10 +107,8 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArrayNullable(completionDataFields);
         out.writeBoolean(includeSegmentFileSizes);
         out.writeBoolean(includeUnloadedSegments);
-        if (out.getVersion().onOrAfter(Version.V_1_2_0)) {
-            out.writeBoolean(includeAllShardIndexingPressureTrackers);
-            out.writeBoolean(includeOnlyTopIndexingPressureMetrics);
-        }
+        out.writeBoolean(includeAllShardIndexingPressureTrackers);
+        out.writeBoolean(includeOnlyTopIndexingPressureMetrics);
     }
 
     /**

diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
@@ -247,10 +247,7 @@ public SearchRequest(StreamInput in) throws IOException {
             finalReduce = true;
         }
         ccsMinimizeRoundtrips = in.readBoolean();
-
-        if (in.getVersion().onOrAfter(Version.V_1_1_0)) {
-            cancelAfterTimeInterval = in.readOptionalTimeValue();
-        }
+        cancelAfterTimeInterval = in.readOptionalTimeValue();
     }
 
     @Override
@@ -278,10 +275,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(finalReduce);
         }
         out.writeBoolean(ccsMinimizeRoundtrips);
-
-        if (out.getVersion().onOrAfter(Version.V_1_1_0)) {
-            out.writeOptionalTimeValue(cancelAfterTimeInterval);
-        }
+        out.writeOptionalTimeValue(cancelAfterTimeInterval);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
@@ -312,37 +312,6 @@ private void refreshDiscoveryNodeVersionAfterUpgrade(DiscoveryNodes currentNodes
             // this logic is only applicable when OpenSearch node is cluster-manager and is noop for zen discovery node
             return;
         }
-        if (currentNodes.getMinNodeVersion().before(Version.V_1_0_0)) {
-            Map<String, Version> channelVersions = transportService.getChannelVersion(currentNodes);
-            for (DiscoveryNode node : currentNodes) {
-                if (channelVersions.containsKey(node.getId())) {
-                    if (channelVersions.get(node.getId()) != node.getVersion()) {
-                        DiscoveryNode tmpNode = nodesBuilder.get(node.getId());
-                        nodesBuilder.remove(node.getId());
-                        nodesBuilder.add(
-                            new DiscoveryNode(
-                                tmpNode.getName(),
-                                tmpNode.getId(),
-                                tmpNode.getEphemeralId(),
-                                tmpNode.getHostName(),
-                                tmpNode.getHostAddress(),
-                                tmpNode.getAddress(),
-                                tmpNode.getAttributes(),
-                                tmpNode.getRoles(),
-                                channelVersions.get(tmpNode.getId())
-                            )
-                        );
-                        logger.info(
-                            "Refreshed the DiscoveryNode version for node {}:{} from {} to {}",
-                            node.getId(),
-                            node.getAddress(),
-                            node.getVersion(),
-                            channelVersions.get(tmpNode.getId())
-                        );
-                    }
-                }
-            }
-        }
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java b/server/src/main/java/org/opensearch/cluster/health/ClusterStateHealth.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.cluster.health;
 
-import org.opensearch.Version;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.routing.IndexRoutingTable;
@@ -154,11 +153,7 @@ public ClusterStateHealth(final StreamInput in) throws IOException {
         unassignedShards = in.readVInt();
         numberOfNodes = in.readVInt();
         numberOfDataNodes = in.readVInt();
-        if (in.getVersion().onOrAfter(Version.V_1_0_0)) {
-            hasDiscoveredClusterManager = in.readBoolean();
-        } else {
-            hasDiscoveredClusterManager = true;
-        }
+        hasDiscoveredClusterManager = in.readBoolean();
         status = ClusterHealthStatus.fromValue(in.readByte());
         int size = in.readVInt();
         indices = new HashMap<>(size);
@@ -262,9 +257,7 @@ public void writeTo(final StreamOutput out) throws IOException {
         out.writeVInt(unassignedShards);
         out.writeVInt(numberOfNodes);
         out.writeVInt(numberOfDataNodes);
-        if (out.getVersion().onOrAfter(Version.V_1_0_0)) {
-            out.writeBoolean(hasDiscoveredClusterManager);
-        }
+        out.writeBoolean(hasDiscoveredClusterManager);
         out.writeByte(status.value());
         out.writeVInt(indices.size());
         for (ClusterIndexHealth indexHealth : this) {

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.cluster.metadata;
 
-import org.opensearch.Version;
 import org.opensearch.cluster.AbstractDiffable;
 import org.opensearch.cluster.Diff;
 import org.opensearch.cluster.metadata.DataStream.TimestampField;
@@ -312,11 +311,7 @@ public DataStreamTemplate(TimestampField timestampField) {
         }
 
         public DataStreamTemplate(StreamInput in) throws IOException {
-            if (in.getVersion().onOrAfter(Version.V_1_0_0)) {
-                this.timestampField = in.readOptionalWriteable(TimestampField::new);
-            } else {
-                this.timestampField = DataStreamFieldMapper.Defaults.TIMESTAMP_FIELD;
-            }
+            this.timestampField = in.readOptionalWriteable(TimestampField::new);
         }
 
         public TimestampField getTimestampField() {
@@ -335,9 +330,7 @@ public Map<String, Object> getDataStreamMappingSnippet() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getVersion().onOrAfter(Version.V_1_0_0)) {
-                out.writeOptionalWriteable(timestampField);
-            }
+            out.writeOptionalWriteable(timestampField);
         }
 
         @Override

diff --git a/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java
@@ -41,7 +41,6 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.apache.lucene.util.automaton.RegExp;
-import org.opensearch.Version;
 import org.opensearch.common.ParseField;
 import org.opensearch.common.ParsingException;
 import org.opensearch.common.io.stream.NamedWriteable;
@@ -154,15 +153,7 @@ public Match(String query, int maxGaps, IntervalMode mode, String analyzer, Inte
         public Match(StreamInput in) throws IOException {
             this.query = in.readString();
             this.maxGaps = in.readVInt();
-            if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
-                this.mode = IntervalMode.readFromStream(in);
-            } else {
-                if (in.readBoolean()) {
-                    this.mode = IntervalMode.ORDERED;
-                } else {
-                    this.mode = IntervalMode.UNORDERED;
-                }
-            }
+            this.mode = IntervalMode.readFromStream(in);
             this.analyzer = in.readOptionalString();
             this.filter = in.readOptionalWriteable(IntervalFilter::new);
             this.useField = in.readOptionalString();
@@ -222,11 +213,7 @@ public String getWriteableName() {
         public void writeTo(StreamOutput out) throws IOException {
             out.writeString(query);
             out.writeVInt(maxGaps);
-            if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
-                mode.writeTo(out);
-            } else {
-                out.writeBoolean(mode == IntervalMode.ORDERED);
-            }
+            mode.writeTo(out);
             out.writeOptionalString(analyzer);
             out.writeOptionalWriteable(filter);
             out.writeOptionalString(useField);
@@ -442,11 +429,7 @@ public Combine(List<IntervalsSourceProvider> subSources, IntervalMode mode, int
         }
 
         public Combine(StreamInput in) throws IOException {
-            if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
-                this.mode = IntervalMode.readFromStream(in);
-            } else {
-                this.mode = in.readBoolean() ? IntervalMode.ORDERED : IntervalMode.UNORDERED;
-            }
+            this.mode = IntervalMode.readFromStream(in);
             this.subSources = in.readNamedWriteableList(IntervalsSourceProvider.class);
             this.maxGaps = in.readInt();
             this.filter = in.readOptionalWriteable(IntervalFilter::new);
@@ -495,11 +478,7 @@ public String getWriteableName() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
-                mode.writeTo(out);
-            } else {
-                out.writeBoolean(mode == IntervalMode.ORDERED);
-            }
+            mode.writeTo(out);
             out.writeNamedWriteableList(subSources);
             out.writeInt(maxGaps);
             out.writeOptionalWriteable(filter);
@@ -729,11 +708,7 @@ public Regexp(StreamInput in) throws IOException {
             this.flags = in.readVInt();
             this.useField = in.readOptionalString();
             this.maxExpansions = in.readOptionalVInt();
-            if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
-                this.caseInsensitive = in.readBoolean();
-            } else {
-                this.caseInsensitive = false;
-            }
+            this.caseInsensitive = in.readBoolean();
         }
 
         @Override
@@ -803,9 +778,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVInt(flags);
             out.writeOptionalString(useField);
             out.writeOptionalVInt(maxExpansions);
-            if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
-                out.writeBoolean(caseInsensitive);
-            }
+            out.writeBoolean(caseInsensitive);
         }
 
         @Override
@@ -903,11 +876,7 @@ public Wildcard(StreamInput in) throws IOException {
             this.pattern = in.readString();
             this.analyzer = in.readOptionalString();
             this.useField = in.readOptionalString();
-            if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
-                this.maxExpansions = in.readOptionalVInt();
-            } else {
-                this.maxExpansions = null;
-            }
+            this.maxExpansions = in.readOptionalVInt();
         }
 
         @Override
@@ -976,9 +945,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(pattern);
             out.writeOptionalString(analyzer);
             out.writeOptionalString(useField);
-            if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
-                out.writeOptionalVInt(maxExpansions);
-            }
+            out.writeOptionalVInt(maxExpansions);
         }
 
         @Override