Directory in now only closed if implicitly generated from

File or String. Behavior is identical to IndexReader.

addIndexes(IndexReader[]) no longer closes the readers.


git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150302 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/lucene/index/IndexWriter.java

@@ -118,6 +118,7 @@ public class IndexWriter {
    */
   private boolean useCompoundFile = true;
   
+  private boolean closeDir;
 
   /** Setting to turn on usage of a compound file. When on, multiple files
    *  for each segment are merged into a single file once the segment creation
@@ -169,7 +170,7 @@ public class IndexWriter {
    */
   public IndexWriter(String path, Analyzer a, boolean create)
        throws IOException {
-    this(FSDirectory.getDirectory(path, create), a, create);
+    this(FSDirectory.getDirectory(path, create), a, create, true);
   }
 
   /**
@@ -189,7 +190,7 @@ public class IndexWriter {
    */
   public IndexWriter(File path, Analyzer a, boolean create)
        throws IOException {
-    this(FSDirectory.getDirectory(path, create), a, create);
+    this(FSDirectory.getDirectory(path, create), a, create, true);
   }
 
   /**
@@ -207,37 +208,43 @@ public class IndexWriter {
    *  if it does not exist, and <code>create</code> is
    *  <code>false</code>
    */
-  public IndexWriter(Directory d, Analyzer a, final boolean create)
+  public IndexWriter(Directory d, Analyzer a, boolean create)
        throws IOException {
-    directory = d;
-    analyzer = a;
-
-    Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME);
-    if (!writeLock.obtain(WRITE_LOCK_TIMEOUT)) // obtain write lock
-      throw new IOException("Index locked for write: " + writeLock);
-    this.writeLock = writeLock;                   // save it
-
-    synchronized (directory) {			  // in- & inter-process sync
-      new Lock.With(directory.makeLock(IndexWriter.COMMIT_LOCK_NAME), COMMIT_LOCK_TIMEOUT) {
-          public Object doBody() throws IOException {
-            if (create)
-              segmentInfos.write(directory);
-            else
-              segmentInfos.read(directory);
-            return null;
-          }
-        }.run();
-    }
+    this(d, a, create, false);
   }
   
-  /** Flushes all changes to an index, closes all associated files, and closes
-    the directory that the index is stored in. */
+  private IndexWriter(Directory d, Analyzer a, final boolean create, boolean closeDir)
+    throws IOException {
+      this.closeDir = closeDir;
+      directory = d;
+      analyzer = a;
+
+      Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME);
+      if (!writeLock.obtain(WRITE_LOCK_TIMEOUT)) // obtain write lock
+        throw new IOException("Index locked for write: " + writeLock);
+      this.writeLock = writeLock;                   // save it
+
+      synchronized (directory) {        // in- & inter-process sync
+        new Lock.With(directory.makeLock(IndexWriter.COMMIT_LOCK_NAME), COMMIT_LOCK_TIMEOUT) {
+            public Object doBody() throws IOException {
+              if (create)
+                segmentInfos.write(directory);
+              else
+                segmentInfos.read(directory);
+              return null;
+            }
+          }.run();
+      }
+  }
+
+  /** Flushes all changes to an index and closes all associated files. */
   public synchronized void close() throws IOException {
     flushRamSegments();
     ramDirectory.close();
     writeLock.release();                          // release write lock
     writeLock = null;
-    directory.close();
+    if(closeDir)
+      directory.close();
   }
 
   /** Release the write lock, if needed. */
@@ -379,7 +386,9 @@ public class IndexWriter {
   }
 
   /** Merges the provided indexes into this index.
-   * <p>After this completes, the index is optimized. */
+   * <p>After this completes, the index is optimized. </p>
+   * <p>The provided IndexReaders are not closed.</p>
+   */
   public synchronized void addIndexes(IndexReader[] readers)
     throws IOException {
 
@@ -490,6 +499,8 @@ public class IndexWriter {
           }
         }.run();
     }
+    
+    merger.closeReaders();
   }
 
   /* Some operating systems (e.g. Windows) don't permit a file to be deleted

src/java/org/apache/lucene/index/SegmentMerger.java

@@ -88,20 +88,13 @@ final class SegmentMerger {
    */
   final int merge() throws IOException {
     int value;
-    try {
-      value = mergeFields();
-      mergeTerms();
-      mergeNorms();
     
-      if (fieldInfos.hasVectors())
-        mergeVectors();
+    value = mergeFields();
+    mergeTerms();
+    mergeNorms();
 
-    } finally {
-      for (int i = 0; i < readers.size(); i++) {  // close readers
-        IndexReader reader = (IndexReader) readers.elementAt(i);
-        reader.close();
-      }
-    }
+    if (fieldInfos.hasVectors())
+      mergeVectors();
 
     if (useCompoundFile)
       createCompoundFile();
@@ -109,6 +102,18 @@ final class SegmentMerger {
     return value;
   }
   
+  /**
+   * close all IndexReaders that have been added.
+   * Should not be called before merge().
+   * @throws IOException
+   */
+  final void closeReaders() throws IOException {
+    for (int i = 0; i < readers.size(); i++) {  // close readers
+      IndexReader reader = (IndexReader) readers.elementAt(i);
+      reader.close();
+    }
+  }
+
   private final void createCompoundFile()
           throws IOException {
     CompoundFileWriter cfsWriter =

src/test/org/apache/lucene/index/DocTest.java

@@ -80,6 +80,7 @@ class DocTest {
     merger.add(r1);
     merger.add(r2);
     merger.merge();
+    merger.closeReaders();
 
     directory.close();
   }

src/test/org/apache/lucene/index/TestDoc.java

@@ -186,6 +186,7 @@ public class TestDoc extends TestCase {
       merger.add(r1);
       merger.add(r2);
       merger.merge();
+      merger.closeReaders();
 
       directory.close();
    }

src/test/org/apache/lucene/index/TestSegmentMerger.java

@@ -77,6 +77,7 @@ public class TestSegmentMerger extends TestCase {
     merger.add(reader2);
     try {
       int docsMerged = merger.merge();
+      merger.closeReaders();
       assertTrue(docsMerged == 2);
       //Should be able to open a new SegmentReader against the new directory
       SegmentReader mergedReader = new SegmentReader(new SegmentInfo(mergedSegment, docsMerged, mergedDir));