From ffb88a89ef44256f91041c9a63906cdaab0778e3 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 22 May 2012 21:12:37 +0000
Subject: [PATCH] LUCENE-4055: clean up some nocommits

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1341628 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/lucene/codecs/lucene3x/TermBuffer.java   | 2 +-
 .../lucene/codecs/lucene40/Lucene40PostingsWriter.java       | 5 +++--
 lucene/core/src/java/org/apache/lucene/index/FieldInfos.java | 2 +-
 .../core/src/java/org/apache/lucene/index/SegmentInfos.java  | 4 ----
 .../org/apache/lucene/codecs/lucene3x/TermInfosWriter.java   | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
index 90620df508d..097b00145f4 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
@@ -67,7 +67,7 @@ final class TermBuffer implements Cloneable {
     final int fieldNumber = input.readVInt();
     if (fieldNumber != currentFieldNumber) {
       currentFieldNumber = fieldNumber;
-      // nocommit: too much sneakiness here, seriously this is a negative vint?!
+      // NOTE: too much sneakiness here, seriously this is a negative vint?!
       if (currentFieldNumber == -1) {
         field = "";
       } else {
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
index f58ab5b8a7e..64a3137782e 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
@@ -103,8 +103,9 @@ public final class Lucene40PostingsWriter extends PostingsWriterBase {
     freqOut = state.directory.createOutput(fileName, state.context);
     boolean success = false;
     try {
-      // nocommit this isn't quite right: it should be only
-      // the fields indexed by us...?  maybe... we shouldn't
+      // TODO: this is a best effort, if one of these fields has no postings
+      // then we make an empty prx file, same as if we are wrapped in 
+      // per-field postingsformat. maybe... we shouldn't
       // bother w/ this opto?  just create empty prx file...?
       if (state.fieldInfos.hasProx()) {
         // At least one field does not omit TF, so create the
diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
index 3d8a72d273e..c49fcc03d09 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
@@ -243,7 +243,7 @@ public class FieldInfos implements Iterable<FieldInfo> {
      * @param storePayloads true if payloads should be stored for this field
      * @param indexOptions if term freqs should be omitted for this field
      */
-    // nocommit: fix testCodecs to do this another way, its the only user of this
+    // TODO: fix testCodecs to do this another way, its the only user of this
     FieldInfo addOrUpdate(String name, boolean isIndexed, boolean storeTermVector,
                          boolean omitNorms, boolean storePayloads, IndexOptions indexOptions, DocValues.Type docValues, DocValues.Type normType) {
       return addOrUpdateInternal(name, -1, isIndexed, storeTermVector, omitNorms, storePayloads, indexOptions, docValues, normType);
diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
index 3c6d1d56ecf..b96823f3b0d 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
@@ -350,10 +350,6 @@ public final class SegmentInfos implements Cloneable, Iterable<SegmentInfoPerCom
     ChecksumIndexOutput segnOutput = null;
     boolean success = false;
 
-    // nocommit document somewhere that we store this
-    // list-of-segs plus delGen plus other stuff
-    // "generically" and then codec gets to write SI
-
     final Set<String> upgradedSIFiles = new HashSet<String>();
 
     try {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
index 1c68b5be4e1..d7cc07accd5 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
@@ -156,7 +156,7 @@ final class TermInfosWriter implements Closeable {
     return true;
   }
   
-  // nocommit: temporary hacknuke this.
+  /** note: -1 is the empty field: "" !!!! */
   static String fieldName(FieldInfos infos, int fieldNumber) {
     FieldInfo fi = infos.fieldInfo(fieldNumber);
     return (fi != null) ? fi.name : "";