From efefcc832bf087a11c78a00009f74cfa3a54e3c1 Mon Sep 17 00:00:00 2001
From: Michael McCandless <mikemccand@apache.org>
Date: Wed, 23 May 2012 20:10:47 +0000
Subject: [PATCH] LUCENE-4055: clean up nocommits

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1342012 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/lucene/index/IndexFileDeleter.java    |  1 -
 .../org/apache/lucene/index/IndexWriter.java     | 16 +++++++++++-----
 .../lucene/index/SegmentInfoPerCommit.java       |  3 ---
 .../org/apache/lucene/index/TypePromoter.java    |  5 +++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
index 93c06da9036..6aa56a4cb0a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
@@ -331,7 +331,6 @@ final class IndexFileDeleter {
 
     for(int i=0;i<files.length;i++) {
       String fileName = files[i];
-      // nocommit nuke this filtering
       if ((segmentName == null || fileName.startsWith(segmentPrefix1) || fileName.startsWith(segmentPrefix2)) &&
           !fileName.endsWith("write.lock") &&
           !refCounts.containsKey(fileName) &&
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index a30eb231e07..62ca43bfa67 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -746,10 +746,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
       }
     }
 
-    // nocommit we can also pull the DV types of the
-    // fields... and catch DV type change on addDoc
-    // instead of much later in merge
-    //}
+    // TODO: we could also pull DV type of each field here,
+    // and use that to make sure new segment(s) don't change
+    // the type...
 
     return map;
   }
@@ -3553,7 +3552,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
           }
         }
 
-        // nocommit why on earth do we suddenly set success back to false here!?
+        // So that, if we hit exc in deleteNewFiles (next)
+        // or in commitMerge (later), we close the
+        // per-segment readers in the finally clause below:
         success = false;
 
         synchronized(this) {
@@ -3573,6 +3574,11 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
         }
 
         merge.info.info.setUseCompoundFile(true);
+      } else {
+        // So that, if we hit exc in commitMerge (later),
+        // we close the per-segment readers in the finally
+        // clause below:
+        success = false;
       }
 
       // Have codec write SegmentInfo.  Must do this after
diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
index 7fe89f25387..ed4792ac159 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
@@ -28,8 +28,6 @@ import org.apache.lucene.store.Directory;
  *
  *  @lucene.experimental */
 
-// nocommit this class feels alot like ReaderAndLiveDocs...?
-// like it carries mutable per-segment state....?
 public class SegmentInfoPerCommit {
 
   public final SegmentInfo info;
@@ -135,7 +133,6 @@ public class SegmentInfoPerCommit {
 
   @Override
   public SegmentInfoPerCommit clone() {
-    // nocommit ok?  SI is immutable!?
     return new SegmentInfoPerCommit(info, delCount, delGen);
   }
 }
diff --git a/lucene/core/src/java/org/apache/lucene/index/TypePromoter.java b/lucene/core/src/java/org/apache/lucene/index/TypePromoter.java
index 97d737229fd..db94b0ae045 100644
--- a/lucene/core/src/java/org/apache/lucene/index/TypePromoter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/TypePromoter.java
@@ -21,8 +21,9 @@ import java.util.Map;
 
 import org.apache.lucene.index.DocValues.Type;
 
-// nocommit remove this?  (require DV type does not change
-// for a given field)
+// TODO: maybe we should not automagically promote
+// types... and instead require a given field always has the
+// same type?
 
 /**
  * Type promoter that promotes {@link DocValues} during merge based on