svn commit: r1591808 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java

[rm...@apache.org]

Author: rmuir
Date: Fri May  2 02:54:53 2014
New Revision: 1591808

URL: http://svn.apache.org/r1591808
Log:
LUCENE-5611: lazy-init the stored fields writer like before to prevent leaks

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java?rev=1591808&r1=1591807&r2=1591808&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java Fri May  2 02:54:53 2014
@@ -51,7 +51,8 @@ final class DefaultIndexingChain extends
   // Writes postings and term vectors:
   final TermsHash termsHash;
 
-  final StoredFieldsWriter storedFieldsWriter;
+  // lazy init:
+  private StoredFieldsWriter storedFieldsWriter;
   private int lastStoredDocID; 
 
   // NOTE: I tried using Hash Map<String,PerField>
@@ -75,12 +76,16 @@ final class DefaultIndexingChain extends
     this.docState = docWriter.docState;
     this.bytesUsed = docWriter.bytesUsed;
 
-    // Writes stored fields:
-    storedFieldsWriter = docWriter.codec.storedFieldsFormat().fieldsWriter(docWriter.directory, docWriter.getSegmentInfo(), IOContext.DEFAULT);
-
     TermsHash termVectorsWriter = new TermVectorsConsumer(docWriter);
     termsHash = new FreqProxTermsWriter(docWriter, termVectorsWriter);
   }
+  
+  // TODO: can we remove this lazy-init / make cleaner / do it another way...? 
+  private void initStoredFieldsWriter() throws IOException {
+    if (storedFieldsWriter == null) {
+      storedFieldsWriter = docWriter.codec.storedFieldsFormat().fieldsWriter(docWriter.directory, docWriter.getSegmentInfo(), IOContext.DEFAULT);
+    }
+  }
 
   @Override
   public void flush(SegmentWriteState state) throws IOException {
@@ -92,6 +97,8 @@ final class DefaultIndexingChain extends
     writeNorms(state);
     writeDocValues(state);
     
+    // its possible all docs hit non-aborting exceptions...
+    initStoredFieldsWriter();
     fillStoredFields(numDocs);
     storedFieldsWriter.finish(state.fieldInfos, numDocs);
     storedFieldsWriter.close();
@@ -246,6 +253,7 @@ final class DefaultIndexingChain extends
   private void startStoredFields() throws IOException {
     boolean success = false;
     try {
+      initStoredFieldsWriter();
       storedFieldsWriter.startDocument();
       success = true;
     } finally {

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1591808&r1=1591807&r2=1591808&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Fri May  2 02:54:53 2014
@@ -2254,7 +2254,6 @@ public class TestIndexWriter extends Luc
     IOUtils.close(reader, w, dir);
   }
   
-  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-5611")
   public void testIterableThrowsException2() throws IOException {
     Directory dir = newDirectory();
     IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(