rebase

Author: dungba88

lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java

@@ -81,15 +81,16 @@ public FSTTermsReader(SegmentReadState state, PostingsReaderBase postingsReader)
             state.segmentInfo.name, state.segmentSuffix, FSTTermsWriter.TERMS_DATA_EXTENSION);
 
     this.postingsReader = postingsReader;
-    this.fstTermsInput =
-        state.directory.openInput(
-            termsFileName, state.context.withHints(FileTypeHint.DATA, PreloadHint.INSTANCE));
 
     IndexInput metaIn = null, dataIn = null;
 
     try {
-      metaIn = state.directory.openInput(termsMetaFileName, IOContext.LOAD);
-      dataIn = state.directory.openInput(termsDataFileName, IOContext.LOAD);
+      metaIn =
+          state.directory.openInput(
+              termsMetaFileName, state.context.withHints(FileTypeHint.DATA, PreloadHint.INSTANCE));
+      dataIn =
+          state.directory.openInput(
+              termsDataFileName, state.context.withHints(FileTypeHint.DATA, PreloadHint.INSTANCE));
 
       verifyInput(state, metaIn);
       verifyInput(state, dataIn);
@@ -118,14 +119,9 @@ public FSTTermsReader(SegmentReadState state, PostingsReaderBase postingsReader)
       }
       this.fstMetaInput = metaIn;
       this.fstDataInput = dataIn;
-      success = true;
     } catch (Throwable t) {
-      IOUtils.closeWhileSuppressingExceptions(t, in);
+      IOUtils.closeWhileSuppressingExceptions(t, metaIn, dataIn);
       throw t;
-    } finally {
-      if (success == false) {
-        IOUtils.closeWhileHandlingException(metaIn, dataIn);
-      }
     }
   }
 
@@ -220,7 +216,10 @@ final class TermsReader extends Terms {
       this.sumDocFreq = sumDocFreq;
       this.docCount = docCount;
       FSTTermOutputs outputs = new FSTTermOutputs(fieldInfo);
-      this.dict = new FST<>(FST.readMetadata(metaIn, outputs), dataIn, offHeapFSTStore);
+      final var fstMetadata = FST.readMetadata(metaIn, outputs);
+      OffHeapFSTStore offHeapFSTStore =
+          new OffHeapFSTStore(dataIn, dataIn.getFilePointer(), fstMetadata);
+      this.dict = FST.fromFSTReader(fstMetadata, offHeapFSTStore);
       dataIn.skipBytes(offHeapFSTStore.size());
     }
 

lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java

@@ -136,7 +136,6 @@ public FSTTermsWriter(SegmentWriteState state, PostingsWriterBase postingsWriter
     this.maxDoc = state.segmentInfo.maxDoc();
 
     IndexOutput metaOut = null, dataOut = null;
-    boolean success = false;
     try {
       metaOut = state.directory.createOutput(termsMetaFileName, state.context);
       dataOut = state.directory.createOutput(termsDataFileName, state.context);
@@ -158,15 +157,9 @@ public FSTTermsWriter(SegmentWriteState state, PostingsWriterBase postingsWriter
       this.postingsWriter.init(metaOut, state);
       this.metaOut = metaOut;
       this.dataOut = dataOut;
-      success = true;
     } catch (Throwable t) {
-      IOUtils.closeWhileSuppressingExceptions(t, out);
+      IOUtils.closeWhileSuppressingExceptions(t, metaOut, dataOut);
       throw t;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(metaOut, dataOut);
-      }
-      this.postingsWriter.init(out, state);
     }
   }
 
@@ -212,9 +205,9 @@ public void write(Fields fields, NormsProducer norms) throws IOException {
   public void close() throws IOException {
     if (metaOut != null) {
       assert dataOut != null;
-      boolean success = false;
-      try {
-        // write field summary
+      try (IndexOutput _ = metaOut;
+          IndexOutput __ = dataOut;
+          postingsWriter) { // write field summary
         final long dirStart = metaOut.getFilePointer();
 
         metaOut.writeVInt(fields.size());
@@ -226,18 +219,12 @@ public void close() throws IOException {
           }
           metaOut.writeVLong(field.sumDocFreq);
           metaOut.writeVInt(field.docCount);
-          field.dict.saveMetadata(metaOut);
+          field.dict.getMetadata().save(metaOut);
         }
         writeTrailer(metaOut, dirStart);
         CodecUtil.writeFooter(metaOut);
         CodecUtil.writeFooter(dataOut);
-        success = true;
       } finally {
-        if (success) {
-          IOUtils.close(metaOut, dataOut, postingsWriter);
-        } else {
-          IOUtils.closeWhileHandlingException(metaOut, dataOut, postingsWriter);
-        }
         metaOut = null;
         dataOut = null;
       }