You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/05/23 02:28:06 UTC

svn commit: r1341688 - in /lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene: codecs/sep/ codecs/simpletext/ index/

Author: mikemccand
Date: Wed May 23 00:28:05 2012
New Revision: 1341688

URL: http://svn.apache.org/viewvc?rev=1341688&view=rev
Log:
LUCENE-4055: clean up some nocommits

Modified:
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java Wed May 23 00:28:05 2012
@@ -51,7 +51,7 @@ public class SepDocValuesConsumer extend
 
   @Override
   public void abort() {
-    // nocommit must we really delete the files...?  IFD
-    // will do so I think?
+    // We don't have to remove files here: IndexFileDeleter
+    // will do so
   }
 }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Wed May 23 00:28:05 2012
@@ -123,8 +123,8 @@ public class SimpleTextNormsFormat exten
     
     @Override
     public void abort() {
-      // nocommit must we really delete the files...?  IFD
-      // will do so I think?
+      // We don't have to remove files here: IndexFileDeleter
+      // will do so
     }
   }
 }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java Wed May 23 00:28:05 2012
@@ -57,8 +57,8 @@ class SimpleTextPerDocConsumer extends P
 
   @Override
   public void abort() {
-    // nocommit must we really delete the files...?  IFD
-    // will do so I think?
+    // We don't have to remove files here: IndexFileDeleter
+    // will do so
   }
   
   static String docValuesId(String segmentsName, int fieldId) {

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java Wed May 23 00:28:05 2012
@@ -25,8 +25,6 @@ import org.apache.lucene.codecs.SegmentI
 import org.apache.lucene.index.IndexFileNames;
 import org.apache.lucene.index.SegmentInfo;
 
-// nocommit rename (remove s)
-
 /**
  * plain text segments file format.
  * <p>

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java Wed May 23 00:28:05 2012
@@ -40,8 +40,6 @@ import org.apache.lucene.util.StringHelp
 
 import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfoWriter.*;
 
-// nocommit rename (remove s)
-
 /**
  * reads plaintext segments files
  * <p>

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java Wed May 23 00:28:05 2012
@@ -35,8 +35,6 @@ import org.apache.lucene.store.IndexOutp
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IOUtils;
 
-// nocommit rename (remove s)
-
 /**
  * writes plaintext segments files
  * <p>

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Wed May 23 00:28:05 2012
@@ -485,6 +485,7 @@ class DocumentsWriterPerThread {
     try {
       consumer.flush(flushState);
       pendingDeletes.terms.clear();
+      // nocommit use setter and make this a SetOnce:
       segmentInfo.docCount = flushState.numDocs;
       segmentInfo.setFiles(new HashSet<String>(directory.getCreatedFiles()));
 

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1341688&r1=1341687&r2=1341688&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Wed May 23 00:28:05 2012
@@ -2302,6 +2302,8 @@ public class IndexWriter implements Clos
       }
 
       MergeState mergeState = merger.merge();                // merge 'em
+
+      // nocommit use setter and make this a SetOnce:
       info.docCount = mergeState.mergedDocCount;
 
       SegmentInfoPerCommit infoPerCommit = new SegmentInfoPerCommit(info, 0, -1L);
@@ -3499,6 +3501,7 @@ public class IndexWriter implements Clos
 
       // This is where all the work happens:
       MergeState mergeState = merger.merge();
+      // nocommit use setter and make this a SetOnce:
       merge.info.info.docCount = mergeState.mergedDocCount;
       merge.info.info.setFiles(new HashSet<String>(dirWrapper.getCreatedFiles()));