Remove boolean success from various codec classes (#14995)

Author: thecoop

lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java

@@ -107,7 +107,6 @@ public BlockTermsReader(
             state.segmentInfo.name, state.segmentSuffix, BlockTermsWriter.TERMS_EXTENSION);
     in = state.directory.openInput(filename, state.context);
 
-    boolean success = false;
     try {
       CodecUtil.checkIndexHeader(
           in,
@@ -171,11 +170,9 @@ public BlockTermsReader(
           throw new CorruptIndexException("duplicate fields: " + fieldInfo.name, in);
         }
       }
-      success = true;
-    } finally {
-      if (!success) {
-        in.close();
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, in);
+      throw t;
     }
 
     this.indexReader = indexReader;

lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java

@@ -96,7 +96,6 @@ public BlockTermsWriter(
     this.termsIndexWriter = termsIndexWriter;
     maxDoc = state.segmentInfo.maxDoc();
     out = state.directory.createOutput(termsFileName, state.context);
-    boolean success = false;
     try {
       fieldInfos = state.fieldInfos;
       CodecUtil.writeIndexHeader(
@@ -108,11 +107,9 @@ public BlockTermsWriter(
       // System.out.println("BTW.init seg=" + state.segmentName);
 
       postingsWriter.init(out, state); // have consumer write its format/header
-      success = true;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(out);
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, out);
+      throw t;
     }
   }
 

lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java

@@ -31,7 +31,6 @@
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.Accountables;
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.PagedBytes;
 import org.apache.lucene.util.packed.MonotonicBlockPackedReader;
 
@@ -68,11 +67,8 @@ public FixedGapTermsIndexReader(SegmentReadState state) throws IOException {
             state.segmentInfo.name,
             state.segmentSuffix,
             FixedGapTermsIndexWriter.TERMS_INDEX_EXTENSION);
-    final IndexInput in = state.directory.openInput(fileName, state.context);
 
-    boolean success = false;
-
-    try {
+    try (IndexInput in = state.directory.openInput(fileName, state.context)) {
 
       CodecUtil.checkIndexHeader(
           in,
@@ -138,13 +134,7 @@ public FixedGapTermsIndexReader(SegmentReadState state) throws IOException {
           throw new CorruptIndexException("duplicate field: " + fieldInfo.name, in);
         }
       }
-      success = true;
     } finally {
-      if (success) {
-        IOUtils.close(in);
-      } else {
-        IOUtils.closeWhileHandlingException(in);
-      }
       termBytesReader = termBytes.freeze(true);
     }
   }

lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java

@@ -70,18 +70,15 @@ public FixedGapTermsIndexWriter(SegmentWriteState state, int termIndexInterval)
         IndexFileNames.segmentFileName(
             state.segmentInfo.name, state.segmentSuffix, TERMS_INDEX_EXTENSION);
     out = state.directory.createOutput(indexFileName, state.context);
-    boolean success = false;
     try {
       CodecUtil.writeIndexHeader(
           out, CODEC_NAME, VERSION_CURRENT, state.segmentInfo.getId(), state.segmentSuffix);
       out.writeVInt(termIndexInterval);
       out.writeVInt(PackedInts.VERSION_CURRENT);
       out.writeVInt(BLOCKSIZE);
-      success = true;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(out);
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, out);
+      throw t;
     }
   }
 
@@ -207,8 +204,7 @@ public void finish(long termsFilePointer) throws IOException {
   @Override
   public void close() throws IOException {
     if (out != null) {
-      boolean success = false;
-      try {
+      try (IndexOutput _ = out) {
         final long dirStart = out.getFilePointer();
         final int fieldCount = fields.size();
 
@@ -234,13 +230,7 @@ public void close() throws IOException {
         }
         writeTrailer(dirStart);
         CodecUtil.writeFooter(out);
-        success = true;
       } finally {
-        if (success) {
-          IOUtils.close(out);
-        } else {
-          IOUtils.closeWhileHandlingException(out);
-        }
         out = null;
       }
     }

lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java

@@ -187,7 +187,6 @@ public VariableGapTermsIndexWriter(SegmentWriteState state, IndexTermSelector po
         IndexFileNames.segmentFileName(
             state.segmentInfo.name, state.segmentSuffix, TERMS_INDEX_EXTENSION);
 
-    boolean success = false;
     try {
       metaOut = state.directory.createOutput(metaFileName, state.context);
       out = state.directory.createOutput(indexFileName, state.context);
@@ -199,11 +198,9 @@ public VariableGapTermsIndexWriter(SegmentWriteState state, IndexTermSelector po
           state.segmentSuffix);
       CodecUtil.writeIndexHeader(
           out, CODEC_NAME, VERSION_CURRENT, state.segmentInfo.getId(), state.segmentSuffix);
-      success = true;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(this);
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, this);
+      throw t;
     }
   }
 

lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/BlockTreeOrdsPostingsFormat.java

@@ -69,31 +69,23 @@ public String toString() {
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     PostingsWriterBase postingsWriter = new Lucene103PostingsWriter(state);
 
-    boolean success = false;
     try {
-      FieldsConsumer ret =
-          new OrdsBlockTreeTermsWriter(state, postingsWriter, minTermBlockSize, maxTermBlockSize);
-      success = true;
-      return ret;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(postingsWriter);
-      }
+      return new OrdsBlockTreeTermsWriter(
+          state, postingsWriter, minTermBlockSize, maxTermBlockSize);
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, postingsWriter);
+      throw t;
     }
   }
 
   @Override
   public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
     PostingsReaderBase postingsReader = new Lucene103PostingsReader(state);
