Apache Lucene open-source search software
Close IndexWriter and Directory in try blocks Relates to #12685
Simon Willnauer01acb1c37b28
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.javaindex bd52a84f7e6..5916ec33f0d 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java@@ -1770,43 +1770,45 @@ public class TestIndexWriter extends LuceneTestCase {}public void testCarryOverHasBlocks() throws Exception {- Directory dir = newDirectory();- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));+ try (Directory dir = newDirectory()) {+ try (IndexWriter w =+ new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())))) {- final List<Document> docs = new ArrayList<>();- docs.add(new Document());- w.updateDocuments(new Term("foo", "bar"), docs);- w.commit();- try (DirectoryReader reader = DirectoryReader.open(dir)) {- SegmentCommitInfo segmentInfo =- ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();- assertFalse(segmentInfo.info.getHasBlocks());- }+ final List<Document> docs = new ArrayList<>();+ docs.add(new Document());+ w.updateDocuments(new Term("foo", "bar"), docs);+ w.commit();+ try (DirectoryReader reader = DirectoryReader.open(dir)) {+ SegmentCommitInfo segmentInfo =+ ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();+ assertFalse(segmentInfo.info.getHasBlocks());+ }- docs.add(new Document()); // now we have 2 docs- w.updateDocuments(new Term("foo", "bar"), docs);- w.commit();- try (DirectoryReader reader = DirectoryReader.open(dir)) {- assertEquals(2, reader.leaves().size());- SegmentCommitInfo segmentInfo =- ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();- assertFalse(- "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());- segmentInfo = ((SegmentReader) reader.leaves().get(1).reader()).getSegmentInfo();- assertTrue(- "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());- }- w.forceMerge(1, true);- w.commit();- try (DirectoryReader reader = DirectoryReader.open(dir)) {- assertEquals(1, reader.leaves().size());- SegmentCommitInfo segmentInfo =- ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();- assertTrue(- "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());+ docs.add(new Document()); // now we have 2 docs+ w.updateDocuments(new Term("foo", "bar"), docs);+ w.commit();+ try (DirectoryReader reader = DirectoryReader.open(dir)) {+ assertEquals(2, reader.leaves().size());+ SegmentCommitInfo segmentInfo =+ ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();+ assertFalse(+ "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());+ segmentInfo = ((SegmentReader) reader.leaves().get(1).reader()).getSegmentInfo();+ assertTrue(+ "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());+ }+ w.forceMerge(1, true);+ w.commit();+ try (DirectoryReader reader = DirectoryReader.open(dir)) {+ assertEquals(1, reader.leaves().size());+ SegmentCommitInfo segmentInfo =+ ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo();+ assertTrue(+ "codec: " + segmentInfo.info.getCodec().toString(), segmentInfo.info.getHasBlocks());+ }+ w.commit();+ }}- w.commit();- dir.close();}// LUCENE-3872