You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by iv...@apache.org on 2021/03/30 08:04:22 UTC

[lucene] branch main updated: LUCENE-9705: Create Lucene90SegmentInfoFormat (#30)

This is an automated email from the ASF dual-hosted git repository.

ivera pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 00e57f8  LUCENE-9705: Create Lucene90SegmentInfoFormat (#30)
00e57f8 is described below

commit 00e57f8c8a42b9814aada2005457c6f1a00eeea4
Author: Ignacio Vera <iv...@apache.org>
AuthorDate: Tue Mar 30 10:04:17 2021 +0200

    LUCENE-9705: Create Lucene90SegmentInfoFormat (#30)
    
    The existing Lucene86SegmentInfoFormat is moved to backwards-codecs.
---
 .../backward_codecs/lucene86/Lucene86Codec.java    |   3 +-
 .../lucene86/Lucene86SegmentInfoFormat.java        |  67 +------------
 .../backward_codecs/lucene87/Lucene87Codec.java    |   4 +-
 .../backward_codecs/lucene86/Lucene86RWCodec.java  |   6 ++
 .../lucene86/Lucene86RWSegmentInfoFormat.java      | 106 +++++++++++++++++++++
 .../lucene86/TestLucene86SegmentInfoFormat.java    |   8 +-
 .../backward_codecs/lucene87/Lucene87RWCodec.java  |   7 ++
 .../lucene/codecs/lucene90/Lucene90Codec.java      |   3 +-
 .../Lucene90SegmentInfoFormat.java}                |  10 +-
 .../lucene/codecs/lucene90/package-info.java       |   4 +-
 .../TestLucene90SegmentInfoFormat.java}            |   4 +-
 11 files changed, 138 insertions(+), 84 deletions(-)

diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86Codec.java
index 1cd5d4c..4299c2b 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86Codec.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86Codec.java
@@ -39,7 +39,6 @@ import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.TermVectorsFormat;
 import org.apache.lucene.codecs.VectorFormat;
 import org.apache.lucene.codecs.lucene86.Lucene86PointsFormat;
-import org.apache.lucene.codecs.lucene86.Lucene86SegmentInfoFormat;
 import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
 
@@ -116,7 +115,7 @@ public class Lucene86Codec extends Codec {
   }
 
   @Override
-  public final SegmentInfoFormat segmentInfoFormat() {
+  public SegmentInfoFormat segmentInfoFormat() {
     return segmentInfosFormat;
   }
 
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86SegmentInfoFormat.java
similarity index 72%
copy from lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
copy to lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86SegmentInfoFormat.java
index 32a141b..528010e 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene86/Lucene86SegmentInfoFormat.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.codecs.lucene86;
+package org.apache.lucene.backward_codecs.lucene86;
 
 import java.io.IOException;
 import java.util.Map;
@@ -24,7 +24,6 @@ import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.SegmentInfoFormat;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.IndexSorter;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.SegmentInfo;
 import org.apache.lucene.index.SegmentInfos;
@@ -36,7 +35,6 @@ import org.apache.lucene.store.DataInput;
 import org.apache.lucene.store.DataOutput;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.Version;
 
 /**
@@ -175,67 +173,6 @@ public class Lucene86SegmentInfoFormat extends SegmentInfoFormat {
 
   @Override
   public void write(Directory dir, SegmentInfo si, IOContext ioContext) throws IOException {
-    final String fileName = IndexFileNames.segmentFileName(si.name, "", SI_EXTENSION);
-
-    try (IndexOutput output = dir.createOutput(fileName, ioContext)) {
-      // Only add the file once we've successfully created it, else IFD assert can trip:
-      si.addFile(fileName);
-      CodecUtil.writeIndexHeader(output, CODEC_NAME, VERSION_CURRENT, si.getId(), "");
-
-      writeSegmentInfo(output, si);
-
-      CodecUtil.writeFooter(output);
-    }
-  }
-
-  private void writeSegmentInfo(DataOutput output, SegmentInfo si) throws IOException {
-    Version version = si.getVersion();
-    if (version.major < 7) {
-      throw new IllegalArgumentException(
-          "invalid major version: should be >= 7 but got: " + version.major + " segment=" + si);
-    }
-    // Write the Lucene version that created this segment, since 3.1
-    output.writeInt(version.major);
-    output.writeInt(version.minor);
-    output.writeInt(version.bugfix);
-
-    // Write the min Lucene version that contributed docs to the segment, since 7.0
-    if (si.getMinVersion() != null) {
-      output.writeByte((byte) 1);
-      Version minVersion = si.getMinVersion();
-      output.writeInt(minVersion.major);
-      output.writeInt(minVersion.minor);
-      output.writeInt(minVersion.bugfix);
-    } else {
-      output.writeByte((byte) 0);
-    }
-
-    assert version.prerelease == 0;
-    output.writeInt(si.maxDoc());
-
-    output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO));
-    output.writeMapOfStrings(si.getDiagnostics());
-    Set<String> files = si.files();
-    for (String file : files) {
-      if (!IndexFileNames.parseSegmentName(file).equals(si.name)) {
-        throw new IllegalArgumentException(
-            "invalid files: expected segment=" + si.name + ", got=" + files);
-      }
-    }
-    output.writeSetOfStrings(files);
-    output.writeMapOfStrings(si.getAttributes());
-
-    Sort indexSort = si.getIndexSort();
-    int numSortFields = indexSort == null ? 0 : indexSort.getSort().length;
-    output.writeVInt(numSortFields);
-    for (int i = 0; i < numSortFields; ++i) {
-      SortField sortField = indexSort.getSort()[i];
-      IndexSorter sorter = sortField.getIndexSorter();
-      if (sorter == null) {
-        throw new IllegalArgumentException("cannot serialize SortField " + sortField);
-      }
-      output.writeString(sorter.getProviderName());
-      SortFieldProvider.write(sortField, output);
-    }
+    throw new UnsupportedOperationException("Old formats can't be used for writing");
   }
 }
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
index b1819c0..f8f477e 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
@@ -25,6 +25,7 @@ import org.apache.lucene.backward_codecs.lucene60.Lucene60FieldInfosFormat;
 import org.apache.lucene.backward_codecs.lucene80.Lucene80DocValuesFormat;
 import org.apache.lucene.backward_codecs.lucene80.Lucene80NormsFormat;
 import org.apache.lucene.backward_codecs.lucene84.Lucene84PostingsFormat;
+import org.apache.lucene.backward_codecs.lucene86.Lucene86SegmentInfoFormat;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.CompoundFormat;
 import org.apache.lucene.codecs.DocValuesFormat;
@@ -39,7 +40,6 @@ import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.TermVectorsFormat;
 import org.apache.lucene.codecs.VectorFormat;
 import org.apache.lucene.codecs.lucene86.Lucene86PointsFormat;
-import org.apache.lucene.codecs.lucene86.Lucene86SegmentInfoFormat;
 import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
 
@@ -138,7 +138,7 @@ public class Lucene87Codec extends Codec {
   }
 
   @Override
-  public final SegmentInfoFormat segmentInfoFormat() {
+  public SegmentInfoFormat segmentInfoFormat() {
     return segmentInfosFormat;
   }
 
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWCodec.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWCodec.java
index 6a544fd..986684d 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWCodec.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWCodec.java
@@ -25,6 +25,7 @@ import org.apache.lucene.backward_codecs.lucene84.Lucene84RWPostingsFormat;
 import org.apache.lucene.codecs.CompoundFormat;
 import org.apache.lucene.codecs.NormsFormat;
 import org.apache.lucene.codecs.PostingsFormat;
+import org.apache.lucene.codecs.SegmentInfoFormat;
 import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.TermVectorsFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
@@ -53,6 +54,11 @@ public class Lucene86RWCodec extends Lucene86Codec {
   }
 
   @Override
+  public SegmentInfoFormat segmentInfoFormat() {
+    return new Lucene86RWSegmentInfoFormat();
+  }
+
+  @Override
   public StoredFieldsFormat storedFieldsFormat() {
     return storedFieldsFormat;
   }
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWSegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWSegmentInfoFormat.java
new file mode 100644
index 0000000..fedc5c6
--- /dev/null
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/Lucene86RWSegmentInfoFormat.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.lucene.backward_codecs.lucene86;
+
+import java.io.IOException;
+import java.util.Set;
+import org.apache.lucene.codecs.CodecUtil;
+import org.apache.lucene.index.IndexFileNames;
+import org.apache.lucene.index.IndexSorter;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SortFieldProvider;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.store.DataOutput;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.util.Version;
+
+/** Writable version of Lucene86SegmentInfoFormat for testing */
+public class Lucene86RWSegmentInfoFormat extends Lucene86SegmentInfoFormat {
+
+  /** Sole constructor. */
+  public Lucene86RWSegmentInfoFormat() {}
+
+  @Override
+  public void write(Directory dir, SegmentInfo si, IOContext ioContext) throws IOException {
+    final String fileName = IndexFileNames.segmentFileName(si.name, "", SI_EXTENSION);
+
+    try (IndexOutput output = dir.createOutput(fileName, ioContext)) {
+      // Only add the file once we've successfully created it, else IFD assert can trip:
+      si.addFile(fileName);
+      CodecUtil.writeIndexHeader(output, CODEC_NAME, VERSION_CURRENT, si.getId(), "");
+
+      writeSegmentInfo(output, si);
+
+      CodecUtil.writeFooter(output);
+    }
+  }
+
+  private void writeSegmentInfo(DataOutput output, SegmentInfo si) throws IOException {
+    Version version = si.getVersion();
+    if (version.major < 7) {
+      throw new IllegalArgumentException(
+          "invalid major version: should be >= 7 but got: " + version.major + " segment=" + si);
+    }
+    // Write the Lucene version that created this segment, since 3.1
+    output.writeInt(version.major);
+    output.writeInt(version.minor);
+    output.writeInt(version.bugfix);
+
+    // Write the min Lucene version that contributed docs to the segment, since 7.0
+    if (si.getMinVersion() != null) {
+      output.writeByte((byte) 1);
+      Version minVersion = si.getMinVersion();
+      output.writeInt(minVersion.major);
+      output.writeInt(minVersion.minor);
+      output.writeInt(minVersion.bugfix);
+    } else {
+      output.writeByte((byte) 0);
+    }
+
+    assert version.prerelease == 0;
+    output.writeInt(si.maxDoc());
+
+    output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO));
+    output.writeMapOfStrings(si.getDiagnostics());
+    Set<String> files = si.files();
+    for (String file : files) {
+      if (!IndexFileNames.parseSegmentName(file).equals(si.name)) {
+        throw new IllegalArgumentException(
+            "invalid files: expected segment=" + si.name + ", got=" + files);
+      }
+    }
+    output.writeSetOfStrings(files);
+    output.writeMapOfStrings(si.getAttributes());
+
+    Sort indexSort = si.getIndexSort();
+    int numSortFields = indexSort == null ? 0 : indexSort.getSort().length;
+    output.writeVInt(numSortFields);
+    for (int i = 0; i < numSortFields; ++i) {
+      SortField sortField = indexSort.getSort()[i];
+      IndexSorter sorter = sortField.getIndexSorter();
+      if (sorter == null) {
+        throw new IllegalArgumentException("cannot serialize SortField " + sortField);
+      }
+      output.writeString(sorter.getProviderName());
+      SortFieldProvider.write(sortField, output);
+    }
+  }
+}
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java
similarity index 84%
copy from lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java
copy to lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java
index 4a4718a..75f6d17 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.codecs.lucene86;
+package org.apache.lucene.backward_codecs.lucene86;
 
