From 19da754ee9477e620ac7d0029fe9c5a96e7de65e Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:57:12 +0100 Subject: [PATCH] Lucene:11 Fix backward-compatibility tests and remove 9.x versions (#13848) --- .../TestLucene90SegmentInfoFormat.java | 2 +- .../BackwardsCompatibilityTestBase.java | 3 + .../TestAncientIndicesCompatibility.java | 5 +- .../TestBasicBackwardsCompatibility.java | 3 +- .../TestDVUpdateBackwardsCompatibility.java | 2 +- .../TestEmptyIndexBackwardsCompatibility.java | 4 +- .../TestIndexSortBackwardsCompatibility.java | 2 +- .../TestInt8HnswBackwardsCompatibility.java | 2 +- .../TestMoreTermsBackwardsCompatibility.java | 6 +- ....9.8.0.zip => unsupported.12895.9.8.0.zip} | Bin ....0.0-cfs.zip => unsupported.9.0.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.0.0-nocfs.zip} | Bin ....1.0-cfs.zip => unsupported.9.1.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.1.0-nocfs.zip} | Bin ...0.0-cfs.zip => unsupported.9.10.0-cfs.zip} | Bin ...nocfs.zip => unsupported.9.10.0-nocfs.zip} | Bin ...1.0-cfs.zip => unsupported.9.11.0-cfs.zip} | Bin ...nocfs.zip => unsupported.9.11.0-nocfs.zip} | Bin ...1.1-cfs.zip => unsupported.9.11.1-cfs.zip} | Bin ...nocfs.zip => unsupported.9.11.1-nocfs.zip} | Bin ...2.0-cfs.zip => unsupported.9.12.0-cfs.zip} | Bin ...nocfs.zip => unsupported.9.12.0-nocfs.zip} | Bin ....2.0-cfs.zip => unsupported.9.2.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.2.0-nocfs.zip} | Bin ....3.0-cfs.zip => unsupported.9.3.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.3.0-nocfs.zip} | Bin ....4.0-cfs.zip => unsupported.9.4.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.4.0-nocfs.zip} | Bin ....4.1-cfs.zip => unsupported.9.4.1-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.4.1-nocfs.zip} | Bin ....4.2-cfs.zip => unsupported.9.4.2-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.4.2-nocfs.zip} | Bin ....5.0-cfs.zip => unsupported.9.5.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.5.0-nocfs.zip} | Bin ....6.0-cfs.zip => unsupported.9.6.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.6.0-nocfs.zip} | Bin ....7.0-cfs.zip => unsupported.9.7.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.7.0-nocfs.zip} | Bin ....8.0-cfs.zip => unsupported.9.8.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.8.0-nocfs.zip} | Bin ....9.0-cfs.zip => unsupported.9.9.0-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.9.0-nocfs.zip} | Bin ....9.1-cfs.zip => unsupported.9.9.1-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.9.1-nocfs.zip} | Bin ....9.2-cfs.zip => unsupported.9.9.2-cfs.zip} | Bin ...-nocfs.zip => unsupported.9.9.2-nocfs.zip} | Bin ....0.zip => unsupported.dvupdates.9.0.0.zip} | Bin ....9.0.0.zip => unsupported.empty.9.0.0.zip} | Bin ...0.zip => unsupported.int8_hnsw.9.10.0.zip} | Bin ...0.zip => unsupported.int8_hnsw.9.11.0.zip} | Bin ...1.zip => unsupported.int8_hnsw.9.11.1.zip} | Bin ...0.zip => unsupported.int8_hnsw.9.12.0.zip} | Bin ....0.zip => unsupported.moreterms.9.0.0.zip} | Bin ...9.0.0.zip => unsupported.sorted.9.0.0.zip} | Bin ...9.1.0.zip => unsupported.sorted.9.1.0.zip} | Bin ...10.0.zip => unsupported.sorted.9.10.0.zip} | Bin ...11.0.zip => unsupported.sorted.9.11.0.zip} | Bin ...11.1.zip => unsupported.sorted.9.11.1.zip} | Bin ...12.0.zip => unsupported.sorted.9.12.0.zip} | Bin ...9.2.0.zip => unsupported.sorted.9.2.0.zip} | Bin ...9.3.0.zip => unsupported.sorted.9.3.0.zip} | Bin ...9.4.0.zip => unsupported.sorted.9.4.0.zip} | Bin ...9.4.1.zip => unsupported.sorted.9.4.1.zip} | Bin ...9.4.2.zip => unsupported.sorted.9.4.2.zip} | Bin ...9.5.0.zip => unsupported.sorted.9.5.0.zip} | Bin ...9.6.0.zip => unsupported.sorted.9.6.0.zip} | Bin ...9.7.0.zip => unsupported.sorted.9.7.0.zip} | Bin ...9.8.0.zip => unsupported.sorted.9.8.0.zip} | Bin ...9.9.0.zip => unsupported.sorted.9.9.0.zip} | Bin ...9.9.1.zip => unsupported.sorted.9.9.1.zip} | Bin ...9.9.2.zip => unsupported.sorted.9.9.2.zip} | Bin .../backward_index/unsupported_versions.txt | 20 ++- .../apache/lucene/backward_index/versions.txt | 28 +--- .../org/apache/lucene/index/LeafMetaData.java | 6 +- .../java/org/apache/lucene/util/Version.java | 136 ------------------ 75 files changed, 40 insertions(+), 179 deletions(-) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.12895.9.8.0.zip => unsupported.12895.9.8.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.0.0-cfs.zip => unsupported.9.0.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.0.0-nocfs.zip => unsupported.9.0.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.1.0-cfs.zip => unsupported.9.1.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.1.0-nocfs.zip => unsupported.9.1.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.10.0-cfs.zip => unsupported.9.10.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.10.0-nocfs.zip => unsupported.9.10.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.11.0-cfs.zip => unsupported.9.11.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.11.0-nocfs.zip => unsupported.9.11.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.11.1-cfs.zip => unsupported.9.11.1-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.11.1-nocfs.zip => unsupported.9.11.1-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.12.0-cfs.zip => unsupported.9.12.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.12.0-nocfs.zip => unsupported.9.12.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.2.0-cfs.zip => unsupported.9.2.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.2.0-nocfs.zip => unsupported.9.2.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.3.0-cfs.zip => unsupported.9.3.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.3.0-nocfs.zip => unsupported.9.3.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.0-cfs.zip => unsupported.9.4.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.0-nocfs.zip => unsupported.9.4.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.1-cfs.zip => unsupported.9.4.1-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.1-nocfs.zip => unsupported.9.4.1-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.2-cfs.zip => unsupported.9.4.2-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.4.2-nocfs.zip => unsupported.9.4.2-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.5.0-cfs.zip => unsupported.9.5.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.5.0-nocfs.zip => unsupported.9.5.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.6.0-cfs.zip => unsupported.9.6.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.6.0-nocfs.zip => unsupported.9.6.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.7.0-cfs.zip => unsupported.9.7.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.7.0-nocfs.zip => unsupported.9.7.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.8.0-cfs.zip => unsupported.9.8.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.8.0-nocfs.zip => unsupported.9.8.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.0-cfs.zip => unsupported.9.9.0-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.0-nocfs.zip => unsupported.9.9.0-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.1-cfs.zip => unsupported.9.9.1-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.1-nocfs.zip => unsupported.9.9.1-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.2-cfs.zip => unsupported.9.9.2-cfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{index.9.9.2-nocfs.zip => unsupported.9.9.2-nocfs.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{dvupdates.9.0.0.zip => unsupported.dvupdates.9.0.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{empty.9.0.0.zip => unsupported.empty.9.0.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{int8_hnsw.9.10.0.zip => unsupported.int8_hnsw.9.10.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{int8_hnsw.9.11.0.zip => unsupported.int8_hnsw.9.11.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{int8_hnsw.9.11.1.zip => unsupported.int8_hnsw.9.11.1.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{int8_hnsw.9.12.0.zip => unsupported.int8_hnsw.9.12.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{moreterms.9.0.0.zip => unsupported.moreterms.9.0.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.0.0.zip => unsupported.sorted.9.0.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.1.0.zip => unsupported.sorted.9.1.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.10.0.zip => unsupported.sorted.9.10.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.11.0.zip => unsupported.sorted.9.11.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.11.1.zip => unsupported.sorted.9.11.1.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.12.0.zip => unsupported.sorted.9.12.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.2.0.zip => unsupported.sorted.9.2.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.3.0.zip => unsupported.sorted.9.3.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.4.0.zip => unsupported.sorted.9.4.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.4.1.zip => unsupported.sorted.9.4.1.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.4.2.zip => unsupported.sorted.9.4.2.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.5.0.zip => unsupported.sorted.9.5.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.6.0.zip => unsupported.sorted.9.6.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.7.0.zip => unsupported.sorted.9.7.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.8.0.zip => unsupported.sorted.9.8.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.9.0.zip => unsupported.sorted.9.9.0.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.9.1.zip => unsupported.sorted.9.9.1.zip} (100%) rename lucene/backward-codecs/src/test/org/apache/lucene/backward_index/{sorted.9.9.2.zip => unsupported.sorted.9.9.2.zip} (100%) diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene90/TestLucene90SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene90/TestLucene90SegmentInfoFormat.java index 9ecc34906416..ec1b93499ae2 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene90/TestLucene90SegmentInfoFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene90/TestLucene90SegmentInfoFormat.java @@ -25,7 +25,7 @@ public class TestLucene90SegmentInfoFormat extends BaseSegmentInfoFormatTestCase @Override protected Version[] getVersions() { - return new Version[] {Version.LUCENE_9_0_0}; + return new Version[] {Version.fromBits(9, 0, 0)}; } @Override diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/BackwardsCompatibilityTestBase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/BackwardsCompatibilityTestBase.java index ae5920de3685..758c7cef2e96 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/BackwardsCompatibilityTestBase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/BackwardsCompatibilityTestBase.java @@ -115,6 +115,9 @@ public abstract class BackwardsCompatibilityTestBase extends LuceneTestCase { */ protected BackwardsCompatibilityTestBase( @Name("version") Version version, @Name("pattern") String indexPattern) { + // TODO: add 10.0.0 bw indices after 10.0.0 has been released, see + // https://github.com/apache/lucene/issues/13847 + assumeTrue("Can only test with 10.0.0 has been released", version.major < 10); this.version = version; this.indexPattern = indexPattern; } diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestAncientIndicesCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestAncientIndicesCompatibility.java index 88adfadf1c88..cf7df98345d3 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestAncientIndicesCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestAncientIndicesCompatibility.java @@ -198,7 +198,7 @@ public void testUnsupportedOldIndexes() throws Exception { checker.setInfoStream(new PrintStream(bos, false, UTF_8)); checker.setLevel(CheckIndex.Level.MIN_LEVEL_FOR_INTEGRITY_CHECKS); CheckIndex.Status indexStatus = checker.checkIndex(); - if (version.startsWith("8.")) { + if (version.startsWith("8.") || version.startsWith("9.")) { assertTrue(indexStatus.clean); } else { assertFalse(indexStatus.clean); @@ -219,10 +219,11 @@ public void testUnsupportedOldIndexes() throws Exception { // #12895: test on a carefully crafted 9.8.0 index (from a small contiguous subset // of wikibigall unique terms) that shows the read-time exception of // IntersectTermsEnum (used by WildcardQuery) + @AwaitsFix(bugUrl = "https://github.com/apache/lucene/issues/13847") public void testWildcardQueryExceptions990() throws IOException { Path path = createTempDir("12895"); - String name = "index.12895.9.8.0.zip"; + String name = "unsupported.12895.9.8.0.zip"; InputStream resource = TestAncientIndicesCompatibility.class.getResourceAsStream(name); assertNotNull("missing zip file to reproduce #12895", resource); TestUtil.unzip(resource, path); diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBasicBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBasicBackwardsCompatibility.java index cf50b9e1526d..e8137bda8d82 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBasicBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBasicBackwardsCompatibility.java @@ -17,7 +17,6 @@ package org.apache.lucene.backward_index; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; -import static org.apache.lucene.util.Version.LUCENE_9_0_0; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import java.io.IOException; @@ -96,7 +95,7 @@ public class TestBasicBackwardsCompatibility extends BackwardsCompatibilityTestB private static final int DOCS_COUNT = 35; private static final int DELETED_ID = 7; - private static final int KNN_VECTOR_MIN_SUPPORTED_VERSION = LUCENE_9_0_0.major; + private static final int KNN_VECTOR_MIN_SUPPORTED_VERSION = Version.fromBits(9, 0, 0).major; private static final String KNN_VECTOR_FIELD = "knn_field"; private static final FieldType KNN_VECTOR_FIELD_TYPE = KnnFloatVectorField.createFieldType(3, VectorSimilarityFunction.COSINE); diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestDVUpdateBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestDVUpdateBackwardsCompatibility.java index 332daa621ed5..cfe29028cdb9 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestDVUpdateBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestDVUpdateBackwardsCompatibility.java @@ -58,7 +58,7 @@ public TestDVUpdateBackwardsCompatibility(Version version, String pattern) { public static Iterable testVersionsFactory() { List params = new ArrayList<>(); // TODO - WHY ONLY on the first major version? - params.add(new Object[] {Version.LUCENE_9_0_0, createPattern(INDEX_NAME, SUFFIX)}); + params.add(new Object[] {Version.LUCENE_10_0_0, createPattern(INDEX_NAME, SUFFIX)}); return params; } diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestEmptyIndexBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestEmptyIndexBackwardsCompatibility.java index 40fcd4c59bf9..2367e20d6a03 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestEmptyIndexBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestEmptyIndexBackwardsCompatibility.java @@ -53,14 +53,14 @@ protected void createIndex(Directory directory) throws IOException { public static Iterable testVersionsFactory() { List params = new ArrayList<>(); // TODO - WHY ONLY on the first major version? - params.add(new Object[] {Version.LUCENE_9_0_0, createPattern(INDEX_NAME, SUFFIX)}); + params.add(new Object[] {Version.LUCENE_10_0_0, createPattern(INDEX_NAME, SUFFIX)}); return params; } public void testUpgradeEmptyOldIndex() throws Exception { try (Directory dir = newDirectory(directory)) { TestIndexUpgradeBackwardsCompatibility.newIndexUpgrader(dir).upgrade(); - TestIndexUpgradeBackwardsCompatibility.checkAllSegmentsUpgraded(dir, 9); + TestIndexUpgradeBackwardsCompatibility.checkAllSegmentsUpgraded(dir, 10); } } } diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java index f7446011b26b..ad5432b91ad6 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexSortBackwardsCompatibility.java @@ -55,7 +55,7 @@ public class TestIndexSortBackwardsCompatibility extends BackwardsCompatibilityT static final String INDEX_NAME = "sorted"; static final String SUFFIX = ""; - private static final Version FIRST_PARENT_DOC_VERSION = Version.LUCENE_9_11_0; + private static final Version FIRST_PARENT_DOC_VERSION = Version.fromBits(9, 11, 0); private static final String PARENT_FIELD_NAME = "___parent"; public TestIndexSortBackwardsCompatibility(Version version, String pattern) { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestInt8HnswBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestInt8HnswBackwardsCompatibility.java index 8db406df992b..7ab23ce162d2 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestInt8HnswBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestInt8HnswBackwardsCompatibility.java @@ -46,7 +46,7 @@ public class TestInt8HnswBackwardsCompatibility extends BackwardsCompatibilityTe static final String INDEX_NAME = "int8_hnsw"; static final String SUFFIX = ""; - private static final Version FIRST_INT8_HNSW_VERSION = Version.LUCENE_9_10_0; + private static final Version FIRST_INT8_HNSW_VERSION = Version.fromBits(9, 10, 0); private static final String KNN_VECTOR_FIELD = "knn_field"; private static final int DOC_COUNT = 30; private static final FieldType KNN_VECTOR_FIELD_TYPE = diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestMoreTermsBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestMoreTermsBackwardsCompatibility.java index 6bacb49dd652..6b33eeb5add9 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestMoreTermsBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestMoreTermsBackwardsCompatibility.java @@ -31,13 +31,15 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; +@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/apache/lucene/issues/13847") public class TestMoreTermsBackwardsCompatibility extends BackwardsCompatibilityTestBase { - static final String INDEX_NAME = "moreterms"; + static final String INDEX_NAME = "unsupported.moreterms"; static final String SUFFIX = ""; @@ -48,7 +50,7 @@ public TestMoreTermsBackwardsCompatibility(Version version, String pattern) { @ParametersFactory(argumentFormatting = "Lucene-Version:%1$s; Pattern: %2$s") public static Iterable testVersionsFactory() { List params = new ArrayList<>(); - params.add(new Object[] {Version.LUCENE_9_0_0, createPattern(INDEX_NAME, SUFFIX)}); + params.add(new Object[] {Version.fromBits(9, 0, 0), createPattern(INDEX_NAME, SUFFIX)}); return params; } diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.12895.9.8.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.12895.9.8.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.12895.9.8.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.12895.9.8.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.0.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.0.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.0.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.0.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.0.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.0.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.0.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.0.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.1.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.1.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.1.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.1.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.1.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.1.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.1.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.1.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.10.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.10.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.10.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.10.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.10.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.10.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.10.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.10.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.1-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.1-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.1-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.1-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.11.1-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.11.1-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.12.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.12.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.12.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.12.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.12.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.12.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.12.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.12.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.2.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.2.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.2.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.2.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.2.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.2.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.2.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.2.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.3.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.3.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.3.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.3.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.3.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.3.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.3.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.3.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.1-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.1-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.1-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.1-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.1-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.1-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.2-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.2-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.2-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.2-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.2-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.2-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.4.2-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.4.2-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.5.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.5.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.5.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.5.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.5.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.5.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.5.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.5.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.6.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.6.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.6.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.6.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.6.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.6.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.6.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.6.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.7.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.7.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.7.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.7.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.7.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.7.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.7.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.7.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.8.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.8.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.8.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.8.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.8.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.8.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.8.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.8.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.0-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.0-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.0-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.0-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.0-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.0-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.1-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.1-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.1-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.1-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.1-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.1-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.2-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.2-cfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.2-cfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.2-cfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.2-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.2-nocfs.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.9.9.2-nocfs.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.9.9.2-nocfs.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/dvupdates.9.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.dvupdates.9.0.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/dvupdates.9.0.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.dvupdates.9.0.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/empty.9.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.empty.9.0.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/empty.9.0.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.empty.9.0.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.10.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.10.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.10.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.10.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.11.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.11.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.11.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.11.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.11.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.11.1.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.11.1.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.11.1.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.12.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.12.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/int8_hnsw.9.12.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.int8_hnsw.9.12.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/moreterms.9.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.moreterms.9.0.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/moreterms.9.0.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.moreterms.9.0.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.0.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.0.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.0.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.1.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.1.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.1.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.1.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.10.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.10.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.10.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.10.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.11.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.11.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.11.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.11.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.11.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.11.1.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.11.1.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.11.1.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.12.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.12.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.12.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.12.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.2.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.2.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.2.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.2.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.3.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.3.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.3.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.3.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.1.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.1.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.1.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.2.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.4.2.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.4.2.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.5.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.5.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.5.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.6.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.6.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.6.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.6.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.7.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.7.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.7.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.7.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.8.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.8.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.8.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.8.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.0.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.0.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.0.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.1.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.1.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.1.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.2.zip similarity index 100% rename from lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.9.9.2.zip rename to lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported.sorted.9.9.2.zip diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported_versions.txt b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported_versions.txt index 1b5ece827d85..521f12c28042 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported_versions.txt +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/unsupported_versions.txt @@ -120,4 +120,22 @@ 8.11.1 8.11.2 8.11.3 -8.11.4 \ No newline at end of file +8.11.4 +9.0.0 +9.1.0 +9.2.0 +9.3.0 +9.4.0 +9.4.1 +9.4.2 +9.5.0 +9.6.0 +9.7.0 +9.8.0 +9.9.0 +9.9.1 +9.9.2 +9.10.0 +9.11.0 +9.11.1 +9.12.0 \ No newline at end of file diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/versions.txt b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/versions.txt index 57b36cec2114..7529186caca2 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/versions.txt +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/versions.txt @@ -1,30 +1,3 @@ -8.0.0 -8.1.0 -8.1.1 -8.2.0 -8.3.0 -8.3.1 -8.4.0 -8.4.1 -8.5.0 -8.5.1 -8.5.2 -8.6.0 -8.6.1 -8.6.2 -8.6.3 -8.7.0 -8.8.0 -8.8.1 -8.8.2 -8.9.0 -8.10.0 -8.10.1 -8.11.0 -8.11.1 -8.11.2 -8.11.3 -8.11.4 9.0.0 9.1.0 9.2.0 @@ -43,3 +16,4 @@ 9.11.0 9.11.1 9.12.0 +10.0.0 \ No newline at end of file diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java b/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java index 4d9f753e2e32..4595560eff8b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java +++ b/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java @@ -33,9 +33,9 @@ * are in no particular order. * @param hasBlocks Returns true iff this index contains blocks created with {@link * IndexWriter#addDocument(Iterable)} or it's corresponding update methods with at least 2 or - * more documents per call. Note: This property was not recorded before {@link - * Version#LUCENE_9_9_0} this method will return false for all leaves written before {@link - * Version#LUCENE_9_9_0} + * more documents per call. Note: This property was not recorded before {@link Version + * LUCENE_9_9_0} this method will return false for all leaves written before {@link Version + * LUCENE_9_9_0} * @see IndexWriter#updateDocuments(Term, Iterable) * @see IndexWriter#updateDocuments(Query, Iterable) * @see IndexWriter#softUpdateDocuments(Term, Iterable, Field...) diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java index 2312b964f879..e232f1ab6d27 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Version.java +++ b/lucene/core/src/java/org/apache/lucene/util/Version.java @@ -31,142 +31,6 @@ */ public final class Version { - /** - * Match settings and bugs in Lucene's 9.0.0 release. - * - * @deprecated (9.1.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_0_0 = new Version(9, 0, 0); - - /** - * Match settings and bugs in Lucene's 9.1.0 release. - * - * @deprecated (9.2.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_1_0 = new Version(9, 1, 0); - - /** - * Match settings and bugs in Lucene's 9.2.0 release. - * - * @deprecated (9.3.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_2_0 = new Version(9, 2, 0); - - /** - * Match settings and bugs in Lucene's 9.3.0 release. - * - * @deprecated (9.4.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_3_0 = new Version(9, 3, 0); - - /** - * Match settings and bugs in Lucene's 9.4.0 release. - * - * @deprecated Use latest - */ - @Deprecated public static final Version LUCENE_9_4_0 = new Version(9, 4, 0); - - /** - * Match settings and bugs in Lucene's 9.4.1 release. - * - * @deprecated Use latest - * @deprecated (9.4.2) Use latest - */ - @Deprecated public static final Version LUCENE_9_4_1 = new Version(9, 4, 1); - - /** - * Match settings and bugs in Lucene's 9.4.2 release. - * - * @deprecated Use latest - */ - @Deprecated public static final Version LUCENE_9_4_2 = new Version(9, 4, 2); - - /** - * Match settings and bugs in Lucene's 9.5.0 release. - * - * @deprecated (9.6.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_5_0 = new Version(9, 5, 0); - - /** - * Match settings and bugs in Lucene's 9.6.0 release. - * - * @deprecated (9.7.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_6_0 = new Version(9, 6, 0); - - /** - * Match settings and bugs in Lucene's 9.7.0 release. - * - * @deprecated (9.8.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_7_0 = new Version(9, 7, 0); - - /** - * Match settings and bugs in Lucene's 9.8.0 release. - * - * @deprecated (9.9.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_8_0 = new Version(9, 8, 0); - - /** - * Match settings and bugs in Lucene's 9.9.0 release. - * - * @deprecated (9.9.1) Use latest - */ - @Deprecated public static final Version LUCENE_9_9_0 = new Version(9, 9, 0); - - /** - * Match settings and bugs in Lucene's 9.9.1 release. - * - * @deprecated (9.9.2) Use latest - */ - @Deprecated public static final Version LUCENE_9_9_1 = new Version(9, 9, 1); - - /** - * Match settings and bugs in Lucene's 9.9.2 release. - * - * @deprecated (9.10.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_9_2 = new Version(9, 9, 2); - - /** - * Match settings and bugs in Lucene's 9.10.0 release. - * - * @deprecated (9.11.0) Use latest - */ - @Deprecated public static final Version LUCENE_9_10_0 = new Version(9, 10, 0); - - /** - * Match settings and bugs in Lucene's 9.11.0 release. - * - * @deprecated Use latest - * @deprecated (9.12.0) Use latest - * @deprecated (9.11.1) Use latest - */ - @Deprecated public static final Version LUCENE_9_11_0 = new Version(9, 11, 0); - - /** - * Match settings and bugs in Lucene's 9.11.1 release. - * - * @deprecated Use latest - */ - @Deprecated public static final Version LUCENE_9_11_1 = new Version(9, 11, 1); - - /** - * Match settings and bugs in Lucene's 9.12.0 release. - * - * @deprecated Use latest - */ - @Deprecated public static final Version LUCENE_9_12_0 = new Version(9, 12, 0); - - /** - * Match settings and bugs in Lucene's 9.13.0 release. - * - * @deprecated Use latest - */ - @Deprecated public static final Version LUCENE_9_13_0 = new Version(9, 13, 0); - /** * @deprecated Use latest */