Skip to content

Commit ec6b790

Browse files
authored
Migrate some uses of Version.luceneVersion() to IndexVersion (#96300)
Redirect some uses of `Version.luceneVersion` to use `IndexVersion.luceneVersion` instead
1 parent 8b62851 commit ec6b790

File tree

17 files changed

+37
-27
lines changed

17 files changed

+37
-27
lines changed

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.elasticsearch.core.Booleans;
2727
import org.elasticsearch.core.CheckedFunction;
2828
import org.elasticsearch.index.IndexSettings;
29+
import org.elasticsearch.index.IndexVersion;
2930
import org.elasticsearch.index.mapper.DateFieldMapper;
3031
import org.elasticsearch.rest.action.admin.indices.RestPutIndexTemplateAction;
3132
import org.elasticsearch.test.NotEqualMessageBuilder;
@@ -958,7 +959,7 @@ public void testRecovery() throws Exception {
958959
assertTrue("expected to find a primary but didn't\n" + recoveryResponse, foundPrimary);
959960
assertEquals("mismatch while checking for translog recovery\n" + recoveryResponse, shouldHaveTranslog, restoredFromTranslog);
960961

961-
String currentLuceneVersion = Version.CURRENT.luceneVersion().toString();
962+
String currentLuceneVersion = IndexVersion.CURRENT.luceneVersion().toString();
962963
String bwcLuceneVersion = getOldClusterVersion().luceneVersion().toString();
963964
String minCompatibleBWCVersion = Version.CURRENT.minimumCompatibilityVersion().luceneVersion().toString();
964965
if (shouldHaveTranslog && false == currentLuceneVersion.equals(bwcLuceneVersion)) {

server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.elasticsearch.common.util.BigArrays;
2121
import org.elasticsearch.core.Tuple;
2222
import org.elasticsearch.env.Environment;
23+
import org.elasticsearch.index.IndexVersion;
2324
import org.elasticsearch.index.shard.ShardId;
2425
import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot;
2526
import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshots;
@@ -192,7 +193,7 @@ public void testOnlyFetchesSnapshotFromEnabledRepositories() throws Exception {
192193
assertThat(commitVersion, is(equalTo(Version.CURRENT)));
193194
final org.apache.lucene.util.Version commitLuceneVersion = shardSnapshotData.getCommitLuceneVersion();
194195
assertThat(commitLuceneVersion, is(notNullValue()));
195-
assertThat(commitLuceneVersion, is(equalTo(Version.CURRENT.luceneVersion())));
196+
assertThat(commitLuceneVersion, is(equalTo(IndexVersion.CURRENT.luceneVersion())));
196197

197198
assertThat(shardSnapshotInfo.getShardId(), is(equalTo(shardId)));
198199
assertThat(shardSnapshotInfo.getSnapshot().getSnapshotId().getName(), is(equalTo(snapshotName)));

server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.core.IOUtils;
3030
import org.elasticsearch.core.SuppressForbidden;
3131
import org.elasticsearch.env.Environment;
32+
import org.elasticsearch.index.IndexVersion;
3233
import org.elasticsearch.jdk.JarHell;
3334
import org.elasticsearch.monitor.jvm.HotThreads;
3435
import org.elasticsearch.monitor.jvm.JvmInfo;
@@ -336,10 +337,10 @@ static void initializeProbes() {
336337
}
337338

338339
static void checkLucene() {
339-
if (Version.CURRENT.luceneVersion().equals(org.apache.lucene.util.Version.LATEST) == false) {
340+
if (IndexVersion.CURRENT.luceneVersion().equals(org.apache.lucene.util.Version.LATEST) == false) {
340341
throw new AssertionError(
341342
"Lucene version mismatch this version of Elasticsearch requires lucene version ["
342-
+ Version.CURRENT.luceneVersion()
343+
+ IndexVersion.CURRENT.luceneVersion()
343344
+ "] but the current lucene version is ["
344345
+ org.apache.lucene.util.Version.LATEST
345346
+ "]"

server/src/main/java/org/elasticsearch/index/store/Store.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.elasticsearch.env.ShardLock;
6262
import org.elasticsearch.env.ShardLockObtainFailedException;
6363
import org.elasticsearch.index.IndexSettings;
64+
import org.elasticsearch.index.IndexVersion;
6465
import org.elasticsearch.index.engine.CombinedDeletionPolicy;
6566
import org.elasticsearch.index.engine.Engine;
6667
import org.elasticsearch.index.seqno.SequenceNumbers;
@@ -817,7 +818,7 @@ static MetadataSnapshot loadFromIndexCommit(IndexCommit commit, Directory direct
817818
}
818819
}
819820
if (maxVersion == null) {
820-
maxVersion = org.elasticsearch.Version.CURRENT.minimumIndexCompatibilityVersion().luceneVersion();
821+
maxVersion = IndexVersion.MINIMUM_COMPATIBLE.luceneVersion();
821822
}
822823
final String segmentsFile = segmentCommitInfos.getSegmentsFileName();
823824
checksumFromLuceneFile(

server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.elasticsearch.common.settings.Settings;
3838
import org.elasticsearch.common.util.set.Sets;
3939
import org.elasticsearch.core.TimeValue;
40+
import org.elasticsearch.index.IndexVersion;
4041
import org.elasticsearch.index.engine.Engine;
4142
import org.elasticsearch.index.seqno.ReplicationTracker;
4243
import org.elasticsearch.index.seqno.RetentionLease;
@@ -66,9 +67,7 @@
6667
import static org.hamcrest.Matchers.hasSize;
6768

6869
public class ReplicaShardAllocatorTests extends ESAllocationTestCase {
69-
private static final String MIN_SUPPORTED_LUCENE_VERSION = Version.CURRENT.minimumIndexCompatibilityVersion()
70-
.luceneVersion()
71-
.toString();
70+
private static final String MIN_SUPPORTED_LUCENE_VERSION = IndexVersion.MINIMUM_COMPATIBLE.luceneVersion().toString();
7271

7372
private final ShardId shardId = new ShardId("test", "_na_", 0);
7473
private final DiscoveryNode node1 = newNode("node1");

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
import org.elasticsearch.core.Tuple;
100100
import org.elasticsearch.index.IndexModule;
101101
import org.elasticsearch.index.IndexSettings;
102+
import org.elasticsearch.index.IndexVersion;
102103
import org.elasticsearch.index.VersionType;
103104
import org.elasticsearch.index.codec.CodecService;
104105
import org.elasticsearch.index.fieldvisitor.FieldsVisitor;
@@ -6725,7 +6726,7 @@ public long softUpdateDocuments(Term term, Iterable<? extends Iterable<? extends
67256726
Map<String, String> userData = new HashMap<>(store.readLastCommittedSegmentsInfo().userData);
67266727
userData.remove(Engine.MIN_RETAINED_SEQNO);
67276728
IndexWriterConfig indexWriterConfig = new IndexWriterConfig(null).setOpenMode(IndexWriterConfig.OpenMode.APPEND)
6728-
.setIndexCreatedVersionMajor(Version.CURRENT.luceneVersion().major)
6729+
.setIndexCreatedVersionMajor(IndexVersion.CURRENT.luceneVersion().major)
67296730
.setSoftDeletesField(Lucene.SOFT_DELETES_FIELD)
67306731
.setCommitOnClose(false)
67316732
.setMergePolicy(NoMergePolicy.INSTANCE);

server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.elasticsearch.ElasticsearchParseException;
1313
import org.elasticsearch.common.bytes.BytesReference;
1414
import org.elasticsearch.common.unit.ByteSizeValue;
15+
import org.elasticsearch.index.IndexVersion;
1516
import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
1617
import org.elasticsearch.index.store.StoreFileMetadata;
1718
import org.elasticsearch.test.ESTestCase;
@@ -31,8 +32,7 @@
3132
import static org.hamcrest.Matchers.is;
3233

3334
public class FileInfoTests extends ESTestCase {
34-
private static final Version MIN_SUPPORTED_LUCENE_VERSION = org.elasticsearch.Version.CURRENT.minimumIndexCompatibilityVersion()
35-
.luceneVersion();
35+
private static final Version MIN_SUPPORTED_LUCENE_VERSION = IndexVersion.MINIMUM_COMPATIBLE.luceneVersion();
3636

3737
public void testToFromXContent() throws IOException {
3838
final int iters = scaledRandomIntBetween(1, 10);

server/src/test/java/org/elasticsearch/index/store/StoreTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.elasticsearch.env.ShardLock;
5555
import org.elasticsearch.index.Index;
5656
import org.elasticsearch.index.IndexSettings;
57+
import org.elasticsearch.index.IndexVersion;
5758
import org.elasticsearch.index.engine.Engine;
5859
import org.elasticsearch.index.seqno.ReplicationTracker;
5960
import org.elasticsearch.index.seqno.RetentionLease;
@@ -105,8 +106,7 @@ public class StoreTests extends ESTestCase {
105106
"index",
106107
Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, org.elasticsearch.Version.CURRENT).build()
107108
);
108-
private static final Version MIN_SUPPORTED_LUCENE_VERSION = org.elasticsearch.Version.CURRENT.minimumIndexCompatibilityVersion()
109-
.luceneVersion();
109+
private static final Version MIN_SUPPORTED_LUCENE_VERSION = IndexVersion.MINIMUM_COMPATIBLE.luceneVersion();
110110

111111
public void testRefCount() {
112112
final ShardId shardId = new ShardId("index", "_na_", 1);

server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.apache.lucene.util.Version;
1414
import org.elasticsearch.common.util.set.Sets;
1515
import org.elasticsearch.index.IndexService;
16+
import org.elasticsearch.index.IndexVersion;
1617
import org.elasticsearch.index.shard.IndexShard;
1718
import org.elasticsearch.index.store.StoreFileMetadata;
1819
import org.elasticsearch.test.ESSingleNodeTestCase;
@@ -22,8 +23,7 @@
2223
import java.util.regex.Pattern;
2324

2425
public class RecoveryStatusTests extends ESSingleNodeTestCase {
25-
private static final Version MIN_SUPPORTED_LUCENE_VERSION = org.elasticsearch.Version.CURRENT.minimumIndexCompatibilityVersion()
26-
.luceneVersion();
26+
private static final Version MIN_SUPPORTED_LUCENE_VERSION = IndexVersion.MINIMUM_COMPATIBLE.luceneVersion();
2727

2828
public void testRenameTempFiles() throws IOException {
2929
IndexService service = createIndex("foo");

server/src/test/java/org/elasticsearch/repositories/blobstore/ShardSnapshotTaskRunnerTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.common.UUIDs;
1717
import org.elasticsearch.common.settings.Settings;
1818
import org.elasticsearch.index.IndexSettings;
19+
import org.elasticsearch.index.IndexVersion;
1920
import org.elasticsearch.index.engine.Engine;
2021
import org.elasticsearch.index.shard.ShardId;
2122
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
@@ -101,7 +102,7 @@ public int finishedShardSnapshotTasks() {
101102

102103
public static BlobStoreIndexShardSnapshot.FileInfo dummyFileInfo() {
103104
String filename = randomAlphaOfLength(10);
104-
StoreFileMetadata metadata = new StoreFileMetadata(filename, 10, "CHECKSUM", Version.CURRENT.luceneVersion().toString());
105+
StoreFileMetadata metadata = new StoreFileMetadata(filename, 10, "CHECKSUM", IndexVersion.CURRENT.luceneVersion().toString());
105106
return new BlobStoreIndexShardSnapshot.FileInfo(filename, metadata, null);
106107
}
107108

0 commit comments

Comments
 (0)