svn commit: r1233530 - /lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java

[rm...@apache.org]

Author: rmuir
Date: Thu Jan 19 18:52:27 2012
New Revision: 1233530

URL: http://svn.apache.org/viewvc?rev=1233530&view=rev
Log:
LUCENE-3661: remove bitvector from segmentreader

Modified:
    lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java

Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1233530&r1=1233529&r2=1233530&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentReader.java Thu Jan 19 18:52:27 2012
@@ -23,7 +23,6 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.codecs.PerDocProducer;
 import org.apache.lucene.codecs.StoredFieldsReader;
 import org.apache.lucene.codecs.TermVectorsReader;
-import org.apache.lucene.codecs.lucene40.BitVector; // nocommit: move asserts/checks to codec
 import org.apache.lucene.search.FieldCache; // javadocs
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.util.Bits;
@@ -125,24 +124,21 @@ public final class SegmentReader extends
     return liveDocs;
   }
 
-  // nocommit
   private boolean checkLiveCounts(boolean isNRT) throws IOException {
-    BitVector liveDocs = (BitVector) this.liveDocs;
+    MutableBits liveDocs = (MutableBits) this.liveDocs;
     if (liveDocs != null) {
-      if (liveDocs.size() != si.docCount) {
-        throw new CorruptIndexException("document count mismatch: deleted docs count " + liveDocs.size() + " vs segment doc count " + si.docCount + " segment=" + si.name);
+      if (liveDocs.length() != si.docCount) {
+        throw new CorruptIndexException("document count mismatch: deleted docs count " + liveDocs.length() + " vs segment doc count " + si.docCount + " segment=" + si.name);
       }
 
-      final int recomputedCount = liveDocs.getRecomputedCount();
-      // Verify BitVector is self consistent:
-      assert liveDocs.count() == recomputedCount : "live count=" + liveDocs.count() + " vs recomputed count=" + recomputedCount;
+      final int count = liveDocs.count();
 
       // Verify our docCount matches:
-      assert numDocs == recomputedCount :
-      "delete count mismatch: numDocs=" + numDocs + " vs BitVector=" + (si.docCount-recomputedCount);
+      assert numDocs == count :
+      "delete count mismatch: numDocs=" + numDocs + " vs BitVector=" + (si.docCount-count);
 
-      assert isNRT || si.docCount - si.getDelCount() == recomputedCount :
-        "si.docCount=" + si.docCount + "si.getDelCount()=" + si.getDelCount() + " recomputedCount=" + recomputedCount;
+      assert isNRT || si.docCount - si.getDelCount() == count :
+        "si.docCount=" + si.docCount + "si.getDelCount()=" + si.getDelCount() + " recomputedCount=" + count;
     }
   
     return true;