Skip to content

Commit 8b076b8

Browse files
authored
Remove LegacyVersion.v6.4.x constants (opensearch-project#1787)
This commit removes the `LegacyVersion.v6.4.x` constants and their usages, since we no longer need to support those in OpenSearch 2.0 onwards. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
1 parent daf2b66 commit 8b076b8

37 files changed

+109
-385
lines changed

modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java

+4-16
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.apache.lucene.search.ScoreMode;
4343
import org.apache.lucene.search.Scorer;
4444
import org.apache.lucene.search.Weight;
45-
import org.opensearch.LegacyESVersion;
4645
import org.apache.lucene.store.ByteBuffersDirectory;
4746
import org.apache.lucene.store.Directory;
4847
import org.opensearch.action.ActionRequestValidationException;
@@ -314,15 +313,8 @@ static Request parse(XContentParser parser) throws IOException {
314313
Request(StreamInput in) throws IOException {
315314
super(in);
316315
script = new Script(in);
317-
if (in.getVersion().before(LegacyESVersion.V_6_4_0)) {
318-
byte scriptContextId = in.readByte();
319-
assert scriptContextId == 0;
320-
context = null;
321-
contextSetup = null;
322-
} else {
323-
context = fromScriptContextName(in.readString());
324-
contextSetup = in.readOptionalWriteable(ContextSetup::new);
325-
}
316+
context = fromScriptContextName(in.readString());
317+
contextSetup = in.readOptionalWriteable(ContextSetup::new);
326318
}
327319

328320
public Script getScript() {
@@ -358,12 +350,8 @@ public ActionRequestValidationException validate() {
358350
public void writeTo(StreamOutput out) throws IOException {
359351
super.writeTo(out);
360352
script.writeTo(out);
361-
if (out.getVersion().before(LegacyESVersion.V_6_4_0)) {
362-
out.writeByte((byte) 0);
363-
} else {
364-
out.writeString(context.name);
365-
out.writeOptionalWriteable(contextSetup);
366-
}
353+
out.writeString(context.name);
354+
out.writeOptionalWriteable(contextSetup);
367355
}
368356

369357
// For testing only:

qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public void testShrink() throws IOException {
351351
client().performRequest(updateSettingsRequest);
352352

353353
Request shrinkIndexRequest = new Request("PUT", "/" + index + "/_shrink/" + shrunkenIndex);
354-
if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_4_0) && getOldClusterVersion().before(LegacyESVersion.V_7_0_0)) {
354+
if (getOldClusterVersion().before(LegacyESVersion.V_7_0_0)) {
355355
shrinkIndexRequest.addParameter("copy_settings", "true");
356356
}
357357
shrinkIndexRequest.setJsonEntity("{\"settings\": {\"index.number_of_shards\": 1}}");

server/src/main/java/org/opensearch/LegacyESVersion.java

-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
*/
4747
public class LegacyESVersion extends Version {
4848

49-
public static final LegacyESVersion V_6_4_0 = new LegacyESVersion(6040099, org.apache.lucene.util.Version.LUCENE_7_4_0);
50-
public static final LegacyESVersion V_6_4_1 = new LegacyESVersion(6040199, org.apache.lucene.util.Version.LUCENE_7_4_0);
51-
public static final LegacyESVersion V_6_4_2 = new LegacyESVersion(6040299, org.apache.lucene.util.Version.LUCENE_7_4_0);
52-
public static final LegacyESVersion V_6_4_3 = new LegacyESVersion(6040399, org.apache.lucene.util.Version.LUCENE_7_4_0);
5349
public static final LegacyESVersion V_6_5_0 = new LegacyESVersion(6050099, org.apache.lucene.util.Version.LUCENE_7_5_0);
5450
public static final LegacyESVersion V_6_5_1 = new LegacyESVersion(6050199, org.apache.lucene.util.Version.LUCENE_7_5_0);
5551
public static final LegacyESVersion V_6_5_2 = new LegacyESVersion(6050299, org.apache.lucene.util.Version.LUCENE_7_5_0);

server/src/main/java/org/opensearch/action/admin/cluster/reroute/ClusterRerouteResponse.java

+6-19
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
package org.opensearch.action.admin.cluster.reroute;
3434

35-
import org.opensearch.LegacyESVersion;
3635
import org.opensearch.action.support.master.AcknowledgedResponse;
3736
import org.opensearch.cluster.ClusterState;
3837
import org.opensearch.cluster.routing.allocation.RoutingExplanations;
@@ -53,15 +52,9 @@ public class ClusterRerouteResponse extends AcknowledgedResponse implements ToXC
5352
private final RoutingExplanations explanations;
5453

5554
ClusterRerouteResponse(StreamInput in) throws IOException {
56-
super(in, in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0));
57-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
58-
state = ClusterState.readFrom(in, null);
59-
explanations = RoutingExplanations.readFrom(in);
60-
} else {
61-
state = ClusterState.readFrom(in, null);
62-
acknowledged = in.readBoolean();
63-
explanations = RoutingExplanations.readFrom(in);
64-
}
55+
super(in);
56+
state = ClusterState.readFrom(in, null);
57+
explanations = RoutingExplanations.readFrom(in);
6558
}
6659

6760
ClusterRerouteResponse(boolean acknowledged, ClusterState state, RoutingExplanations explanations) {
@@ -83,15 +76,9 @@ public RoutingExplanations getExplanations() {
8376

8477
@Override
8578
public void writeTo(StreamOutput out) throws IOException {
86-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
87-
super.writeTo(out);
88-
state.writeTo(out);
89-
RoutingExplanations.writeTo(explanations, out);
90-
} else {
91-
state.writeTo(out);
92-
out.writeBoolean(acknowledged);
93-
RoutingExplanations.writeTo(explanations, out);
94-
}
79+
super.writeTo(out);
80+
state.writeTo(out);
81+
RoutingExplanations.writeTo(explanations, out);
9582
}
9683

9784
@Override

server/src/main/java/org/opensearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java

+6-19
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
package org.opensearch.action.admin.cluster.settings;
3434

35-
import org.opensearch.LegacyESVersion;
3635
import org.opensearch.action.support.master.AcknowledgedResponse;
3736
import org.opensearch.common.ParseField;
3837
import org.opensearch.common.io.stream.StreamInput;
@@ -70,15 +69,9 @@ public class ClusterUpdateSettingsResponse extends AcknowledgedResponse {
7069
final Settings persistentSettings;
7170

7271
ClusterUpdateSettingsResponse(StreamInput in) throws IOException {
73-
super(in, in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0));
74-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
75-
transientSettings = Settings.readSettingsFromStream(in);
76-
persistentSettings = Settings.readSettingsFromStream(in);
77-
} else {
78-
transientSettings = Settings.readSettingsFromStream(in);
79-
persistentSettings = Settings.readSettingsFromStream(in);
80-
acknowledged = in.readBoolean();
81-
}
72+
super(in);
73+
transientSettings = Settings.readSettingsFromStream(in);
74+
persistentSettings = Settings.readSettingsFromStream(in);
8275
}
8376

8477
ClusterUpdateSettingsResponse(boolean acknowledged, Settings transientSettings, Settings persistentSettings) {
@@ -97,15 +90,9 @@ public Settings getPersistentSettings() {
9790

9891
@Override
9992
public void writeTo(StreamOutput out) throws IOException {
100-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
101-
super.writeTo(out);
102-
Settings.writeSettingsToStream(transientSettings, out);
103-
Settings.writeSettingsToStream(persistentSettings, out);
104-
} else {
105-
Settings.writeSettingsToStream(transientSettings, out);
106-
Settings.writeSettingsToStream(persistentSettings, out);
107-
out.writeBoolean(acknowledged);
108-
}
93+
super.writeTo(out);
94+
Settings.writeSettingsToStream(transientSettings, out);
95+
Settings.writeSettingsToStream(persistentSettings, out);
10996
}
11097

11198
@Override

server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStats.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
package org.opensearch.action.admin.cluster.snapshots.status;
3434

35-
import org.opensearch.LegacyESVersion;
3635
import org.opensearch.common.Strings;
3736
import org.opensearch.common.io.stream.StreamInput;
3837
import org.opensearch.common.io.stream.StreamOutput;
@@ -70,13 +69,8 @@ public class SnapshotStats implements Writeable, ToXContentObject {
7069
incrementalSize = in.readVLong();
7170
processedSize = in.readVLong();
7271

73-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
74-
totalFileCount = in.readVInt();
75-
totalSize = in.readVLong();
76-
} else {
77-
totalFileCount = incrementalFileCount;
78-
totalSize = incrementalSize;
79-
}
72+
totalFileCount = in.readVInt();
73+
totalSize = in.readVLong();
8074
}
8175

8276
SnapshotStats(
@@ -167,10 +161,8 @@ public void writeTo(StreamOutput out) throws IOException {
167161
out.writeVLong(incrementalSize);
168162
out.writeVLong(processedSize);
169163

170-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
171-
out.writeVInt(totalFileCount);
172-
out.writeVLong(totalSize);
173-
}
164+
out.writeVInt(totalFileCount);
165+
out.writeVLong(totalSize);
174166
}
175167

176168
static final class Fields {

server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
package org.opensearch.action.admin.cluster.storedscripts;
3434

35-
import org.opensearch.LegacyESVersion;
3635
import org.opensearch.action.ActionResponse;
3736
import org.opensearch.common.ParseField;
3837
import org.opensearch.common.io.stream.StreamInput;
@@ -91,9 +90,7 @@ public GetStoredScriptResponse(StreamInput in) throws IOException {
9190
source = null;
9291
}
9392

94-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
95-
id = in.readString();
96-
}
93+
id = in.readString();
9794
}
9895

9996
GetStoredScriptResponse(String id, StoredScriptSource source) {
@@ -144,9 +141,7 @@ public void writeTo(StreamOutput out) throws IOException {
144141
out.writeBoolean(true);
145142
source.writeTo(out);
146143
}
147-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
148-
out.writeString(id);
149-
}
144+
out.writeString(id);
150145
}
151146

152147
@Override

server/src/main/java/org/opensearch/action/admin/indices/alias/Alias.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ public Alias(StreamInput in) throws IOException {
8787
filter = in.readOptionalString();
8888
indexRouting = in.readOptionalString();
8989
searchRouting = in.readOptionalString();
90-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
91-
writeIndex = in.readOptionalBoolean();
92-
} else {
93-
writeIndex = null;
94-
}
90+
writeIndex = in.readOptionalBoolean();
9591
if (in.getVersion().onOrAfter(LegacyESVersion.V_7_7_0)) {
9692
isHidden = in.readOptionalBoolean();
9793
} else {
@@ -237,9 +233,7 @@ public void writeTo(StreamOutput out) throws IOException {
237233
out.writeOptionalString(filter);
238234
out.writeOptionalString(indexRouting);
239235
out.writeOptionalString(searchRouting);
240-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
241-
out.writeOptionalBoolean(writeIndex);
242-
}
236+
out.writeOptionalBoolean(writeIndex);
243237
if (out.getVersion().onOrAfter(LegacyESVersion.V_7_7_0)) {
244238
out.writeOptionalBoolean(isHidden);
245239
}

server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,7 @@ public AliasActions(StreamInput in) throws IOException {
270270
routing = in.readOptionalString();
271271
searchRouting = in.readOptionalString();
272272
indexRouting = in.readOptionalString();
273-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
274-
writeIndex = in.readOptionalBoolean();
275-
}
273+
writeIndex = in.readOptionalBoolean();
276274
// TODO fix for backport of https://github.com/elastic/elasticsearch/pull/52547
277275
if (in.getVersion().onOrAfter(LegacyESVersion.V_7_7_0)) {
278276
isHidden = in.readOptionalBoolean();
@@ -296,9 +294,7 @@ public void writeTo(StreamOutput out) throws IOException {
296294
out.writeOptionalString(routing);
297295
out.writeOptionalString(searchRouting);
298296
out.writeOptionalString(indexRouting);
299-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
300-
out.writeOptionalBoolean(writeIndex);
301-
}
297+
out.writeOptionalBoolean(writeIndex);
302298
// TODO fix for backport https://github.com/elastic/elasticsearch/pull/52547
303299
if (out.getVersion().onOrAfter(LegacyESVersion.V_7_7_0)) {
304300
out.writeOptionalBoolean(isHidden);

server/src/main/java/org/opensearch/action/admin/indices/alias/get/GetAliasesRequest.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
package org.opensearch.action.admin.indices.alias.get;
3333

34-
import org.opensearch.LegacyESVersion;
3534
import org.opensearch.action.ActionRequestValidationException;
3635
import org.opensearch.action.AliasesRequest;
3736
import org.opensearch.action.support.IndicesOptions;
@@ -61,9 +60,7 @@ public GetAliasesRequest(StreamInput in) throws IOException {
6160
indices = in.readStringArray();
6261
aliases = in.readStringArray();
6362
indicesOptions = IndicesOptions.readIndicesOptions(in);
64-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
65-
originalAliases = in.readStringArray();
66-
}
63+
originalAliases = in.readStringArray();
6764
}
6865

6966
@Override
@@ -72,9 +69,7 @@ public void writeTo(StreamOutput out) throws IOException {
7269
out.writeStringArray(indices);
7370
out.writeStringArray(aliases);
7471
indicesOptions.writeIndicesOptions(out);
75-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
76-
out.writeStringArray(originalAliases);
77-
}
72+
out.writeStringArray(originalAliases);
7873
}
7974

8075
@Override

server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class CloseIndexResponse extends ShardsAcknowledgedResponse {
5757
private final List<IndexResult> indices;
5858

5959
CloseIndexResponse(StreamInput in) throws IOException {
60-
super(in, in.getVersion().onOrAfter(LegacyESVersion.V_7_2_0), true);
60+
super(in, in.getVersion().onOrAfter(LegacyESVersion.V_7_2_0));
6161
if (in.getVersion().onOrAfter(LegacyESVersion.V_7_3_0)) {
6262
indices = unmodifiableList(in.readList(IndexResult::new));
6363
} else {

server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected static <T extends CreateIndexResponse> void declareFields(Constructing
7171
private final String index;
7272

7373
protected CreateIndexResponse(StreamInput in) throws IOException {
74-
super(in, true, true);
74+
super(in, true);
7575
index = in.readString();
7676
}
7777

server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequest.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
package org.opensearch.action.admin.indices.get;
3434

35-
import org.opensearch.LegacyESVersion;
3635
import org.opensearch.action.ActionRequestValidationException;
3736
import org.opensearch.action.support.master.info.ClusterInfoRequest;
3837
import org.opensearch.common.io.stream.StreamInput;
@@ -90,9 +89,7 @@ public GetIndexRequest(StreamInput in) throws IOException {
9089
super(in);
9190
features = in.readArray(i -> Feature.fromId(i.readByte()), Feature[]::new);
9291
humanReadable = in.readBoolean();
93-
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
94-
includeDefaults = in.readBoolean();
95-
}
92+
includeDefaults = in.readBoolean();
9693
}
9794

9895
public GetIndexRequest features(Feature... features) {
@@ -156,9 +153,7 @@ public void writeTo(StreamOutput out) throws IOException {
156153
super.writeTo(out);
157154
out.writeArray((o, f) -> o.writeByte(f.id), features);
158155
out.writeBoolean(humanReadable);
159-
if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
160-
out.writeBoolean(includeDefaults);
161-
}
156+
out.writeBoolean(includeDefaults);
162157
}
163158

164159
}

server/src/main/java/org/opensearch/action/admin/indices/open/OpenIndexResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class OpenIndexResponse extends ShardsAcknowledgedResponse {
5656
}
5757

5858
public OpenIndexResponse(StreamInput in) throws IOException {
59-
super(in, true, true);
59+
super(in, true);
6060
}
6161

6262
public OpenIndexResponse(boolean acknowledged, boolean shardsAcknowledged) {

server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class AddIndexBlockResponse extends ShardsAcknowledgedResponse {
5555
private final List<AddBlockResult> indices;
5656

5757
AddIndexBlockResponse(StreamInput in) throws IOException {
58-
super(in, true, true);
58+
super(in, true);
5959
indices = unmodifiableList(in.readList(AddBlockResult::new));
6060
}
6161

0 commit comments

Comments
 (0)