+import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.index.BaseSegmentInfoFormatTestCase;
-import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.Version;
 
 public class TestLucene86SegmentInfoFormat extends BaseSegmentInfoFormatTestCase {
 
   @Override
   protected Version[] getVersions() {
-    return new Version[] {Version.LATEST};
+    return new Version[] {Version.LUCENE_8_8_1};
   }
 
   @Override
   protected Codec getCodec() {
-    return TestUtil.getDefaultCodec();
+    return new Lucene87RWCodec();
   }
 }
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/Lucene87RWCodec.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/Lucene87RWCodec.java
index 846c9d2..748a5a0 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/Lucene87RWCodec.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/Lucene87RWCodec.java
@@ -20,9 +20,11 @@ import org.apache.lucene.backward_codecs.lucene50.Lucene50RWCompoundFormat;
 import org.apache.lucene.backward_codecs.lucene50.Lucene50RWTermVectorsFormat;
 import org.apache.lucene.backward_codecs.lucene80.Lucene80RWNormsFormat;
 import org.apache.lucene.backward_codecs.lucene84.Lucene84RWPostingsFormat;
+import org.apache.lucene.backward_codecs.lucene86.Lucene86RWSegmentInfoFormat;
 import org.apache.lucene.codecs.CompoundFormat;
 import org.apache.lucene.codecs.NormsFormat;
 import org.apache.lucene.codecs.PostingsFormat;
