Update after review

Author: drempapis

x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene60/MetadataOnlyBKDReader.java

@@ -90,15 +90,10 @@ public MetadataOnlyBKDReader(IndexInput metaIn) throws IOException {
         pointCount = metaIn.readVLong();
         docCount = metaIn.readVInt();
 
+        // This code has been introduced to process IndexInput created with Lucene86Codec+
         numIndexBytes = metaIn.readVInt();
-        if (version >= VERSION_META_FILE) {
-            minLeafBlockFP = metaIn.readLong();
-            indexStartPointer = metaIn.readLong();
-        } else {
-            indexStartPointer = metaIn.getFilePointer();
-            minLeafBlockFP = metaIn.readVLong();
-            metaIn.seek(indexStartPointer);
-        }
+        minLeafBlockFP = metaIn.readLong();
+        indexStartPointer = metaIn.readLong();
     }
 
     @Override

x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene86/Lucene86MetadataOnlyPointsFormat.java

@@ -32,16 +32,8 @@
  **/
 public class Lucene86MetadataOnlyPointsFormat extends PointsFormat {
 
-    static final String DATA_CODEC_NAME = "Lucene86PointsFormatData";
-    static final String INDEX_CODEC_NAME = "Lucene86PointsFormatIndex";
     static final String META_CODEC_NAME = "Lucene86PointsFormatMeta";
 
-    /** Filename extension for the leaf blocks */
-    public static final String DATA_EXTENSION = "kdd";
-
-    /** Filename extension for the index per field */
-    public static final String INDEX_EXTENSION = "kdi";
-
     /** Filename extension for the meta per field */
     public static final String META_EXTENSION = "kdm";
 

x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene86/Lucene86MetadataOnlyPointsReader.java

@@ -28,7 +28,6 @@
 import org.apache.lucene.index.PointValues;
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.store.ChecksumIndexInput;
-import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.xpack.lucene.bwc.codecs.lucene60.MetadataOnlyBKDReader;
 
@@ -38,11 +37,9 @@
 
 /** Reads the metadata of point values previously written with Lucene86PointsWriter */
 public final class Lucene86MetadataOnlyPointsReader extends PointsReader {
-    final IndexInput indexIn, dataIn;
     final SegmentReadState readState;
     final Map<Integer, PointValues> readers = new HashMap<>();
 
-    /** Sole constructor */
     public Lucene86MetadataOnlyPointsReader(SegmentReadState readState) throws IOException {
         this.readState = readState;
 
@@ -51,39 +48,9 @@ public Lucene86MetadataOnlyPointsReader(SegmentReadState readState) throws IOExc
             readState.segmentSuffix,
             Lucene86MetadataOnlyPointsFormat.META_EXTENSION
         );
-        String indexFileName = IndexFileNames.segmentFileName(
-            readState.segmentInfo.name,
-            readState.segmentSuffix,
-            Lucene86MetadataOnlyPointsFormat.INDEX_EXTENSION
-        );
-        String dataFileName = IndexFileNames.segmentFileName(
-            readState.segmentInfo.name,
-            readState.segmentSuffix,
-            Lucene86MetadataOnlyPointsFormat.DATA_EXTENSION
-        );
 
         boolean success = false;
         try {
-            indexIn = EndiannessReverserUtil.openInput(readState.directory, indexFileName, readState.context);
-            CodecUtil.checkIndexHeader(
-                indexIn,
-                Lucene86MetadataOnlyPointsFormat.INDEX_CODEC_NAME,
-                Lucene86MetadataOnlyPointsFormat.VERSION_START,
-                Lucene86MetadataOnlyPointsFormat.VERSION_CURRENT,
-                readState.segmentInfo.getId(),
-                readState.segmentSuffix
-            );
-
-            dataIn = EndiannessReverserUtil.openInput(readState.directory, dataFileName, readState.context);
-            CodecUtil.checkIndexHeader(
-                dataIn,
-                Lucene86MetadataOnlyPointsFormat.DATA_CODEC_NAME,
-                Lucene86MetadataOnlyPointsFormat.VERSION_START,
-                Lucene86MetadataOnlyPointsFormat.VERSION_CURRENT,
-                readState.segmentInfo.getId(),
-                readState.segmentSuffix
-            );
-
             long indexLength = -1, dataLength = -1;
             try (
                 ChecksumIndexInput metaIn = EndiannessReverserUtil.openChecksumInput(readState.directory, metaFileName, readState.context)
@@ -117,10 +84,7 @@ public Lucene86MetadataOnlyPointsReader(SegmentReadState readState) throws IOExc
                     CodecUtil.checkFooter(metaIn, priorE);
                 }
             }
-            // At this point, checksums of the meta file have been validated so we
-            // know that indexLength and dataLength are very likely correct.
-            CodecUtil.retrieveChecksum(indexIn, indexLength);
-            CodecUtil.retrieveChecksum(dataIn, dataLength);
+
             success = true;
         } finally {
             if (success == false) {
@@ -143,14 +107,12 @@ public PointValues getValues(String fieldName) {
     }
 
     @Override
-    public void checkIntegrity() throws IOException {
-        CodecUtil.checksumEntireFile(indexIn);
-        CodecUtil.checksumEntireFile(dataIn);
+    public void checkIntegrity() {
+  ;
     }
 
     @Override
     public void close() throws IOException {
-        IOUtils.close(indexIn, dataIn);
         // Free up heap:
         readers.clear();
     }