-    boolean success = false;
     try {
-      FieldsProducer ret = new OrdsBlockTreeTermsReader(postingsReader, state);
-      success = true;
-      return ret;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(postingsReader);
-      }
+      return new OrdsBlockTreeTermsReader(postingsReader, state);
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, postingsReader);
+      throw t;
     }
   }
 }

lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java

@@ -63,7 +63,6 @@ public OrdsBlockTreeTermsReader(PostingsReaderBase postingsReader, SegmentReadSt
             state.segmentInfo.name, state.segmentSuffix, OrdsBlockTreeTermsWriter.TERMS_EXTENSION);
     in = state.directory.openInput(termsFile, state.context);
 
-    boolean success = false;
     IndexInput indexIn = null;
 
     try {
@@ -173,13 +172,9 @@ public OrdsBlockTreeTermsReader(PostingsReaderBase postingsReader, SegmentReadSt
         }
       }
       indexIn.close();
-
-      success = true;
-    } finally {
-      if (!success) {
-        // this.close() will close in:
-        IOUtils.closeWhileHandlingException(indexIn, this);
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, indexIn, this);
+      throw t;
     }
   }
 

lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java

@@ -178,7 +178,6 @@ public OrdsBlockTreeTermsWriter(
         IndexFileNames.segmentFileName(
             state.segmentInfo.name, state.segmentSuffix, TERMS_EXTENSION);
     out = state.directory.createOutput(termsFileName, state.context);
-    boolean success = false;
     IndexOutput indexOut = null;
     try {
       fieldInfos = state.fieldInfos;
@@ -204,11 +203,9 @@ public OrdsBlockTreeTermsWriter(
       // System.out.println("BTW.init seg=" + state.segmentName);
 
       postingsWriter.init(out, state); // have consumer write its format/header
-      success = true;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(out, indexOut);
-      }
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, out, indexOut);
+      throw t;
     }
     this.indexOut = indexOut;
   }
@@ -928,9 +925,9 @@ public void close() throws IOException {
     }
     closed = true;
 
-    boolean success = false;
-    try {
-
+    try (out;
+        indexOut;
+        postingsWriter) {
       final long dirStart = out.getFilePointer();
       final long indexDirStart = indexOut.getFilePointer();
 
@@ -960,13 +957,6 @@ public void close() throws IOException {
       CodecUtil.writeFooter(out);
       indexOut.writeLong(indexDirStart);
       CodecUtil.writeFooter(indexOut);
-      success = true;
-    } finally {
-      if (success) {
-        IOUtils.close(out, indexOut, postingsWriter);
-      } else {
-        IOUtils.closeWhileHandlingException(out, indexOut, postingsWriter);
-      }
     }
   }
 

lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java

@@ -151,10 +151,8 @@ public BloomFilteredFieldsProducer(SegmentReadState state) throws IOException {
       String bloomFileName =
           IndexFileNames.segmentFileName(
               state.segmentInfo.name, state.segmentSuffix, BLOOM_EXTENSION);
-      ChecksumIndexInput bloomIn = null;
-      boolean success = false;
-      try {
-        bloomIn = state.directory.openChecksumInput(bloomFileName);
+
+      try (ChecksumIndexInput bloomIn = state.directory.openChecksumInput(bloomFileName)) {
         CodecUtil.checkIndexHeader(
             bloomIn,
             BLOOM_CODEC_NAME,
@@ -176,12 +174,9 @@ public BloomFilteredFieldsProducer(SegmentReadState state) throws IOException {
           bloomsByFieldName.put(fieldInfo.name, bloom);
         }
         CodecUtil.checkFooter(bloomIn);
-        IOUtils.close(bloomIn);
-        success = true;
-      } finally {
-        if (!success) {
-          IOUtils.closeWhileHandlingException(bloomIn, delegateFieldsProducer);
-        }
+      } catch (Throwable t) {
+        IOUtils.closeWhileSuppressingExceptions(t, delegateFieldsProducer);
+        throw t;
       }
     }
 

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

@@ -43,30 +43,22 @@ public String toString() {
   public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
     PostingsWriterBase postingsWriter = new Lucene103PostingsWriter(state);
 
-    boolean success = false;
     try {
-      FieldsConsumer ret = new FSTTermsWriter(state, postingsWriter);
-      success = true;
-      return ret;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(postingsWriter);
-      }
+      return new FSTTermsWriter(state, postingsWriter);
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, postingsWriter);
+      throw t;
     }
   }
 
   @Override
   public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
     PostingsReaderBase postingsReader = new Lucene103PostingsReader(state);
-    boolean success = false;
     try {
-      FieldsProducer ret = new FSTTermsReader(state, postingsReader);
-      success = true;
-      return ret;
-    } finally {
-      if (!success) {
-        IOUtils.closeWhileHandlingException(postingsReader);
-      }
+      return new FSTTermsReader(state, postingsReader);
+    } catch (Throwable t) {
+      IOUtils.closeWhileSuppressingExceptions(t, postingsReader);
+      throw t;
     }
   }
 }