You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/07/07 16:48:31 UTC

svn commit: r1143855 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java

Author: simonw
Date: Thu Jul  7 14:48:31 2011
New Revision: 1143855

URL: http://svn.apache.org/viewvc?rev=1143855&view=rev
Log:
don't close segment private doc producers during merge

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1143855&r1=1143854&r2=1143855&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Thu Jul  7 14:48:31 2011
@@ -574,37 +574,37 @@ final class SegmentMerger {
     final List<Bits> perDocBits = new ArrayList<Bits>();
     final List<Integer> perDocBitsStarts = new ArrayList<Integer>();
     int docBase = 0;
-    try {
-      for(IndexReader r : readers) {
-        final int maxDoc = r.maxDoc();
-        final PerDocValues producer = r.perDocValues();
-        if (producer != null) {
-          perDocSlices.add(new ReaderUtil.Slice(docBase, maxDoc, perDocProducers.size()));
-          perDocProducers.add(producer);
-          perDocBits.add(r.getLiveDocs());
-          perDocBitsStarts.add(docBase);
-        }
-        docBase += maxDoc;
+    for (IndexReader r : readers) {
+      final int maxDoc = r.maxDoc();
+      final PerDocValues producer = r.perDocValues();
+      if (producer != null) {
+        perDocSlices.add(new ReaderUtil.Slice(docBase, maxDoc, perDocProducers
+            .size()));
+        perDocProducers.add(producer);
+        perDocBits.add(r.getLiveDocs());
+        perDocBitsStarts.add(docBase);
       }
-      perDocBitsStarts.add(docBase);
-      if (!perDocSlices.isEmpty()) {
-        mergeState.multiLiveDocs = new MultiBits(perDocBits, perDocBitsStarts, true);
-        final PerDocConsumer docsConsumer = codec
-            .docsConsumer(new PerDocWriteState(segmentWriteState));
-        boolean success = false;
-        try {
-          final MultiPerDocValues multiPerDocValues = new MultiPerDocValues(perDocProducers
-              .toArray(PerDocValues.EMPTY_ARRAY), perDocSlices
-              .toArray(ReaderUtil.Slice.EMPTY_ARRAY));
-          docsConsumer.merge(mergeState, multiPerDocValues);
-          success = true;
-        } finally {
-          IOUtils.closeSafely(!success, docsConsumer);
-        }
+      docBase += maxDoc;
+    }
+    perDocBitsStarts.add(docBase);
+    if (!perDocSlices.isEmpty()) {
+      mergeState.multiLiveDocs = new MultiBits(perDocBits, perDocBitsStarts,
+          true);
+      final PerDocConsumer docsConsumer = codec
+          .docsConsumer(new PerDocWriteState(segmentWriteState));
+      boolean success = false;
+      try {
+        final MultiPerDocValues multiPerDocValues = new MultiPerDocValues(
+            perDocProducers.toArray(PerDocValues.EMPTY_ARRAY),
+            perDocSlices.toArray(ReaderUtil.Slice.EMPTY_ARRAY));
+        docsConsumer.merge(mergeState, multiPerDocValues);
+        success = true;
+      } finally {
+        IOUtils.closeSafely(!success, docsConsumer);
       }
-    } finally {
-      IOUtils.closeSafely(false, perDocProducers);
     }
+    /* don't close the perDocProducers here since they are private segment producers
+     * and will be closed once the SegmentReader goes out of scope */ 
   }
 
   private MergeState mergeState;