lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1198768 - /lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
Date Mon, 07 Nov 2011 15:06:32 GMT
Author: rmuir
Date: Mon Nov  7 15:06:32 2011
New Revision: 1198768

URL: http://svn.apache.org/viewvc?rev=1198768&view=rev
Log:
LUCENE-2621: documentation/dead code cleanup

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

Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1198768&r1=1198767&r2=1198768&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
(original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
Mon Nov  7 15:06:32 2011
@@ -331,7 +331,7 @@ final class SegmentMerger {
         // doc; ie we just have to renumber the field number
         // on the fly?
         // NOTE: it's very important to first assign to doc then pass it to
-        // termVectorsWriter.addAllDocVectors; see LUCENE-1282
+        // fieldsWriter.addDocument; see LUCENE-1282
         Document doc = reader.reader.document(j);
         fieldsWriter.addDocument(doc, fieldInfos);
         docCount++;
@@ -358,7 +358,7 @@ final class SegmentMerger {
     } else {
       for (; docCount < maxDoc; docCount++) {
         // NOTE: it's very important to first assign to doc then pass it to
-        // termVectorsWriter.addAllDocVectors; see LUCENE-1282
+        // fieldsWriter.addDocument; see LUCENE-1282
         Document doc = reader.reader.document(docCount);
         fieldsWriter.addDocument(doc, fieldInfos);
         checkAbort.work(300);
@@ -484,10 +484,6 @@ final class SegmentMerger {
   }
 
   private final void mergeTerms(SegmentWriteState segmentWriteState) throws CorruptIndexException,
IOException {
-
-    // Let CodecProvider decide which codec will be used to write
-    // the new segment:
-
     int docBase = 0;
     
     final List<Fields> fields = new ArrayList<Fields>();
@@ -520,14 +516,12 @@ final class SegmentMerger {
     mergeState.checkAbort = checkAbort;
 
     docBase = 0;
-    int inputDocBase = 0;
 
     for(int i=0;i<mergeState.readerCount;i++) {
 
       final MergeState.IndexReaderAndLiveDocs reader = readers.get(i);
 
       mergeState.docBase[i] = docBase;
-      inputDocBase += reader.reader.maxDoc();
       final int maxDoc = reader.reader.maxDoc();
       if (reader.liveDocs != null) {
         int delCount = 0;



Mime
View raw message