+import org.apache.lucene.codecs.SegmentInfoFormat;
 import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.TermVectorsFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
@@ -50,6 +52,11 @@ public class Lucene87RWCodec extends Lucene87Codec {
   }
 
   @Override
+  public SegmentInfoFormat segmentInfoFormat() {
+    return new Lucene86RWSegmentInfoFormat();
+  }
+
+  @Override
   public final CompoundFormat compoundFormat() {
     return new Lucene50RWCompoundFormat();
   }
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90Codec.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90Codec.java
index 3ce67e1..9569103 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90Codec.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90Codec.java
@@ -31,7 +31,6 @@ import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.TermVectorsFormat;
 import org.apache.lucene.codecs.VectorFormat;
 import org.apache.lucene.codecs.lucene86.Lucene86PointsFormat;
-import org.apache.lucene.codecs.lucene86.Lucene86SegmentInfoFormat;
 import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
 import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
 
@@ -65,7 +64,7 @@ public class Lucene90Codec extends Codec {
 
   private final TermVectorsFormat vectorsFormat = new Lucene90TermVectorsFormat();
   private final FieldInfosFormat fieldInfosFormat = new Lucene90FieldInfosFormat();
-  private final SegmentInfoFormat segmentInfosFormat = new Lucene86SegmentInfoFormat();
+  private final SegmentInfoFormat segmentInfosFormat = new Lucene90SegmentInfoFormat();
   private final LiveDocsFormat liveDocsFormat = new Lucene90LiveDocsFormat();
   private final CompoundFormat compoundFormat = new Lucene90CompoundFormat();
   private final PostingsFormat defaultFormat;
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90SegmentInfoFormat.java
similarity index 97%
rename from lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
rename to lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90SegmentInfoFormat.java
index 32a141b..58b819e 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86SegmentInfoFormat.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/Lucene90SegmentInfoFormat.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.codecs.lucene86;
+package org.apache.lucene.codecs.lucene90;
 
 import java.io.IOException;
 import java.util.Map;
@@ -40,7 +40,7 @@ import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.Version;
 
 /**
- * Lucene 8.6 Segment info format.
+ * Lucene 9.0 Segment info format.
  *
  * <p>Files:
  *
@@ -83,17 +83,17 @@ import org.apache.lucene.util.Version;
  * @see SegmentInfos
  * @lucene.experimental
  */
-public class Lucene86SegmentInfoFormat extends SegmentInfoFormat {
+public class Lucene90SegmentInfoFormat extends SegmentInfoFormat {
 
   /** File extension used to store {@link SegmentInfo}. */
   public static final String SI_EXTENSION = "si";
 
-  static final String CODEC_NAME = "Lucene86SegmentInfo";
+  static final String CODEC_NAME = "Lucene90SegmentInfo";
   static final int VERSION_START = 0;
   static final int VERSION_CURRENT = VERSION_START;
 
   /** Sole constructor. */
-  public Lucene86SegmentInfoFormat() {}
+  public Lucene90SegmentInfoFormat() {}
 
   @Override
   public SegmentInfo read(Directory dir, String segment, byte[] segmentID, IOContext context)
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/package-info.java
index a9dceef..449c702 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene90/package-info.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene90/package-info.java
@@ -141,7 +141,7 @@
  * <p>Each segment index maintains the following:
  *
  * <ul>
- *   <li>{@link org.apache.lucene.codecs.lucene86.Lucene86SegmentInfoFormat Segment info}. This
+ *   <li>{@link org.apache.lucene.codecs.lucene90.Lucene90SegmentInfoFormat Segment info}. This
  *       contains metadata about a segment, such as the number of documents, what files it uses, and
  *       information about how the segment is sorted
  *   <li>{@link org.apache.lucene.codecs.lucene90.Lucene90FieldInfosFormat Field names}. This
@@ -229,7 +229,7 @@
  * file.</td>
  * </tr>
  * <tr>
- * <td>{@link org.apache.lucene.codecs.lucene86.Lucene86SegmentInfoFormat Segment Info}</td>
+ * <td>{@link org.apache.lucene.codecs.lucene90.Lucene90SegmentInfoFormat Segment Info}</td>
  * <td>.si</td>
  * <td>Stores metadata about a segment</td>
  * </tr>
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java
similarity index 91%
rename from lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java
rename to lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java
index 4a4718a..4826b12 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/lucene86/TestLucene86SegmentInfoFormat.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.lucene.codecs.lucene86;
+package org.apache.lucene.codecs.lucene90;
 
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.index.BaseSegmentInfoFormatTestCase;
 import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.Version;
 
-public class TestLucene86SegmentInfoFormat extends BaseSegmentInfoFormatTestCase {
+public class TestLucene90SegmentInfoFormat extends BaseSegmentInfoFormatTestCase {
 
   @Override
   protected Version[] getVersions() {