Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java
--- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -23,13 +23,13 @@
 public class InstantiatedDocsAndPositionsEnum extends DocsAndPositionsEnum {
   private int upto;
   private int posUpto;
-  private Bits skipDocs;
+  private Bits keepDocs;
   private InstantiatedTerm term;
   protected InstantiatedTermDocumentInformation currentDoc;
   private final BytesRef payload = new BytesRef();
 
-  public InstantiatedDocsAndPositionsEnum reset(Bits skipDocs, InstantiatedTerm term) {
-    this.skipDocs = skipDocs;
+  public InstantiatedDocsAndPositionsEnum reset(Bits keepDocs, InstantiatedTerm term) {
+    this.keepDocs = keepDocs;
     this.term = term;
     upto = -1;
     return this;
@@ -47,7 +47,7 @@
       return NO_MORE_DOCS;
     } else {
       currentDoc = term.getAssociatedDocuments()[upto];
-      if (skipDocs == null || !skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+      if (keepDocs == null || keepDocs.get(currentDoc.getDocument().getDocumentNumber())) {
         posUpto = -1;
         return docID();
       } else {
@@ -69,7 +69,7 @@
     }
     currentDoc = term.getAssociatedDocuments()[upto];
 
-    if (skipDocs != null && skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+    if (keepDocs != null && !keepDocs.get(currentDoc.getDocument().getDocumentNumber())) {
       return nextDoc();
     } else {
       posUpto = -1;
Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsEnum.java
--- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -21,12 +21,12 @@
 
 public class InstantiatedDocsEnum extends DocsEnum {
   private int upto;
-  private Bits skipDocs;
+  private Bits keepDocs;
   private InstantiatedTerm term;
   protected InstantiatedTermDocumentInformation currentDoc;
 
-  public InstantiatedDocsEnum reset(Bits skipDocs, InstantiatedTerm term) {
-    this.skipDocs = skipDocs;
+  public InstantiatedDocsEnum reset(Bits keepDocs, InstantiatedTerm term) {
+    this.keepDocs = keepDocs;
     this.term = term;
     upto = -1;
     return this;
@@ -44,7 +44,7 @@
       return NO_MORE_DOCS;
     } else {
       currentDoc = term.getAssociatedDocuments()[upto];
-      if (skipDocs == null || !skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+      if (keepDocs == null || keepDocs.get(currentDoc.getDocument().getDocumentNumber())) {
         return docID();
       } else {
         return nextDoc();
@@ -65,7 +65,7 @@
     }
     currentDoc = term.getAssociatedDocuments()[upto];
 
-    if (skipDocs != null && skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+    if (keepDocs != null && !keepDocs.get(currentDoc.getDocument().getDocumentNumber())) {
       return nextDoc();
     } else {
       return docID();
Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
--- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java	Sun Jun 26 14:21:07 2011 -0400
@@ -182,9 +182,9 @@
     }
 
     // create documents
-    final Bits delDocs = MultiFields.getDeletedDocs(sourceIndexReader);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(sourceIndexReader);
     for (int i = 0; i < sourceIndexReader.maxDoc(); i++) {
-      if (delDocs != null && delDocs.get(i)) {
+      if (notDelDocs != null && !notDelDocs.get(i)) {
         deletedDocuments.set(i);
       } else {
         InstantiatedDocument document = new InstantiatedDocument();
@@ -254,7 +254,7 @@
     // create term-document informations
     for (InstantiatedTerm term : orderedTerms) {
       DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(sourceIndexReader,
-                                                                            MultiFields.getDeletedDocs(sourceIndexReader),
+                                                                            MultiFields.getNotDeletedDocs(sourceIndexReader),
                                                                             term.getTerm().field(),
                                                                             new BytesRef(term.getTerm().text()));
       int position = 0;
Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermsEnum.java
--- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -118,19 +118,19 @@
   }
 
   @Override
-  public DocsEnum docs(Bits skipDocs, DocsEnum reuse) {
+  public DocsEnum docs(Bits keepDocs, DocsEnum reuse) {
     if (reuse == null || !(reuse instanceof InstantiatedDocsEnum)) {
       reuse = new InstantiatedDocsEnum();
     }
-    return ((InstantiatedDocsEnum) reuse).reset(skipDocs, terms[upto]);
+    return ((InstantiatedDocsEnum) reuse).reset(keepDocs, terms[upto]);
   }
 
   @Override
-  public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) {
+  public DocsAndPositionsEnum docsAndPositions(Bits keepDocs, DocsAndPositionsEnum reuse) {
     if (reuse == null || !(reuse instanceof InstantiatedDocsAndPositionsEnum)) {
       reuse = new InstantiatedDocsAndPositionsEnum();
     }
-    return ((InstantiatedDocsAndPositionsEnum) reuse).reset(skipDocs, terms[upto]);
+    return ((InstantiatedDocsAndPositionsEnum) reuse).reset(keepDocs, terms[upto]);
   }
 
   @Override
Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
--- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java	Sun Jun 26 14:21:07 2011 -0400
@@ -138,8 +138,8 @@
     testTermEnum.seekCeil(new BytesRef(t.text()));
     assertEquals(aprioriTermEnum.term(), testTermEnum.term());
 
-    DocsEnum aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getDeletedDocs(aprioriReader), null);
-    DocsEnum testTermDocs = testTermEnum.docs(MultiFields.getDeletedDocs(testReader), null);
+    DocsEnum aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getNotDeletedDocs(aprioriReader), null);
+    DocsEnum testTermDocs = testTermEnum.docs(MultiFields.getNotDeletedDocs(testReader), null);
 
     assertEquals(aprioriTermDocs.nextDoc(), testTermDocs.nextDoc());
     assertEquals(aprioriTermDocs.freq(), testTermDocs.freq());
@@ -186,8 +186,8 @@
     
     assertEquals(aprioriTermEnum.next(), testTermEnum.next());
     
-    aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getDeletedDocs(aprioriReader), aprioriTermDocs);
-    testTermDocs = testTermEnum.docs(MultiFields.getDeletedDocs(testReader), testTermDocs);
+    aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getNotDeletedDocs(aprioriReader), aprioriTermDocs);
+    testTermDocs = testTermEnum.docs(MultiFields.getNotDeletedDocs(testReader), testTermDocs);
 
     while (aprioriTermDocs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
       assertTrue(testTermDocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
@@ -309,13 +309,13 @@
     assertEquals(air.numDocs(), tir.numDocs());
     assertEquals(air.numDeletedDocs(), tir.numDeletedDocs());
 
-    final Bits aDelDocs = MultiFields.getDeletedDocs(air);
-    final Bits tDelDocs = MultiFields.getDeletedDocs(tir);
-    assertTrue((aDelDocs != null && tDelDocs != null) || 
-               (aDelDocs == null && tDelDocs == null));
-    if (aDelDocs != null) {
+    final Bits aNotDelDocs = MultiFields.getNotDeletedDocs(air);
+    final Bits tNotDelDocs = MultiFields.getNotDeletedDocs(tir);
+    assertTrue((aNotDelDocs != null && tNotDelDocs != null) || 
+               (aNotDelDocs == null && tNotDelDocs == null));
+    if (aNotDelDocs != null) {
       for (int d =0; d<air.maxDoc(); d++) {
-        assertEquals(aDelDocs.get(d), tDelDocs.get(d));
+        assertEquals(aNotDelDocs.get(d), tNotDelDocs.get(d));
       }
     }
 
@@ -366,13 +366,13 @@
       }
     }
 
-    final Bits apDelDocs = MultiFields.getDeletedDocs(aprioriReader);
-    final Bits testDelDocs = MultiFields.getDeletedDocs(testReader);
-    assertTrue((apDelDocs != null && testDelDocs != null) || 
-               (apDelDocs == null && testDelDocs == null));
-    if (apDelDocs != null) {
+    final Bits apNotDelDocs = MultiFields.getNotDeletedDocs(aprioriReader);
+    final Bits testNotDelDocs = MultiFields.getNotDeletedDocs(testReader);
+    assertTrue((apNotDelDocs != null && testNotDelDocs != null) || 
+               (apNotDelDocs == null && testNotDelDocs == null));
+    if (apNotDelDocs != null) {
       for (int docIndex = 0; docIndex < aprioriReader.numDocs(); docIndex++) {
-        assertEquals(apDelDocs.get(docIndex), testDelDocs.get(docIndex));
+        assertEquals(apNotDelDocs.get(docIndex), testNotDelDocs.get(docIndex));
       }
     }
 
@@ -407,8 +407,8 @@
 
         // compare termDocs seeking
 
-        DocsEnum aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getDeletedDocs(aprioriReader), null);
-        DocsEnum testTermDocs = testTermEnum.docs(MultiFields.getDeletedDocs(testReader), null);
+        DocsEnum aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getNotDeletedDocs(aprioriReader), null);
+        DocsEnum testTermDocs = testTermEnum.docs(MultiFields.getNotDeletedDocs(testReader), null);
         
         while (aprioriTermDocs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
           assertTrue(testTermDocs.advance(aprioriTermDocs.docID()) != DocsEnum.NO_MORE_DOCS);
@@ -419,8 +419,8 @@
         
         assertEquals(aprioriReader.docFreq(aprioriField, aprioriTermEnum.term()), testReader.docFreq(aprioriField, testTermEnum.term()));
 
-        aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getDeletedDocs(aprioriReader), aprioriTermDocs);
-        testTermDocs = testTermEnum.docs(MultiFields.getDeletedDocs(testReader), testTermDocs);
+        aprioriTermDocs = aprioriTermEnum.docs(MultiFields.getNotDeletedDocs(aprioriReader), aprioriTermDocs);
+        testTermDocs = testTermEnum.docs(MultiFields.getNotDeletedDocs(testReader), testTermDocs);
 
         while (true) {
           if (aprioriTermDocs.nextDoc() == DocsEnum.NO_MORE_DOCS) {
@@ -439,8 +439,8 @@
 
         // compare term positions
 
-        DocsAndPositionsEnum aprioriTermPositions = aprioriTermEnum.docsAndPositions(MultiFields.getDeletedDocs(aprioriReader), null);
-        DocsAndPositionsEnum testTermPositions = testTermEnum.docsAndPositions(MultiFields.getDeletedDocs(testReader), null);
+        DocsAndPositionsEnum aprioriTermPositions = aprioriTermEnum.docsAndPositions(MultiFields.getNotDeletedDocs(aprioriReader), null);
+        DocsAndPositionsEnum testTermPositions = testTermEnum.docsAndPositions(MultiFields.getNotDeletedDocs(testReader), null);
 
         if (VERBOSE) {
           System.out.println("TEST: enum1=" + aprioriTermPositions + " enum2=" + testTermPositions);
Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
--- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java	Sun Jun 26 14:21:07 2011 -0400
@@ -52,9 +52,11 @@
     IndexReader unoptimizedReader = IndexReader.open(dir, false);
     unoptimizedReader.deleteDocument(2);
 
+    System.out.println("R=" + unoptimizedReader);
     try {
-     new InstantiatedIndex(unoptimizedReader);
+      new InstantiatedIndex(unoptimizedReader);
     } catch (Exception e) {
+      e.printStackTrace(System.out);
       fail("No exceptions when loading an unoptimized reader!");
     }
 
Index: lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
--- lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	Sun Jun 26 14:21:07 2011 -0400
@@ -925,19 +925,19 @@
       }
 
       @Override
-      public DocsEnum docs(Bits skipDocs, DocsEnum reuse) {
+      public DocsEnum docs(Bits keepDocs, DocsEnum reuse) {
         if (reuse == null || !(reuse instanceof MemoryDocsEnum)) {
           reuse = new MemoryDocsEnum();
         }
-        return ((MemoryDocsEnum) reuse).reset(skipDocs, info.sortedTerms[termUpto].getValue());
+        return ((MemoryDocsEnum) reuse).reset(keepDocs, info.sortedTerms[termUpto].getValue());
       }
 
       @Override
-      public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) {
+      public DocsAndPositionsEnum docsAndPositions(Bits keepDocs, DocsAndPositionsEnum reuse) {
         if (reuse == null || !(reuse instanceof MemoryDocsAndPositionsEnum)) {
           reuse = new MemoryDocsAndPositionsEnum();
         }
-        return ((MemoryDocsAndPositionsEnum) reuse).reset(skipDocs, info.sortedTerms[termUpto].getValue());
+        return ((MemoryDocsAndPositionsEnum) reuse).reset(keepDocs, info.sortedTerms[termUpto].getValue());
       }
 
       @Override
@@ -962,10 +962,10 @@
     private class MemoryDocsEnum extends DocsEnum {
       private ArrayIntList positions;
       private boolean hasNext;
-      private Bits skipDocs;
+      private Bits keepDocs;
 
-      public DocsEnum reset(Bits skipDocs, ArrayIntList positions) {
-        this.skipDocs = skipDocs;
+      public DocsEnum reset(Bits keepDocs, ArrayIntList positions) {
+        this.keepDocs = keepDocs;
         this.positions = positions;
         hasNext = true;
         return this;
@@ -978,7 +978,7 @@
 
       @Override
       public int nextDoc() {
-        if (hasNext && (skipDocs == null || !skipDocs.get(0))) {
+        if (hasNext && (keepDocs == null || keepDocs.get(0))) {
           hasNext = false;
           return 0;
         } else {
@@ -1001,10 +1001,10 @@
       private ArrayIntList positions;
       private int posUpto;
       private boolean hasNext;
-      private Bits skipDocs;
+      private Bits keepDocs;
 
-      public DocsAndPositionsEnum reset(Bits skipDocs, ArrayIntList positions) {
-        this.skipDocs = skipDocs;
+      public DocsAndPositionsEnum reset(Bits keepDocs, ArrayIntList positions) {
+        this.keepDocs = keepDocs;
         this.positions = positions;
         posUpto = 0;
         hasNext = true;
@@ -1018,7 +1018,7 @@
 
       @Override
       public int nextDoc() {
-        if (hasNext && (skipDocs == null || !skipDocs.get(0))) {
+        if (hasNext && (keepDocs == null || keepDocs.get(0))) {
           hasNext = false;
           return 0;
         } else {
Index: lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
--- lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java	Sun Jun 26 14:21:07 2011 -0400
@@ -120,7 +120,7 @@
 
       final FieldInvertState invertState = new FieldInvertState();
       for(IndexReader subReader : subReaders) {
-        final Bits delDocs = subReader.getDeletedDocs();
+        final Bits notDelDocs = subReader.getNotDeletedDocs();
 
         int[] termCounts = new int[subReader.maxDoc()];
         Fields fields = subReader.fields();
@@ -130,7 +130,7 @@
             TermsEnum termsEnum = terms.iterator();
             DocsEnum docs = null;
             while(termsEnum.next() != null) {
-              docs = termsEnum.docs(delDocs, docs);
+              docs = termsEnum.docs(notDelDocs, docs);
               while(true) {
                 int docID = docs.nextDoc();
                 if (docID != docs.NO_MORE_DOCS) {
@@ -145,7 +145,7 @@
 
         invertState.setBoost(1.0f);
         for (int d = 0; d < termCounts.length; d++) {
-          if (delDocs == null || !delDocs.get(d)) {
+          if (notDelDocs == null || notDelDocs.get(d)) {
             invertState.setLength(termCounts[d]);
             subReader.setNorm(d, field, fieldSim.encodeNormValue(fieldSim.computeNorm(invertState)));
           }
Index: lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
--- lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -187,10 +187,10 @@
       dels = new OpenBitSet(in.maxDoc());
       if (in.hasDeletions()) {
         oldDels = new OpenBitSet(in.maxDoc());
-        final Bits oldDelBits = MultiFields.getDeletedDocs(in);
-        assert oldDelBits != null;
+        final Bits oldNotDelBits = MultiFields.getNotDeletedDocs(in);
+        assert oldNotDelBits != null;
         for (int i = 0; i < in.maxDoc(); i++) {
-          if (oldDelBits.get(i)) oldDels.set(i);
+          if (!oldNotDelBits.get(i)) oldDels.set(i);
         }
         dels.or(oldDels);
       }
Index: lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
--- lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -107,10 +107,10 @@
       }
 
       if (in.hasDeletions()) {
-        final Bits oldDelBits = in.getDeletedDocs();
-        assert oldDelBits != null;
+        final Bits oldNotDelBits = in.getNotDeletedDocs();
+        assert oldNotDelBits != null;
         for (int i = 0; i < in.maxDoc(); i++) {
-          if (oldDelBits.get(i)) {
+          if (!oldNotDelBits.get(i)) {
             bits.set(i);
           }
         }
Index: lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java
--- lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java	Sun Jun 26 14:21:07 2011 -0400
@@ -96,7 +96,7 @@
       positions.clear();
     }
 
-    final Bits delDocs = MultiFields.getDeletedDocs(indexReader);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(indexReader);
 
     Terms terms = MultiFields.getTerms(indexReader, field);
     boolean anyTerms = false;
@@ -109,9 +109,9 @@
         if (text != null) {
           anyTerms = true;
           if (!mapper.isIgnoringPositions()) {
-            docs = postings = termsEnum.docsAndPositions(delDocs, postings);
+            docs = postings = termsEnum.docsAndPositions(notDelDocs, postings);
           } else {
-            docs = termsEnum.docs(delDocs, docs);
+            docs = termsEnum.docs(notDelDocs, docs);
           }
 
           int docID = docs.advance(documentNumber);
Index: lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
--- lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java	Sun Jun 26 14:21:07 2011 -0400
@@ -190,8 +190,8 @@
       return 0;
     }
 
-    Bits skipDocs = MultiFields.getDeletedDocs(reader);
-    if (skipDocs == null) {
+    Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
+    if (notDelDocs == null) {
       // TODO: we could do this up front, during the scan
       // (next()), instead of after-the-fact here w/ seek,
       // if the codec supports it and there are no del
@@ -202,7 +202,7 @@
       }
     }
     
-    DocsEnum de = termsEnum.docs(skipDocs, null);
+    DocsEnum de = termsEnum.docs(notDelDocs, null);
 
     // use DocsEnum.read() and BulkResult api
     final DocsEnum.BulkReadResult bulkresult = de.getBulkResult();
Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
--- lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java	Sun Jun 26 14:21:07 2011 -0400
@@ -134,11 +134,11 @@
           System.out.println("TEST: now warm merged reader=" + reader);
         }
         final int maxDoc = reader.maxDoc();
-        final Bits delDocs = reader.getDeletedDocs();
+        final Bits notDelDocs = reader.getNotDeletedDocs();
         int sum = 0;
         final int inc = Math.max(1, maxDoc/50);
         for(int docID=0;docID<maxDoc;docID += inc) {
-          if (delDocs == null || !delDocs.get(docID)) {
+          if (notDelDocs == null || notDelDocs.get(docID)) {
             final Document doc = reader.document(docID);
             sum += doc.getFields().size();
           }
Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
--- lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -87,9 +87,9 @@
   }
   
   private void checkContents(IndexReader ir, String indexname) throws Exception {
-    final Bits delDocs = MultiFields.getDeletedDocs(ir);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(ir);
     for (int i = 0; i < ir.maxDoc(); i++) {
-      if (delDocs == null || !delDocs.get(i)) {
+      if (notDelDocs == null || notDelDocs.get(i)) {
         assertEquals(indexname, ir.document(i).get("indexname"));
       }
     }
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java
--- lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -86,7 +86,7 @@
 	
   private OpenBitSet correctBits(IndexReader reader) throws IOException {
     OpenBitSet bits = new OpenBitSet(reader.maxDoc()); //assume all are INvalid
-    final Bits delDocs = MultiFields.getDeletedDocs(reader);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
     Terms terms = reader.fields().terms(fieldName);
     if (terms != null) {
       TermsEnum termsEnum = terms.iterator();
@@ -96,7 +96,7 @@
         if (currTerm == null) {
           break;
         } else {
-          docs = termsEnum.docs(delDocs, docs);
+          docs = termsEnum.docs(notDelDocs, docs);
           int doc = docs.nextDoc();
           if (doc != DocsEnum.NO_MORE_DOCS) {
             if (keepMode == KM_USE_FIRST_OCCURRENCE) {
@@ -124,7 +124,7 @@
 		
     OpenBitSet bits=new OpenBitSet(reader.maxDoc());
     bits.set(0,reader.maxDoc()); //assume all are valid
-    final Bits delDocs = MultiFields.getDeletedDocs(reader);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
     Terms terms = reader.fields().terms(fieldName);
     if (terms != null) {
       TermsEnum termsEnum = terms.iterator();
@@ -136,7 +136,7 @@
         } else {
           if (termsEnum.docFreq() > 1) {
             // unset potential duplicates
-            docs = termsEnum.docs(delDocs, docs);
+            docs = termsEnum.docs(notDelDocs, docs);
             int doc = docs.nextDoc();
             if (doc != DocsEnum.NO_MORE_DOCS) {
               if (keepMode == KM_USE_FIRST_OCCURRENCE) {
Index: lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java
--- lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -63,7 +63,7 @@
     OpenBitSet result=new OpenBitSet(reader.maxDoc());
     Fields fields = reader.fields();
     BytesRef br = new BytesRef();
-    Bits delDocs = reader.getDeletedDocs();
+    Bits notDelDocs = reader.getNotDeletedDocs();
     if (fields != null) {
       String lastField = null;
       Terms termsC = null;
@@ -80,7 +80,7 @@
         if (terms != null) {
           br.copy(term.bytes());
           if (termsEnum.seekCeil(br) == TermsEnum.SeekStatus.FOUND) {
-            docs = termsEnum.docs(delDocs, docs);
+            docs = termsEnum.docs(notDelDocs, docs);
             while(docs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
               result.set(docs.docID());
             }
Index: lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
--- lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java	Sun Jun 26 14:21:07 2011 -0400
@@ -139,7 +139,7 @@
 			Document d=searcher.doc(hits[i].doc);
 			String url=d.get(KEY_FIELD);
                         DocsEnum td = MultiFields.getTermDocsEnum(reader,
-                                                                  MultiFields.getDeletedDocs(reader),
+                                                                  MultiFields.getNotDeletedDocs(reader),
                                                                   KEY_FIELD,
                                                                   new BytesRef(url));
 			int lastDoc=0;
@@ -163,7 +163,7 @@
 			Document d=searcher.doc(hits[i].doc);
 			String url=d.get(KEY_FIELD);
                         DocsEnum td = MultiFields.getTermDocsEnum(reader,
-                                                                  MultiFields.getDeletedDocs(reader),
+                                                                  MultiFields.getNotDeletedDocs(reader),
                                                                   KEY_FIELD,
                                                                   new BytesRef(url));
 			int lastDoc=0;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -46,7 +46,7 @@
   
   @Override
   public DocIdSet getDocIdSet(final AtomicReaderContext context) throws IOException {
-    final Bits delDocs = context.reader.getDeletedDocs();
+    final Bits notDelDocs = context.reader.getNotDeletedDocs();
     final List<Double> area = shape.getArea();
     final int sz = area.size();
     
@@ -58,7 +58,7 @@
       return new DocIdSet() {
         @Override
         public DocIdSetIterator iterator() throws IOException {
-          return context.reader.termDocsEnum(delDocs, fieldName, bytesRef);
+          return context.reader.termDocsEnum(notDelDocs, fieldName, bytesRef);
         }
         
         @Override
@@ -71,7 +71,7 @@
       for (int i =0; i< sz; i++) {
         double boxId = area.get(i).doubleValue();
         NumericUtils.longToPrefixCoded(NumericUtils.doubleToSortableLong(boxId), 0, bytesRef);
-        final DocsEnum docsEnum = context.reader.termDocsEnum(delDocs, fieldName, bytesRef);
+        final DocsEnum docsEnum = context.reader.termDocsEnum(notDelDocs, fieldName, bytesRef);
         if (docsEnum == null) continue;
         // iterate through all documents
         // which have this boxId
Index: lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
--- lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java	Sun Jun 26 14:21:07 2011 -0400
@@ -399,7 +399,7 @@
       // System.out.println("  term=" + term);
 
       if (termsEnum.seekExact(term.bytes(), false)) {
-        DocsEnum docsEnum = termsEnum.docs(reader.getDeletedDocs(), docs);
+        DocsEnum docsEnum = termsEnum.docs(reader.getNotDeletedDocs(), docs);
 
         if (docsEnum != null) {
           while (true) {
Index: lucene/src/java/org/apache/lucene/index/CheckIndex.java
--- lucene/src/java/org/apache/lucene/index/CheckIndex.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/CheckIndex.java	Sun Jun 26 14:21:07 2011 -0400
@@ -654,7 +654,7 @@
     final Status.TermIndexStatus status = new Status.TermIndexStatus();
 
     final int maxDoc = reader.maxDoc();
-    final Bits delDocs = reader.getDeletedDocs();
+    final Bits acceptDocs = reader.getNotDeletedDocs();
 
     final IndexSearcher is = new IndexSearcher(reader);
 
@@ -712,8 +712,8 @@
           final int docFreq = terms.docFreq();
           status.totFreq += docFreq;
 
-          docs = terms.docs(delDocs, docs);
-          postings = terms.docsAndPositions(delDocs, postings);
+          docs = terms.docs(acceptDocs, docs);
+          postings = terms.docsAndPositions(acceptDocs, postings);
 
           if (hasOrd) {
             long ord = -1;
@@ -815,7 +815,7 @@
             if (hasPositions) {
               for(int idx=0;idx<7;idx++) {
                 final int skipDocID = (int) (((idx+1)*(long) maxDoc)/8);
-                postings = terms.docsAndPositions(delDocs, postings);
+                postings = terms.docsAndPositions(acceptDocs, postings);
                 final int docID = postings.advance(skipDocID);
                 if (docID == DocsEnum.NO_MORE_DOCS) {
                   break;
@@ -851,7 +851,7 @@
             } else {
               for(int idx=0;idx<7;idx++) {
                 final int skipDocID = (int) (((idx+1)*(long) maxDoc)/8);
-                docs = terms.docs(delDocs, docs);
+                docs = terms.docs(acceptDocs, docs);
                 final int docID = docs.advance(skipDocID);
                 if (docID == DocsEnum.NO_MORE_DOCS) {
                   break;
@@ -919,7 +919,7 @@
                 throw new RuntimeException("seek to existing term " + seekTerms[i] + " failed");
               }
               
-              docs = terms.docs(delDocs, docs);
+              docs = terms.docs(acceptDocs, docs);
               if (docs == null) {
                 throw new RuntimeException("null DocsEnum from to existing term " + seekTerms[i]);
               }
@@ -967,9 +967,9 @@
       }
 
       // Scan stored fields for all documents
-      final Bits delDocs = reader.getDeletedDocs();
+      final Bits acceptDocs = reader.getNotDeletedDocs();
       for (int j = 0; j < info.docCount; ++j) {
-        if (delDocs == null || !delDocs.get(j)) {
+        if (acceptDocs == null || acceptDocs.get(j)) {
           status.docCount++;
           Document doc = reader.document(j);
           status.totFields += doc.getFields().size();
@@ -1059,9 +1059,9 @@
         infoStream.print("    test: term vectors........");
       }
 
-      final Bits delDocs = reader.getDeletedDocs();
+      final Bits acceptDocs = reader.getNotDeletedDocs();
       for (int j = 0; j < info.docCount; ++j) {
-        if (delDocs == null || !delDocs.get(j)) {
+        if (acceptDocs == null || acceptDocs.get(j)) {
           status.docCount++;
           TermFreqVector[] tfv = reader.getTermFreqVectors(j);
           if (tfv != null) {
Index: lucene/src/java/org/apache/lucene/index/DocTermOrds.java
--- lucene/src/java/org/apache/lucene/index/DocTermOrds.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/DocTermOrds.java	Sun Jun 26 14:21:07 2011 -0400
@@ -249,7 +249,7 @@
 
     boolean testedOrd = false;
 
-    final Bits delDocs = MultiFields.getDeletedDocs(reader);
+    final Bits acceptDocs = MultiFields.getNotDeletedDocs(reader);
 
     // we need a minimum of 9 bytes, but round up to 12 since the space would
     // be wasted with most allocators anyway.
@@ -312,7 +312,7 @@
       final int df = te.docFreq();
       if (df <= maxTermDocFreq) {
 
-        docsEnum = te.docs(delDocs, docsEnum);
+        docsEnum = te.docs(acceptDocs, docsEnum);
 
         final DocsEnum.BulkReadResult bulkResult = docsEnum.getBulkResult();
 
@@ -653,13 +653,13 @@
     }
 
     @Override    
-    public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
-      return termsEnum.docs(skipDocs, reuse);
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
+      return termsEnum.docs(acceptDocs, reuse);
     }
 
     @Override    
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
-      return termsEnum.docsAndPositions(skipDocs, reuse);
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
+      return termsEnum.docsAndPositions(acceptDocs, reuse);
     }
 
     @Override
Index: lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
--- lucene/src/java/org/apache/lucene/index/FilterIndexReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/FilterIndexReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -87,13 +87,13 @@
     }
 
     @Override
-    public DocsEnum docs(Bits skipDocs, BytesRef text, DocsEnum reuse) throws IOException {
-      return in.docs(skipDocs, text, reuse);
+    public DocsEnum docs(Bits acceptDocs, BytesRef text, DocsEnum reuse) throws IOException {
+      return in.docs(acceptDocs, text, reuse);
     }
 
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, BytesRef text, DocsAndPositionsEnum reuse) throws IOException {
-      return in.docsAndPositions(skipDocs, text, reuse);
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, BytesRef text, DocsAndPositionsEnum reuse) throws IOException {
+      return in.docsAndPositions(acceptDocs, text, reuse);
     }
 
     @Override
@@ -172,13 +172,13 @@
     }
 
     @Override
-    public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
-      return in.docs(skipDocs, reuse);
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
+      return in.docs(acceptDocs, reuse);
     }
 
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
-      return in.docsAndPositions(skipDocs, reuse);
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
+      return in.docsAndPositions(acceptDocs, reuse);
     }
 
     @Override
@@ -304,6 +304,13 @@
   public Bits getDeletedDocs() {
     return in.getDeletedDocs();
   }
+
+  /*
+  @Override
+  public Bits getNotDeletedDocs() {
+    return in.getNotDeletedDocs();
+  }
+  */
   
   @Override
   public TermFreqVector[] getTermFreqVectors(int docNumber)
Index: lucene/src/java/org/apache/lucene/index/IndexReader.java
--- lucene/src/java/org/apache/lucene/index/IndexReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/IndexReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -29,6 +29,7 @@
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.NotBits;
 import org.apache.lucene.util.ReaderUtil;         // for javadocs
 
 import java.io.File;
@@ -1136,7 +1137,7 @@
   /** Returns {@link DocsEnum} for the specified field &
    *  term.  This may return null, if either the field or
    *  term does not exist. */
-  public DocsEnum termDocsEnum(Bits skipDocs, String field, BytesRef term) throws IOException {
+  public DocsEnum termDocsEnum(Bits acceptDocs, String field, BytesRef term) throws IOException {
     assert field != null;
     assert term != null;
     final Fields fields = fields();
@@ -1145,7 +1146,7 @@
     }
     final Terms terms = fields.terms(field);
     if (terms != null) {
-      return terms.docs(skipDocs, term, null);
+      return terms.docs(acceptDocs, term, null);
     } else {
       return null;
     }
@@ -1155,7 +1156,7 @@
    *  field & term.  This may return null, if either the
    *  field or term does not exist, or, positions were not
    *  stored for this term. */
-  public DocsAndPositionsEnum termPositionsEnum(Bits skipDocs, String field, BytesRef term) throws IOException {
+  public DocsAndPositionsEnum termPositionsEnum(Bits acceptDocs, String field, BytesRef term) throws IOException {
     assert field != null;
     assert term != null;
     final Fields fields = fields();
@@ -1164,7 +1165,7 @@
     }
     final Terms terms = fields.terms(field);
     if (terms != null) {
-      return terms.docsAndPositions(skipDocs, term, null);
+      return terms.docsAndPositions(acceptDocs, term, null);
     } else {
       return null;
     }
@@ -1175,7 +1176,7 @@
    * {@link TermState}. This may return null, if either the field or the term
    * does not exists or the {@link TermState} is invalid for the underlying
    * implementation.*/
-  public DocsEnum termDocsEnum(Bits skipDocs, String field, BytesRef term, TermState state) throws IOException {
+  public DocsEnum termDocsEnum(Bits acceptDocs, String field, BytesRef term, TermState state) throws IOException {
     assert state != null;
     assert field != null;
     final Fields fields = fields();
@@ -1184,7 +1185,7 @@
     }
     final Terms terms = fields.terms(field);
     if (terms != null) {
-      return terms.docs(skipDocs, term, state, null);
+      return terms.docs(acceptDocs, term, state, null);
     } else {
       return null;
     }
@@ -1195,7 +1196,7 @@
    * {@link TermState}. This may return null, if either the field or the term
    * does not exists, the {@link TermState} is invalid for the underlying
    * implementation, or positions were not stored for this term.*/
-  public DocsAndPositionsEnum termPositionsEnum(Bits skipDocs, String field, BytesRef term, TermState state) throws IOException {
+  public DocsAndPositionsEnum termPositionsEnum(Bits acceptDocs, String field, BytesRef term, TermState state) throws IOException {
     assert state != null;
     assert field != null;
     final Fields fields = fields();
@@ -1204,7 +1205,7 @@
     }
     final Terms terms = fields.terms(field);
     if (terms != null) {
-      return terms.docsAndPositions(skipDocs, term, state, null);
+      return terms.docsAndPositions(acceptDocs, term, state, null);
     } else {
       return null;
     }
@@ -1260,7 +1261,7 @@
   public int deleteDocuments(Term term) throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {
     ensureOpen();
     DocsEnum docs = MultiFields.getTermDocsEnum(this,
-                                                MultiFields.getDeletedDocs(this),
+                                                MultiFields.getNotDeletedDocs(this),
                                                 term.field(),
                                                 term.bytes());
     if (docs == null) return 0;
@@ -1393,8 +1394,20 @@
    *  The returned instance has been safely published for use by
    *  multiple threads without additional synchronization.
    * @lucene.experimental */
+  // nocommit remove
   public abstract Bits getDeletedDocs();
 
+  // nocommit make abstract; make impls create this on init!
+  /** Return null if all docs are accepted. */
+  public Bits getNotDeletedDocs() {
+    final Bits delDocs = getDeletedDocs();
+    if (delDocs == null) {
+      return null;
+    } else {
+      return new NotBits(delDocs);
+    }
+  }
+
   /**
    * Expert: return the IndexCommit that this reader has
    * opened.  This method is only implemented by those
Index: lucene/src/java/org/apache/lucene/index/IndexWriter.java
--- lucene/src/java/org/apache/lucene/index/IndexWriter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/IndexWriter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -2931,9 +2931,9 @@
         // Reader was skipped because it was 100% deletions
         continue;
       }
-      final Bits prevDelDocs = previousReader.getDeletedDocs();
+      final Bits prevAcceptDocs = previousReader.getNotDeletedDocs();
       final SegmentReader currentReader = merge.readers.get(i);
-      final Bits currentDelDocs = currentReader.getDeletedDocs();
+      final Bits currentAcceptDocs = currentReader.getNotDeletedDocs();
       if (previousReader.hasDeletions()) {
 
         // There were deletes on this segment when the merge
@@ -2948,10 +2948,10 @@
           // committed since we started the merge, so we
           // must merge them:
           for(int j=0;j<docCount;j++) {
-            if (prevDelDocs.get(j))
-              assert currentDelDocs.get(j);
+            if (!prevAcceptDocs.get(j))
+              assert !currentAcceptDocs.get(j);
             else {
-              if (currentDelDocs.get(j)) {
+              if (!currentAcceptDocs.get(j)) {
                 mergedReader.doDelete(docUpto);
                 delCount++;
               }
@@ -2965,7 +2965,7 @@
         // This segment had no deletes before but now it
         // does:
         for(int j=0; j<docCount; j++) {
-          if (currentDelDocs.get(j)) {
+          if (!currentAcceptDocs.get(j)) {
             mergedReader.doDelete(docUpto);
             delCount++;
           }
Index: lucene/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
--- lucene/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -35,7 +35,6 @@
   int upto;
   DocsAndPositionsEnum current;
   int currentBase;
-  Bits skipDocs;
   int doc = -1;
 
   MultiDocsAndPositionsEnum reset(final EnumWithSlice[] subs, final int numSubs) throws IOException {
Index: lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java
--- lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -33,7 +33,6 @@
   int upto;
   DocsEnum current;
   int currentBase;
-  Bits skipDocs;
   int doc = -1;
 
   MultiDocsEnum reset(final EnumWithSlice[] subs, final int numSubs) throws IOException {
Index: lucene/src/java/org/apache/lucene/index/MultiFields.java
--- lucene/src/java/org/apache/lucene/index/MultiFields.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/MultiFields.java	Sun Jun 26 14:21:07 2011 -0400
@@ -26,6 +26,7 @@
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.MultiBits;
+import org.apache.lucene.util.NotBits;
 import org.apache.lucene.util.ReaderUtil.Gather;  // for javadocs
 import org.apache.lucene.util.ReaderUtil;
 
@@ -100,19 +101,19 @@
     }
   }
 
-  public static Bits getDeletedDocs(IndexReader r) {
+  public static Bits getNotDeletedDocs(IndexReader r) {
     Bits result;
     if (r.hasDeletions()) {
 
-      final List<Bits> delDocs = new ArrayList<Bits>();
+      final List<Bits> notDelDocs = new ArrayList<Bits>();
       final List<Integer> starts = new ArrayList<Integer>();
 
       try {
         final int maxDoc = new ReaderUtil.Gather(r) {
             @Override
             protected void add(int base, IndexReader r) throws IOException {
-              // record all delDocs, even if they are null
-              delDocs.add(r.getDeletedDocs());
+              // record all notDelDocs, even if they are null
+              notDelDocs.add(r.getNotDeletedDocs());
               starts.add(base);
             }
           }.run();
@@ -122,12 +123,12 @@
         throw new RuntimeException(ioe);
       }
 
-      assert delDocs.size() > 0;
-      if (delDocs.size() == 1) {
+      assert notDelDocs.size() > 0;
+      if (notDelDocs.size() == 1) {
         // Only one actual sub reader -- optimize this case
-        result = delDocs.get(0);
+        result = notDelDocs.get(0);
       } else {
-        result = new MultiBits(delDocs, starts);
+        result = new MultiBits(notDelDocs, starts, true);
       }
 
     } else {
@@ -137,6 +138,12 @@
     return result;
   }
 
+  // nocommit remove
+  public static Bits getDeletedDocs(IndexReader r) {
+    final Bits acceptDocs = getNotDeletedDocs(r);
+    return acceptDocs == null ? null : new NotBits(acceptDocs);
+  }
+
   /**  This method may return null if the field does not exist.*/
   public static Terms getTerms(IndexReader r, String field) throws IOException {
     final Fields fields = getFields(r);
@@ -150,12 +157,12 @@
   /** Returns {@link DocsEnum} for the specified field &
    *  term.  This may return null if the term does not
    *  exist. */
-  public static DocsEnum getTermDocsEnum(IndexReader r, Bits skipDocs, String field, BytesRef term) throws IOException {
+  public static DocsEnum getTermDocsEnum(IndexReader r, Bits acceptDocs, String field, BytesRef term) throws IOException {
     assert field != null;
     assert term != null;
     final Terms terms = getTerms(r, field);
     if (terms != null) {
-      return terms.docs(skipDocs, term, null);
+      return terms.docs(acceptDocs, term, null);
     } else {
       return null;
     }
@@ -164,12 +171,12 @@
   /** Returns {@link DocsAndPositionsEnum} for the specified
    *  field & term.  This may return null if the term does
    *  not exist or positions were not indexed. */
-  public static DocsAndPositionsEnum getTermPositionsEnum(IndexReader r, Bits skipDocs, String field, BytesRef term) throws IOException {
+  public static DocsAndPositionsEnum getTermPositionsEnum(IndexReader r, Bits acceptDocs, String field, BytesRef term) throws IOException {
     assert field != null;
     assert term != null;
     final Terms terms = getTerms(r, field);
     if (terms != null) {
-      return terms.docsAndPositions(skipDocs, term, null);
+      return terms.docsAndPositions(acceptDocs, term, null);
     } else {
       return null;
     }
Index: lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java
--- lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -331,7 +331,7 @@
   }
 
   @Override
-  public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
     final MultiDocsEnum docsEnum;
     if (reuse != null) {
       docsEnum = (MultiDocsEnum) reuse;
@@ -339,11 +339,11 @@
       docsEnum = new MultiDocsEnum();
     }
     
-    final MultiBits multiSkipDocs;
-    if (skipDocs instanceof MultiBits) {
-      multiSkipDocs = (MultiBits) skipDocs;
+    final MultiBits multiAcceptDocs;
+    if (acceptDocs instanceof MultiBits) {
+      multiAcceptDocs = (MultiBits) acceptDocs;
     } else {
-      multiSkipDocs = null;
+      multiAcceptDocs = null;
     }
 
     int upto = 0;
@@ -354,22 +354,22 @@
 
       final Bits b;
 
-      if (multiSkipDocs != null) {
+      if (multiAcceptDocs != null) {
         // optimize for common case: requested skip docs is a
         // congruent sub-slice of MultiBits: in this case, we
-        // just pull the skipDocs from the sub reader, rather
+        // just pull the acceptDocs from the sub reader, rather
         // than making the inefficient
         // Slice(Multi(sub-readers)):
-        final MultiBits.SubResult sub = multiSkipDocs.getMatchingSub(entry.subSlice);
+        final MultiBits.SubResult sub = multiAcceptDocs.getMatchingSub(entry.subSlice);
         if (sub.matches) {
           b = sub.result;
         } else {
           // custom case: requested skip docs is foreign:
           // must slice it on every access
-          b = new BitsSlice(skipDocs, entry.subSlice);
+          b = new BitsSlice(acceptDocs, entry.subSlice);
         }
-      } else if (skipDocs != null) {
-        b = new BitsSlice(skipDocs, entry.subSlice);
+      } else if (acceptDocs != null) {
+        b = new BitsSlice(acceptDocs, entry.subSlice);
       } else {
         // no deletions
         b = null;
@@ -392,7 +392,7 @@
   }
 
   @Override
-  public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
     final MultiDocsAndPositionsEnum docsAndPositionsEnum;
     if (reuse != null) {
       docsAndPositionsEnum = (MultiDocsAndPositionsEnum) reuse;
@@ -400,11 +400,11 @@
       docsAndPositionsEnum = new MultiDocsAndPositionsEnum();
     }
     
-    final MultiBits multiSkipDocs;
-    if (skipDocs instanceof MultiBits) {
-      multiSkipDocs = (MultiBits) skipDocs;
+    final MultiBits multiAcceptDocs;
+    if (acceptDocs instanceof MultiBits) {
+      multiAcceptDocs = (MultiBits) acceptDocs;
     } else {
-      multiSkipDocs = null;
+      multiAcceptDocs = null;
     }
 
     int upto = 0;
@@ -415,23 +415,23 @@
 
       final Bits b;
 
-      if (multiSkipDocs != null) {
+      if (multiAcceptDocs != null) {
         // Optimize for common case: requested skip docs is a
         // congruent sub-slice of MultiBits: in this case, we
-        // just pull the skipDocs from the sub reader, rather
+        // just pull the acceptDocs from the sub reader, rather
         // than making the inefficient
         // Slice(Multi(sub-readers)):
-        final MultiBits.SubResult sub = multiSkipDocs.getMatchingSub(top[i].subSlice);
+        final MultiBits.SubResult sub = multiAcceptDocs.getMatchingSub(top[i].subSlice);
         if (sub.matches) {
           b = sub.result;
         } else {
           // custom case: requested skip docs is foreign:
           // must slice it on every access (very
           // inefficient)
-          b = new BitsSlice(skipDocs, top[i].subSlice);
+          b = new BitsSlice(acceptDocs, top[i].subSlice);
         }
-      } else if (skipDocs != null) {
-        b = new BitsSlice(skipDocs, top[i].subSlice);
+      } else if (acceptDocs != null) {
+        b = new BitsSlice(acceptDocs, top[i].subSlice);
       } else {
         // no deletions
         b = null;
Index: lucene/src/java/org/apache/lucene/index/ParallelReader.java
--- lucene/src/java/org/apache/lucene/index/ParallelReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/ParallelReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -206,7 +206,7 @@
     }
   }
   
-   @Override
+  @Override
   public Bits getDeletedDocs() {
     return MultiFields.getDeletedDocs(readers.get(0));
   }
Index: lucene/src/java/org/apache/lucene/index/SegmentMerger.java
--- lucene/src/java/org/apache/lucene/index/SegmentMerger.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/SegmentMerger.java	Sun Jun 26 14:21:07 2011 -0400
@@ -282,11 +282,12 @@
     throws IOException, MergeAbortedException, CorruptIndexException {
     int docCount = 0;
     final int maxDoc = reader.maxDoc();
-    final Bits delDocs = reader.getDeletedDocs();
+    final Bits acceptDocs = reader.getNotDeletedDocs();
+    assert acceptDocs != null;
     if (matchingFieldsReader != null) {
       // We can bulk-copy because the fieldInfos are "congruent"
       for (int j = 0; j < maxDoc;) {
-        if (delDocs.get(j)) {
+        if (!acceptDocs.get(j)) {
           // skip deleted docs
           ++j;
           continue;
@@ -298,7 +299,7 @@
           j++;
           numDocs++;
           if (j >= maxDoc) break;
-          if (delDocs.get(j)) {
+          if (!acceptDocs.get(j)) {
             j++;
             break;
           }
@@ -311,7 +312,7 @@
       }
     } else {
       for (int j = 0; j < maxDoc; j++) {
-        if (delDocs.get(j)) {
+        if (!acceptDocs.get(j)) {
           // skip deleted docs
           continue;
         }
@@ -401,11 +402,11 @@
                                         final IndexReader reader)
     throws IOException, MergeAbortedException {
     final int maxDoc = reader.maxDoc();
-    final Bits delDocs = reader.getDeletedDocs();
+    final Bits acceptDocs = reader.getNotDeletedDocs();
     if (matchingVectorsReader != null) {
       // We can bulk-copy because the fieldInfos are "congruent"
       for (int docNum = 0; docNum < maxDoc;) {
-        if (delDocs.get(docNum)) {
+        if (!acceptDocs.get(docNum)) {
           // skip deleted docs
           ++docNum;
           continue;
@@ -417,7 +418,7 @@
           docNum++;
           numDocs++;
           if (docNum >= maxDoc) break;
-          if (delDocs.get(docNum)) {
+          if (!acceptDocs.get(docNum)) {
             docNum++;
             break;
           }
@@ -429,7 +430,7 @@
       }
     } else {
       for (int docNum = 0; docNum < maxDoc; docNum++) {
-        if (delDocs.get(docNum)) {
+        if (!acceptDocs.get(docNum)) {
           // skip deleted docs
           continue;
         }
@@ -499,14 +500,14 @@
       if (f != null) {
         slices.add(new ReaderUtil.Slice(docBase, maxDoc, fields.size()));
         fields.add(f);
-        bits.add(r.getDeletedDocs());
+        bits.add(r.getNotDeletedDocs());
         bitsStarts.add(docBase);
       }
       final PerDocValues producer = r.perDocValues();
       if (producer != null) {
         perDocSlices.add(new ReaderUtil.Slice(docBase, maxDoc, fields.size()));
         perDocProducers.add(producer);
-        perDocBits.add(r.getDeletedDocs());
+        perDocBits.add(r.getNotDeletedDocs());
         perDocBitsStarts.add(docBase);
       }
       docBase += maxDoc;
@@ -544,13 +545,13 @@
       inputDocBase += reader.maxDoc();
       if (mergeState.delCounts[i] != 0) {
         int delCount = 0;
-        final Bits delDocs = reader.getDeletedDocs();
-        assert delDocs != null;
+        final Bits acceptDocs = reader.getNotDeletedDocs();
+        assert acceptDocs != null;
         final int maxDoc = reader.maxDoc();
         final int[] docMap = mergeState.docMaps[i] = new int[maxDoc];
         int newDocID = 0;
         for(int j=0;j<maxDoc;j++) {
-          if (delDocs.get(j)) {
+          if (!acceptDocs.get(j)) {
             docMap[j] = -1;
             delCount++;  // only for assert
           } else {
@@ -571,7 +572,7 @@
       // MultiBits as our skip docs only to have it broken
       // apart when we step through the docs enums in
       // MultiDocsEnum.
-      mergeState.multiDeletedDocs = new MultiBits(bits, bitsStarts);
+      mergeState.multiNotDeletedDocs = new MultiBits(bits, bitsStarts, true);
       
       consumer.merge(mergeState,
                      new MultiFields(fields.toArray(Fields.EMPTY_ARRAY),
@@ -580,7 +581,7 @@
       consumer.close();
     }
     if (!perDocSlices.isEmpty()) {
-      mergeState.multiDeletedDocs = new MultiBits(perDocBits, perDocBitsStarts);
+      mergeState.multiNotDeletedDocs = new MultiBits(perDocBits, perDocBitsStarts, true);
       final PerDocConsumer docsConsumer = codec
           .docsConsumer(new PerDocWriteState(segmentWriteState));
       try {
@@ -592,7 +593,6 @@
         docsConsumer.close();
       }
     }
-    
   }
 
   private MergeState mergeState;
@@ -635,9 +635,9 @@
             } else {
               // this segment has deleted docs, so we have to
               // check for every doc if it is deleted or not
-              final Bits delDocs = reader.getDeletedDocs();
+              final Bits acceptDocs = reader.getNotDeletedDocs();
               for (int k = 0; k < maxDoc; k++) {
-                if (!delDocs.get(k)) {
+                if (acceptDocs.get(k)) {
                   output.writeByte(normBuffer[k]);
                 }
               }
Index: lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java
--- lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java	Sun Jun 26 14:21:07 2011 -0400
@@ -80,6 +80,10 @@
     return MultiFields.getDeletedDocs(in);
   }
 
+  @Override
+  public Bits getNotDeletedDocs() {
+    return MultiFields.getNotDeletedDocs(in);
+  }
   
   @Override
   public IndexReader[] getSequentialSubReaders() {
Index: lucene/src/java/org/apache/lucene/index/Terms.java
--- lucene/src/java/org/apache/lucene/index/Terms.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/Terms.java	Sun Jun 26 14:21:07 2011 -0400
@@ -71,10 +71,10 @@
 
   /** Get {@link DocsEnum} for the specified term.  This
    *  method may return null if the term does not exist. */
-  public DocsEnum docs(Bits skipDocs, BytesRef text, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(Bits acceptDocs, BytesRef text, DocsEnum reuse) throws IOException {
     final TermsEnum termsEnum = getThreadTermsEnum();
     if (termsEnum.seekExact(text, true)) {
-      return termsEnum.docs(skipDocs, reuse);
+      return termsEnum.docs(acceptDocs, reuse);
     } else {
       return null;
     }
@@ -83,10 +83,10 @@
   /** Get {@link DocsEnum} for the specified term.  This
    *  method will may return null if the term does not
    *  exists, or positions were not indexed. */ 
-  public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, BytesRef text, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, BytesRef text, DocsAndPositionsEnum reuse) throws IOException {
     final TermsEnum termsEnum = getThreadTermsEnum();
     if (termsEnum.seekExact(text, true)) {
-      return termsEnum.docsAndPositions(skipDocs, reuse);
+      return termsEnum.docsAndPositions(acceptDocs, reuse);
     } else {
       return null;
     }
@@ -98,10 +98,10 @@
    * 
    * @see TermsEnum#termState()
    * @see TermsEnum#seekExact(BytesRef, TermState) */
-  public DocsEnum docs(Bits skipDocs, BytesRef term, TermState termState, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(Bits acceptDocs, BytesRef term, TermState termState, DocsEnum reuse) throws IOException {
     final TermsEnum termsEnum = getThreadTermsEnum();
     termsEnum.seekExact(term, termState);
-    return termsEnum.docs(skipDocs, reuse);
+    return termsEnum.docs(acceptDocs, reuse);
   }
 
   /**
@@ -111,10 +111,10 @@
    * 
    * @see TermsEnum#termState()
    * @see TermsEnum#seekExact(BytesRef, TermState) */
-  public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, BytesRef term, TermState termState, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, BytesRef term, TermState termState, DocsAndPositionsEnum reuse) throws IOException {
     final TermsEnum termsEnum = getThreadTermsEnum();
     termsEnum.seekExact(term, termState);
-    return termsEnum.docsAndPositions(skipDocs, reuse);
+    return termsEnum.docsAndPositions(acceptDocs, reuse);
   }
 
   public long getUniqueTermCount() throws IOException {
Index: lucene/src/java/org/apache/lucene/index/TermsEnum.java
--- lucene/src/java/org/apache/lucene/index/TermsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/TermsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -147,16 +147,16 @@
    *  call this when the enum is unpositioned.  This method
    *  will not return null.
    *  
-   * @param skipDocs set bits are documents that should not
+   * @param acceptDocs set bits are documents that should not
    * be returned
    * @param reuse pass a prior DocsEnum for possible reuse */
-  public abstract DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException;
+  public abstract DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException;
 
   /** Get {@link DocsAndPositionsEnum} for the current term.
    *  Do not call this when the enum is unpositioned.
    *  This method will only return null if positions were
    *  not indexed into the postings by this codec. */
-  public abstract DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException;
+  public abstract DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException;
 
   /**
    * Expert: Returns the TermsEnums internal state to position the TermsEnum
@@ -224,12 +224,12 @@
     }
 
     @Override
-    public DocsEnum docs(Bits bits, DocsEnum reuse) {
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) {
       throw new IllegalStateException("this method should never be called");
     }
       
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits bits, DocsAndPositionsEnum reuse) {
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) {
       throw new IllegalStateException("this method should never be called");
     }
       
Index: lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
--- lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -688,23 +688,23 @@
       }
 
       @Override
-      public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+      public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
         //System.out.println("BTR.docs this=" + this);
         decodeMetaData();
         //System.out.println("  state.docFreq=" + state.docFreq);
-        final DocsEnum docsEnum = postingsReader.docs(fieldInfo, state, skipDocs, reuse);
+        final DocsEnum docsEnum = postingsReader.docs(fieldInfo, state, acceptDocs, reuse);
         assert docsEnum != null;
         return docsEnum;
       }
 
       @Override
-      public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+      public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
         //System.out.println("BTR.d&p this=" + this);
         decodeMetaData();
         if (fieldInfo.omitTermFreqAndPositions) {
           return null;
         } else {
-          DocsAndPositionsEnum dpe = postingsReader.docsAndPositions(fieldInfo, state, skipDocs, reuse);
+          DocsAndPositionsEnum dpe = postingsReader.docsAndPositions(fieldInfo, state, acceptDocs, reuse);
           //System.out.println("  return d&pe=" + dpe);
           return dpe;
         }
Index: lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java
--- lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java	Sun Jun 26 14:21:07 2011 -0400
@@ -114,8 +114,8 @@
       final IndexDocValues r = reader.docValues(mergeState.fieldInfo.name);
       if (r != null) {
         merged = true;
-        merge(new Writer.MergeState(r, docBase, reader.maxDoc(), reader
-            .getDeletedDocs()));
+        merge(new Writer.MergeState(r, docBase, reader.maxDoc(),
+                                    reader.getNotDeletedDocs()));
       }
       docBase += reader.numDocs();
     }
@@ -152,15 +152,15 @@
     public final int docBase;
     /** the number of documents in this MergeState */
     public final int docCount;
-    /** the deleted bits for this MergeState */
-    public final Bits bits;
+    /** the not deleted bits for this MergeState */
+    public final Bits acceptBits;
 
-    public MergeState(IndexDocValues reader, int docBase, int docCount, Bits bits) {
+    public MergeState(IndexDocValues reader, int docBase, int docCount, Bits acceptBits) {
       assert reader != null;
       this.reader = reader;
       this.docBase = docBase;
       this.docCount = docCount;
-      this.bits = bits;
+      this.acceptBits = acceptBits;
     }
   }
 }
Index: lucene/src/java/org/apache/lucene/index/codecs/MergeState.java
--- lucene/src/java/org/apache/lucene/index/codecs/MergeState.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/MergeState.java	Sun Jun 26 14:21:07 2011 -0400
@@ -39,7 +39,7 @@
   public int[] delCounts;                         // Deletion count per reader
   public int[] docBase;                           // New docID base per reader
   public int mergedDocCount;                      // Total # merged docs
-  public Bits multiDeletedDocs;
+  public Bits multiNotDeletedDocs;
   public CheckAbort checkAbort;
 
   // Updated per field;
Index: lucene/src/java/org/apache/lucene/index/codecs/PostingsReaderBase.java
--- lucene/src/java/org/apache/lucene/index/codecs/PostingsReaderBase.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/PostingsReaderBase.java	Sun Jun 26 14:21:07 2011 -0400
@@ -49,11 +49,11 @@
 
   /** Must fully consume state, since after this call that
    *  TermState may be reused. */
-  public abstract DocsEnum docs(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsEnum reuse) throws IOException;
+  public abstract DocsEnum docs(FieldInfo fieldInfo, BlockTermState state, Bits acceptDocs, DocsEnum reuse) throws IOException;
 
   /** Must fully consume state, since after this call that
    *  TermState may be reused. */
-  public abstract DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException;
+  public abstract DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException;
 
   public abstract void close() throws IOException;
 
Index: lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java
--- lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java	Sun Jun 26 14:21:07 2011 -0400
@@ -67,7 +67,7 @@
       MultiDocsEnum docsEnumIn = null;
 
       while((term = termsEnum.next()) != null) {
-        docsEnumIn = (MultiDocsEnum) termsEnum.docs(mergeState.multiDeletedDocs, docsEnumIn);
+        docsEnumIn = (MultiDocsEnum) termsEnum.docs(mergeState.multiNotDeletedDocs, docsEnumIn);
         if (docsEnumIn != null) {
           docsEnum.reset(docsEnumIn);
           final PostingsConsumer postingsConsumer = startTerm(term);
@@ -89,7 +89,7 @@
       postingsEnum.setMergeState(mergeState);
       MultiDocsAndPositionsEnum postingsEnumIn = null;
       while((term = termsEnum.next()) != null) {
-        postingsEnumIn = (MultiDocsAndPositionsEnum) termsEnum.docsAndPositions(mergeState.multiDeletedDocs, postingsEnumIn);
+        postingsEnumIn = (MultiDocsAndPositionsEnum) termsEnum.docsAndPositions(mergeState.multiNotDeletedDocs, postingsEnumIn);
         if (postingsEnumIn != null) {
           postingsEnum.reset(postingsEnumIn);
           // set PayloadProcessor
Index: lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
--- lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java	Sun Jun 26 14:21:07 2011 -0400
@@ -269,7 +269,7 @@
     private byte[] buffer = new byte[16];
     private final ByteArrayDataInput in = new ByteArrayDataInput(buffer);
 
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private int docUpto;
     private int docID;
     private int freq;
@@ -285,14 +285,14 @@
       return omitTFAP == this.omitTFAP && storePayloads == this.storePayloads;
     }
     
-    public FSTDocsEnum reset(BytesRef bufferIn, Bits skipDocs, int numDocs) {
+    public FSTDocsEnum reset(BytesRef bufferIn, Bits acceptDocs, int numDocs) {
       assert numDocs > 0;
       if (buffer.length < bufferIn.length - bufferIn.offset) {
         buffer = ArrayUtil.grow(buffer, bufferIn.length - bufferIn.offset);
       }
       in.reset(buffer, 0, bufferIn.length - bufferIn.offset);
       System.arraycopy(bufferIn.bytes, bufferIn.offset, buffer, 0, bufferIn.length - bufferIn.offset);
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
       docID = 0;
       docUpto = 0;
       payloadLen = 0;
@@ -339,7 +339,7 @@
           }
         }
 
-        if (skipDocs == null || !skipDocs.get(docID)) {
+        if (acceptDocs == null || acceptDocs.get(docID)) {
           if (VERBOSE) System.out.println("    return docID=" + docID + " freq=" + freq);
           return docID;
         }
@@ -375,7 +375,7 @@
     private byte[] buffer = new byte[16];
     private final ByteArrayDataInput in = new ByteArrayDataInput(buffer);
 
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private int docUpto;
     private int docID;
     private int freq;
@@ -396,7 +396,7 @@
       return omitTFAP == this.omitTFAP && storePayloads == this.storePayloads;
     }
     
-    public FSTDocsAndPositionsEnum reset(BytesRef bufferIn, Bits skipDocs, int numDocs) {
+    public FSTDocsAndPositionsEnum reset(BytesRef bufferIn, Bits acceptDocs, int numDocs) {
       assert numDocs > 0;
       if (VERBOSE) {
         System.out.println("D&P reset bytes this=" + this);
@@ -409,7 +409,7 @@
       }
       in.reset(buffer, 0, bufferIn.length - bufferIn.offset);
       System.arraycopy(bufferIn.bytes, bufferIn.offset, buffer, 0, bufferIn.length - bufferIn.offset);
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
       docID = 0;
       docUpto = 0;
       payload.bytes = buffer;
@@ -446,7 +446,7 @@
           }
         }
 
-        if (skipDocs == null || !skipDocs.get(docID)) {
+        if (acceptDocs == null || acceptDocs.get(docID)) {
           pos = 0;
           posPending = freq;
           if (VERBOSE) System.out.println("    return docID=" + docID + " freq=" + freq);
@@ -595,7 +595,7 @@
     }
     
     @Override
-    public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
       decodeMetaData();
       FSTDocsEnum docsEnum;
       if (reuse == null || !(reuse instanceof FSTDocsEnum)) {
@@ -606,11 +606,11 @@
           docsEnum = new FSTDocsEnum(field.omitTermFreqAndPositions, field.storePayloads);
         }
       }
-      return docsEnum.reset(current.output, skipDocs, docFreq);
+      return docsEnum.reset(current.output, acceptDocs, docFreq);
     }
 
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
       if (field.omitTermFreqAndPositions) {
         return null;
       }
@@ -625,7 +625,7 @@
         }
       }
       if (VERBOSE) System.out.println("D&P reset this=" + this);
-      return docsAndPositionsEnum.reset(current.output, skipDocs, docFreq);
+      return docsAndPositionsEnum.reset(current.output, acceptDocs, docFreq);
     }
 
     @Override
Index: lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
--- lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java	Sun Jun 26 14:21:07 2011 -0400
@@ -951,7 +951,7 @@
     }
 
     @Override
-    public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
       PreDocsEnum docsEnum;
       if (reuse == null || !(reuse instanceof PreDocsEnum)) {
         docsEnum = new PreDocsEnum();
@@ -961,11 +961,11 @@
           docsEnum = new PreDocsEnum();
         }
       }
-      return docsEnum.reset(termEnum, skipDocs);
+      return docsEnum.reset(termEnum, acceptDocs);
     }
 
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
       PreDocsAndPositionsEnum docsPosEnum;
       if (fieldInfo.omitTermFreqAndPositions) {
         return null;
@@ -977,7 +977,7 @@
           docsPosEnum = new PreDocsAndPositionsEnum();
         }
       }
-      return docsPosEnum.reset(termEnum, skipDocs);        
+      return docsPosEnum.reset(termEnum, acceptDocs);        
     }
   }
 
@@ -992,8 +992,8 @@
       return freqStream;
     }
 
-    public PreDocsEnum reset(SegmentTermEnum termEnum, Bits skipDocs) throws IOException {
-      docs.setSkipDocs(skipDocs);
+    public PreDocsEnum reset(SegmentTermEnum termEnum, Bits acceptDocs) throws IOException {
+      docs.setAcceptDocs(acceptDocs);
       docs.seek(termEnum);
       return this;
     }
@@ -1048,8 +1048,8 @@
       return freqStream;
     }
 
-    public DocsAndPositionsEnum reset(SegmentTermEnum termEnum, Bits skipDocs) throws IOException {
-      pos.setSkipDocs(skipDocs);
+    public DocsAndPositionsEnum reset(SegmentTermEnum termEnum, Bits acceptDocs) throws IOException {
+      pos.setAcceptDocs(acceptDocs);
       pos.seek(termEnum);
       return this;
     }
Index: lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
--- lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java	Sun Jun 26 14:21:07 2011 -0400
@@ -33,7 +33,7 @@
   //protected SegmentReader parent;
   private final FieldInfos fieldInfos;
   private final TermInfosReader tis;
-  protected Bits skipDocs;
+  protected Bits acceptDocs;
   protected IndexInput freqStream;
   protected int count;
   protected int df;
@@ -78,8 +78,8 @@
     seek(ti, term);
   }
 
-  public void setSkipDocs(Bits skipDocs) {
-    this.skipDocs = skipDocs;
+  public void setAcceptDocs(Bits acceptDocs) {
+    this.acceptDocs = acceptDocs;
   }
 
   public void seek(SegmentTermEnum segmentTermEnum) throws IOException {
@@ -149,7 +149,7 @@
       
       count++;
 
-      if (skipDocs == null || !skipDocs.get(doc)) {
+      if (acceptDocs == null || acceptDocs.get(doc)) {
         break;
       }
       skippingDoc();
@@ -175,7 +175,7 @@
           freq = freqStream.readVInt();     // else read freq
         count++;
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           docs[i] = doc;
           freqs[i] = freq;
           ++i;
@@ -192,7 +192,7 @@
       doc += freqStream.readVInt();       
       count++;
 
-      if (skipDocs == null || !skipDocs.get(doc)) {
+      if (acceptDocs == null || acceptDocs.get(doc)) {
         docs[i] = doc;
         // Hardware freq to 1 when term freqs were not
         // stored in the index
Index: lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
--- lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java	Sun Jun 26 14:21:07 2011 -0400
@@ -167,7 +167,7 @@
   // TODO: we could actually reuse, by having TL that
   // holds the last wrapped reuse, and vice-versa
   @Override
-  public DocsEnum docs(FieldInfo field, BlockTermState _termState, Bits skipDocs, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(FieldInfo field, BlockTermState _termState, Bits acceptDocs, DocsEnum reuse) throws IOException {
     PulsingTermState termState = (PulsingTermState) _termState;
     if (termState.postingsSize != -1) {
       PulsingDocsEnum postings;
@@ -179,20 +179,20 @@
       } else {
         postings = new PulsingDocsEnum(field);
       }
-      return postings.reset(skipDocs, termState);
+      return postings.reset(acceptDocs, termState);
     } else {
       // TODO: not great that we lose reuse of PulsingDocsEnum in this case:
       if (reuse instanceof PulsingDocsEnum) {
-        return wrappedPostingsReader.docs(field, termState.wrappedTermState, skipDocs, null);
+        return wrappedPostingsReader.docs(field, termState.wrappedTermState, acceptDocs, null);
       } else {
-        return wrappedPostingsReader.docs(field, termState.wrappedTermState, skipDocs, reuse);
+        return wrappedPostingsReader.docs(field, termState.wrappedTermState, acceptDocs, reuse);
       }
     }
   }
 
   // TODO: -- not great that we can't always reuse
   @Override
-  public DocsAndPositionsEnum docsAndPositions(FieldInfo field, BlockTermState _termState, Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(FieldInfo field, BlockTermState _termState, Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
     if (field.omitTermFreqAndPositions) {
       return null;
     }
@@ -211,12 +211,12 @@
         postings = new PulsingDocsAndPositionsEnum(field);
       }
 
-      return postings.reset(skipDocs, termState);
+      return postings.reset(acceptDocs, termState);
     } else {
       if (reuse instanceof PulsingDocsAndPositionsEnum) {
-        return wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, skipDocs, null);
+        return wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, acceptDocs, null);
       } else {
-        return wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, skipDocs, reuse);
+        return wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, acceptDocs, reuse);
       }
     }
   }
@@ -225,7 +225,7 @@
     private final ByteArrayDataInput postings = new ByteArrayDataInput();
     private final boolean omitTF;
     private final boolean storePayloads;
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private int docID;
     private int freq;
     private int payloadLength;
@@ -235,7 +235,7 @@
       storePayloads = fieldInfo.storePayloads;
     }
 
-    public PulsingDocsEnum reset(Bits skipDocs, PulsingTermState termState) {
+    public PulsingDocsEnum reset(Bits acceptDocs, PulsingTermState termState) {
       //System.out.println("PR docsEnum termState=" + termState + " docFreq=" + termState.docFreq);
       assert termState.postingsSize != -1;
       final byte[] bytes = new byte[termState.postingsSize];
@@ -244,7 +244,7 @@
       docID = 0;
       payloadLength = 0;
       freq = 1;
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
       return this;
     }
 
@@ -291,7 +291,7 @@
           }
         }
 
-        if (skipDocs == null || !skipDocs.get(docID)) {
+        if (acceptDocs == null || acceptDocs.get(docID)) {
           //System.out.println("  return docID=" + docID + " freq=" + freq);
           return docID;
         }
@@ -323,7 +323,7 @@
     private final ByteArrayDataInput postings = new ByteArrayDataInput();
     private final boolean storePayloads;
 
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private int docID;
     private int freq;
     private int posPending;
@@ -341,12 +341,12 @@
       return storePayloads == fieldInfo.storePayloads;
     }
 
-    public PulsingDocsAndPositionsEnum reset(Bits skipDocs, PulsingTermState termState) {
+    public PulsingDocsAndPositionsEnum reset(Bits acceptDocs, PulsingTermState termState) {
       assert termState.postingsSize != -1;
       final byte[] bytes = new byte[termState.postingsSize];
       System.arraycopy(termState.postings, 0, bytes, 0, termState.postingsSize);
       postings.reset(bytes);
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
       payloadLength = 0;
       posPending = 0;
       docID = 0;
@@ -378,7 +378,7 @@
         }
         posPending = freq;
 
-        if (skipDocs == null || !skipDocs.get(docID)) {
+        if (acceptDocs == null || acceptDocs.get(docID)) {
           //System.out.println("  return docID=" + docID + " freq=" + freq);
           position = 0;
           return docID;
Index: lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
--- lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java	Sun Jun 26 14:21:07 2011 -0400
@@ -256,7 +256,7 @@
   }
 
   @Override
-  public DocsEnum docs(FieldInfo fieldInfo, BlockTermState _termState, Bits skipDocs, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(FieldInfo fieldInfo, BlockTermState _termState, Bits acceptDocs, DocsEnum reuse) throws IOException {
     final SepTermState termState = (SepTermState) _termState;
     SepDocsEnum docsEnum;
     if (reuse == null || !(reuse instanceof SepDocsEnum)) {
@@ -271,11 +271,11 @@
       }
     }
 
-    return docsEnum.init(fieldInfo, termState, skipDocs);
+    return docsEnum.init(fieldInfo, termState, acceptDocs);
   }
 
   @Override
-  public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState _termState, Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState _termState, Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
     assert !fieldInfo.omitTermFreqAndPositions;
     final SepTermState termState = (SepTermState) _termState;
     SepDocsAndPositionsEnum postingsEnum;
@@ -291,7 +291,7 @@
       }
     }
 
-    return postingsEnum.init(fieldInfo, termState, skipDocs);
+    return postingsEnum.init(fieldInfo, termState, acceptDocs);
   }
 
   class SepDocsEnum extends DocsEnum {
@@ -304,7 +304,7 @@
     // TODO: -- should we do omitTF with 2 different enum classes?
     private boolean omitTF;
     private boolean storePayloads;
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private final IntIndexInput.Reader docReader;
     private final IntIndexInput.Reader freqReader;
     private long skipFP;
@@ -337,8 +337,8 @@
       }
     }
 
-    SepDocsEnum init(FieldInfo fieldInfo, SepTermState termState, Bits skipDocs) throws IOException {
-      this.skipDocs = skipDocs;
+    SepDocsEnum init(FieldInfo fieldInfo, SepTermState termState, Bits acceptDocs) throws IOException {
+      this.acceptDocs = acceptDocs;
       omitTF = fieldInfo.omitTermFreqAndPositions;
       storePayloads = fieldInfo.storePayloads;
 
@@ -383,7 +383,7 @@
           freq = freqReader.next();
         }
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           break;
         }
       }
@@ -408,7 +408,7 @@
           freq = freqReader.next();
         }
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           docs[i] = doc;
           freqs[i] = freq;
           //System.out.println("  docs[" + i + "]=" + doc + " count=" + count + " dF=" + docFreq);
@@ -493,7 +493,7 @@
     long freqStart;
 
     private boolean storePayloads;
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private final IntIndexInput.Reader docReader;
     private final IntIndexInput.Reader freqReader;
     private final IntIndexInput.Reader posReader;
@@ -528,8 +528,8 @@
       payloadIn = (IndexInput) SepPostingsReaderImpl.this.payloadIn.clone();
     }
 
-    SepDocsAndPositionsEnum init(FieldInfo fieldInfo, SepTermState termState, Bits skipDocs) throws IOException {
-      this.skipDocs = skipDocs;
+    SepDocsAndPositionsEnum init(FieldInfo fieldInfo, SepTermState termState, Bits acceptDocs) throws IOException {
+      this.acceptDocs = acceptDocs;
       storePayloads = fieldInfo.storePayloads;
       //System.out.println("Sep D&P init");
 
@@ -584,7 +584,7 @@
 
         pendingPosCount += freq;
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           break;
         }
       }
Index: lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
--- lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -211,18 +211,18 @@
     }
  
     @Override
-    public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+    public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
       SimpleTextDocsEnum docsEnum;
       if (reuse != null && reuse instanceof SimpleTextDocsEnum && ((SimpleTextDocsEnum) reuse).canReuse(in)) {
         docsEnum = (SimpleTextDocsEnum) reuse;
       } else {
         docsEnum = new SimpleTextDocsEnum();
       }
-      return docsEnum.reset(docsStart, skipDocs, omitTF);
+      return docsEnum.reset(docsStart, acceptDocs, omitTF);
     }
 
     @Override
-    public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+    public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
       if (omitTF) {
         return null;
       }
@@ -233,7 +233,7 @@
       } else {
         docsAndPositionsEnum = new SimpleTextDocsAndPositionsEnum();
       } 
-      return docsAndPositionsEnum.reset(docsStart, skipDocs);
+      return docsAndPositionsEnum.reset(docsStart, acceptDocs);
     }
     
     @Override
@@ -248,7 +248,7 @@
     private boolean omitTF;
     private int docID;
     private int tf;
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private final BytesRef scratch = new BytesRef(10);
     private final CharsRef scratchUTF16 = new CharsRef(10);
     
@@ -261,8 +261,8 @@
       return in == inStart;
     }
 
-    public SimpleTextDocsEnum reset(long fp, Bits skipDocs, boolean omitTF) throws IOException {
-      this.skipDocs = skipDocs;
+    public SimpleTextDocsEnum reset(long fp, Bits acceptDocs, boolean omitTF) throws IOException {
+      this.acceptDocs = acceptDocs;
       in.seek(fp);
       this.omitTF = omitTF;
       if (omitTF) {
@@ -292,7 +292,7 @@
         final long lineStart = in.getFilePointer();
         readLine(in, scratch);
         if (scratch.startsWith(DOC)) {
-          if (!first && (skipDocs == null || !skipDocs.get(docID))) {
+          if (!first && (acceptDocs == null || acceptDocs.get(docID))) {
             in.seek(lineStart);
             if (!omitTF) {
               tf = termFreq;
@@ -309,7 +309,7 @@
           // skip
         } else {
           assert scratch.startsWith(TERM) || scratch.startsWith(FIELD) || scratch.startsWith(END): "scratch=" + scratch.utf8ToString();
-          if (!first && (skipDocs == null || !skipDocs.get(docID))) {
+          if (!first && (acceptDocs == null || acceptDocs.get(docID))) {
             in.seek(lineStart);
             if (!omitTF) {
               tf = termFreq;
@@ -334,7 +334,7 @@
     private final IndexInput in;
     private int docID;
     private int tf;
-    private Bits skipDocs;
+    private Bits acceptDocs;
     private final BytesRef scratch = new BytesRef(10);
     private final BytesRef scratch2 = new BytesRef(10);
     private final CharsRef scratchUTF16 = new CharsRef(10);
@@ -351,8 +351,8 @@
       return in == inStart;
     }
 
-    public SimpleTextDocsAndPositionsEnum reset(long fp, Bits skipDocs) {
-      this.skipDocs = skipDocs;
+    public SimpleTextDocsAndPositionsEnum reset(long fp, Bits acceptDocs) {
+      this.acceptDocs = acceptDocs;
       nextDocStart = fp;
       return this;
     }
@@ -376,7 +376,7 @@
         final long lineStart = in.getFilePointer();
         readLine(in, scratch);
         if (scratch.startsWith(DOC)) {
-          if (!first && (skipDocs == null || !skipDocs.get(docID))) {
+          if (!first && (acceptDocs == null || acceptDocs.get(docID))) {
             nextDocStart = lineStart;
             in.seek(posStart);
             return docID;
@@ -392,7 +392,7 @@
           // skip
         } else {
           assert scratch.startsWith(TERM) || scratch.startsWith(FIELD) || scratch.startsWith(END);
-          if (!first && (skipDocs == null || !skipDocs.get(docID))) {
+          if (!first && (acceptDocs == null || acceptDocs.get(docID))) {
             nextDocStart = lineStart;
             in.seek(posStart);
             return docID;
Index: lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
--- lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -200,7 +200,7 @@
   }
     
   @Override
-  public DocsEnum docs(FieldInfo fieldInfo, BlockTermState termState, Bits skipDocs, DocsEnum reuse) throws IOException {
+  public DocsEnum docs(FieldInfo fieldInfo, BlockTermState termState, Bits acceptDocs, DocsEnum reuse) throws IOException {
     SegmentDocsEnum docsEnum;
     if (reuse == null || !(reuse instanceof SegmentDocsEnum)) {
       docsEnum = new SegmentDocsEnum(freqIn);
@@ -213,11 +213,11 @@
         docsEnum = new SegmentDocsEnum(freqIn);
       }
     }
-    return docsEnum.reset(fieldInfo, (StandardTermState) termState, skipDocs);
+    return docsEnum.reset(fieldInfo, (StandardTermState) termState, acceptDocs);
   }
 
   @Override
-  public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+  public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
     if (fieldInfo.omitTermFreqAndPositions) {
       return null;
     }
@@ -236,7 +236,7 @@
           docsEnum = new SegmentDocsAndPositionsAndPayloadsEnum(freqIn, proxIn);
         }
       }
-      return docsEnum.reset(fieldInfo, (StandardTermState) termState, skipDocs);
+      return docsEnum.reset(fieldInfo, (StandardTermState) termState, acceptDocs);
     } else {
       SegmentDocsAndPositionsEnum docsEnum;
       if (reuse == null || !(reuse instanceof SegmentDocsAndPositionsEnum)) {
@@ -250,7 +250,7 @@
           docsEnum = new SegmentDocsAndPositionsEnum(freqIn, proxIn);
         }
       }
-      return docsEnum.reset(fieldInfo, (StandardTermState) termState, skipDocs);
+      return docsEnum.reset(fieldInfo, (StandardTermState) termState, acceptDocs);
     }
   }
 
@@ -267,7 +267,7 @@
     int doc;                                      // doc we last read
     int freq;                                     // freq we last read
 
-    Bits skipDocs;
+    Bits acceptDocs;
 
     long freqOffset;
     int skipOffset;
@@ -280,13 +280,13 @@
       this.freqIn = (IndexInput) freqIn.clone();
     }
 
-    public SegmentDocsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits skipDocs) throws IOException {
+    public SegmentDocsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits acceptDocs) throws IOException {
       omitTF = fieldInfo.omitTermFreqAndPositions;
       if (omitTF) {
         freq = 1;
       }
       storePayloads = fieldInfo.storePayloads;
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
       freqOffset = termState.freqOffset;
       skipOffset = termState.skipOffset;
 
@@ -327,7 +327,7 @@
           }
         }
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           break;
         }
       }
@@ -357,7 +357,7 @@
           }
         }
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           docs[i] = doc;
           freqs[i] = freq;
           ++i;
@@ -435,7 +435,7 @@
     int freq;                                     // freq we last read
     int position;
 
-    Bits skipDocs;
+    Bits acceptDocs;
 
     long freqOffset;
     int skipOffset;
@@ -453,11 +453,11 @@
       this.proxIn = (IndexInput) proxIn.clone();
     }
 
-    public SegmentDocsAndPositionsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits skipDocs) throws IOException {
+    public SegmentDocsAndPositionsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits acceptDocs) throws IOException {
       assert !fieldInfo.omitTermFreqAndPositions;
       assert !fieldInfo.storePayloads;
 
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
 
       // TODO: for full enum case (eg segment merging) this
       // seek is unnecessary; maybe we can avoid in such
@@ -504,7 +504,7 @@
         }
         posPendingCount += freq;
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           break;
         }
       }
@@ -626,7 +626,7 @@
     int freq;                                     // freq we last read
     int position;
 
-    Bits skipDocs;
+    Bits acceptDocs;
 
     long freqOffset;
     int skipOffset;
@@ -647,7 +647,7 @@
       this.proxIn = (IndexInput) proxIn.clone();
     }
 
-    public SegmentDocsAndPositionsAndPayloadsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits skipDocs) throws IOException {
+    public SegmentDocsAndPositionsAndPayloadsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits acceptDocs) throws IOException {
       assert !fieldInfo.omitTermFreqAndPositions;
       assert fieldInfo.storePayloads;
       if (payload == null) {
@@ -655,7 +655,7 @@
         payload.bytes = new byte[1];
       }
 
-      this.skipDocs = skipDocs;
+      this.acceptDocs = acceptDocs;
 
       // TODO: for full enum case (eg segment merging) this
       // seek is unnecessary; maybe we can avoid in such
@@ -701,7 +701,7 @@
         }
         posPendingCount += freq;
 
-        if (skipDocs == null || !skipDocs.get(doc)) {
+        if (acceptDocs == null || acceptDocs.get(doc)) {
           break;
         }
       }
Index: lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
--- lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java	Sun Jun 26 14:21:07 2011 -0400
@@ -68,7 +68,7 @@
 
     @Override
     protected void merge(MergeState state) throws IOException {
-      if (state.bits == null && state.reader instanceof Reader) {
+      if (state.acceptBits == null && state.reader instanceof Reader) {
         Reader reader = (Reader) state.reader;
         final int maxDocs = reader.maxDoc;
         if (maxDocs == 0) {
Index: lucene/src/java/org/apache/lucene/index/values/Floats.java
--- lucene/src/java/org/apache/lucene/index/values/Floats.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/values/Floats.java	Sun Jun 26 14:21:07 2011 -0400
@@ -118,7 +118,7 @@
 
     @Override
     protected void merge(MergeState state) throws IOException {
-      if (state.bits == null && state.reader instanceof FloatsReader) {
+      if (state.acceptBits == null && state.reader instanceof FloatsReader) {
         // no deletes - bulk copy
         // TODO: should be do bulks with deletes too?
         final FloatsReader reader = (FloatsReader) state.reader;
Index: lucene/src/java/org/apache/lucene/index/values/Writer.java
--- lucene/src/java/org/apache/lucene/index/values/Writer.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/index/values/Writer.java	Sun Jun 26 14:21:07 2011 -0400
@@ -147,12 +147,12 @@
       // impl. will get the correct reference for the type
       // it supports
       int docID = state.docBase;
-      final Bits bits = state.bits;
+      final Bits acceptBits = state.acceptBits;
       final int docCount = state.docCount;
       int currentDocId;
       if ((currentDocId = valEnum.advance(0)) != ValuesEnum.NO_MORE_DOCS) {
         for (int i = 0; i < docCount; i++) {
-          if (bits == null || !bits.get(i)) {
+          if (acceptBits == null || acceptBits.get(i)) {
             if (currentDocId < i) {
               if ((currentDocId = valEnum.advance(i)) == ValuesEnum.NO_MORE_DOCS) {
                 break; // advance can jump over default values
Index: lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
--- lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -19,6 +19,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.NotBits;
 
 import java.io.IOException;
 
@@ -54,7 +55,7 @@
     }
     this.cache = new CachingWrapperFilter.FilterCache<SpanFilterResult>(deletesMode) {
       @Override
-      protected SpanFilterResult mergeDeletes(final Bits delDocs, final SpanFilterResult value) {
+      protected SpanFilterResult mergeAcceptDocs(final Bits acceptDocs, final SpanFilterResult value) {
         throw new IllegalStateException("DeletesMode.DYNAMIC is not supported");
       }
     };
@@ -73,7 +74,7 @@
     final IndexReader reader = context.reader;
 
     final Object coreKey = reader.getCoreCacheKey();
-    final Object delCoreKey = reader.hasDeletions() ? reader.getDeletedDocs() : coreKey;
+    final Object delCoreKey = reader.hasDeletions() ? ((NotBits) reader.getNotDeletedDocs()).getBits() : coreKey;
 
     SpanFilterResult result = cache.get(reader, coreKey, delCoreKey);
     if (result != null) {
Index: lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
--- lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -23,8 +23,10 @@
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.util.OpenBitSet;
 import org.apache.lucene.util.OpenBitSetDISI;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.NotBits;
 
 /**
  * Wraps another filter's result and caches it.  The purpose is to allow
@@ -76,7 +78,7 @@
     // after de-serialize
     transient Map<Object,T> cache;
 
-    private final DeletesMode deletesMode;
+    final DeletesMode deletesMode;
 
     public FilterCache(DeletesMode deletesMode) {
       this.deletesMode = deletesMode;
@@ -103,13 +105,13 @@
         value = cache.get(delCoreKey);
 
         if (value == null) {
-          // now for core match, but dynamically AND NOT
-          // deletions
+          // now for core match, but dynamically AND
+          // accepted docs
           value = cache.get(coreKey);
           if (value != null) {
-            final Bits delDocs = reader.getDeletedDocs();
-            if (delDocs != null) {
-              value = mergeDeletes(delDocs, value);
+            final Bits acceptDocs = reader.getNotDeletedDocs();
+            if (acceptDocs != null) {
+              value = mergeAcceptDocs(acceptDocs, value);
             }
           }
         }
@@ -118,7 +120,7 @@
       return value;
     }
 
-    protected abstract T mergeDeletes(Bits delDocs, T value);
+    protected abstract T mergeAcceptDocs(Bits acceptDocs, T value);
 
     public synchronized void put(Object coreKey, Object delCoreKey, T value) {
       if (deletesMode == DeletesMode.IGNORE) {
@@ -158,11 +160,11 @@
     this.filter = filter;
     cache = new FilterCache<DocIdSet>(deletesMode) {
       @Override
-      public DocIdSet mergeDeletes(final Bits delDocs, final DocIdSet docIdSet) {
+      public DocIdSet mergeAcceptDocs(final Bits acceptDocs, final DocIdSet docIdSet) {
         return new FilteredDocIdSet(docIdSet) {
           @Override
-            protected boolean match(int docID) {
-            return !delDocs.get(docID);
+          protected boolean match(int docID) {
+            return acceptDocs.get(docID);
           }
         };
       }
@@ -197,7 +199,7 @@
   public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
     final IndexReader reader = context.reader;
     final Object coreKey = reader.getCoreCacheKey();
-    final Object delCoreKey = reader.hasDeletions() ? reader.getDeletedDocs() : coreKey;
+    final Object delCoreKey = reader.hasDeletions() ? ((NotBits) reader.getNotDeletedDocs()).getBits() : coreKey;
 
     DocIdSet docIdSet = cache.get(reader, coreKey, delCoreKey);
     if (docIdSet != null) {
@@ -210,6 +212,20 @@
     // cache miss
     docIdSet = docIdSetToCache(filter.getDocIdSet(context), reader);
 
+    if (docIdSet instanceof OpenBitSet) {
+      final OpenBitSet obs = (OpenBitSet) docIdSet;
+      final int setCount = (int) (obs.cardinality());
+
+      // nocommit how/where to make this hardwired 1%
+      // settable...?
+
+      if (setCount > 0 && (reader.maxDoc()/setCount) < 100) {
+        obs.setUseRandomAccess(true);
+        obs.setIncludesDeletedDocs(cache.deletesMode == DeletesMode.RECACHE);
+        System.out.println("DORAND " + (cache.deletesMode == DeletesMode.RECACHE));
+      }
+    }
+
     if (docIdSet != null) {
       cache.put(coreKey, delCoreKey, docIdSet);
     }
Index: lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
--- lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -136,16 +136,18 @@
       if (filter != null) {
         assert query == null;
         final DocIdSet dis = filter.getDocIdSet(context);
-        if (dis == null)
+        if (dis == null) {
           return null;
+        }
         disi = dis.iterator();
       } else {
         assert query != null && innerWeight != null;
-        disi =
-          innerWeight.scorer(context, scorerContext);
+        disi = innerWeight.scorer(context, scorerContext);
       }
-      if (disi == null)
+
+      if (disi == null) {
         return null;
+      }
       return new ConstantScorer(disi, this);
     }
     
Index: lucene/src/java/org/apache/lucene/search/DocIdSet.java
--- lucene/src/java/org/apache/lucene/search/DocIdSet.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/DocIdSet.java	Sun Jun 26 14:21:07 2011 -0400
@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 
+import org.apache.lucene.util.Bits;
+
 /**
  * A DocIdSet contains a set of doc ids. Implementing classes must
  * only implement {@link #iterator} to provide access to the set. 
@@ -46,6 +48,11 @@
     public boolean isCacheable() {
       return true;
     }
+
+    @Override
+    public Bits getRandomAccessBits() {
+      return null;
+    }
   };
     
   /** Provides a {@link DocIdSetIterator} to access the set.
@@ -54,6 +61,25 @@
    * are no docs that match. */
   public abstract DocIdSetIterator iterator() throws IOException;
 
+  /** Only used if {@link #getRandomAccessBits} returns non-null result;
+   *  return true if the Bits instance has already factored
+   *  in deletions. */
+  // nocommit better name...?  somewhere else...?  move to
+  // subclass...?
+  public boolean bitsIncludesDeletedDocs() {
+    return false;
+  }
+
+  /** Return a Bits impl if this DocIdSet should be applied
+   *  via random-access (because the underlying bit set
+   *  implementation supports random access, and the filter
+   *  is dense enough), instead of {@link DocIdSetIterator}. */
+  // nocommit better name...?  somewhere else...?  move to
+  // subclass...?
+  public Bits getRandomAccessBits() {
+    return null;
+  }
+
   /**
    * This method is a hint for {@link CachingWrapperFilter}, if this <code>DocIdSet</code>
    * should be cached without copying it into a BitSet. The default is to return
Index: lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
--- lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -533,9 +533,9 @@
     @Override
     public DocIdSetIterator iterator() throws IOException {
 
-      final Bits skipDocs = canIgnoreDeletedDocs ? null : reader.getDeletedDocs();
+      final Bits acceptDocs = canIgnoreDeletedDocs ? null : reader.getNotDeletedDocs();
 
-      if (skipDocs == null) {
+      if (acceptDocs == null) {
         // Specialization optimization disregard deletions
         return new DocIdSetIterator() {
           private int doc = -1;
@@ -575,7 +575,7 @@
         final int maxDoc = reader.maxDoc();
 
         // a DocIdSetIterator generating docIds by
-        // incrementing a variable & checking skipDocs -
+        // incrementing a variable & checking acceptDocs -
         return new DocIdSetIterator() {
           private int doc = -1;
           @Override
@@ -590,14 +590,14 @@
               if (doc >= maxDoc) {
                 return doc = NO_MORE_DOCS;
               }
-            } while (skipDocs.get(doc) || !matchDoc(doc));
+            } while (!acceptDocs.get(doc) || !matchDoc(doc));
             return doc;
           }
         
           @Override
           public int advance(int target) {
             for(doc=target;doc<maxDoc;doc++) {
-              if (!skipDocs.get(doc) && matchDoc(doc)) {
+              if (acceptDocs.get(doc) && matchDoc(doc)) {
                 return doc;
               }
             }
Index: lucene/src/java/org/apache/lucene/search/Filter.java
--- lucene/src/java/org/apache/lucene/search/Filter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/Filter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -44,7 +44,7 @@
    *         represent the whole underlying index i.e. if the index has more than
    *         one segment the given reader only represents a single segment.
    *         The provided context is always an atomic context, so you can call 
-   *         {@link IndexReader#fields()} or  {@link IndexReader#getDeletedDocs()}
+   *         {@link IndexReader#fields()} or {@link IndexReader#getNotDeletedDocs()}
    *         on the context's reader, for example.
    *          
    * @return a DocIdSet that provides the documents which should be permitted or
Index: lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
--- lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -252,14 +252,14 @@
   }
   
   @Override
-  public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
-    return actualEnum.docs(skipDocs, reuse);
+  public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
+    return actualEnum.docs(acceptDocs, reuse);
   }
   
   @Override
-  public DocsAndPositionsEnum docsAndPositions(Bits skipDocs,
+  public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs,
       DocsAndPositionsEnum reuse) throws IOException {
-    return actualEnum.docsAndPositions(skipDocs, reuse);
+    return actualEnum.docsAndPositions(acceptDocs, reuse);
   }
   
   @Override
Index: lucene/src/java/org/apache/lucene/search/IndexSearcher.java
--- lucene/src/java/org/apache/lucene/search/IndexSearcher.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/IndexSearcher.java	Sun Jun 26 14:21:07 2011 -0400
@@ -32,13 +32,15 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.FieldSelector;
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Weight.ScorerContext;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.NIOFSDirectory;    // javadoc
+import org.apache.lucene.util.AndBits;
+import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.ReaderUtil;
 import org.apache.lucene.util.ThreadInterruptedException;
 
@@ -537,13 +539,14 @@
 
     // TODO: should we make this
     // threaded...?  the Collector could be sync'd?
-    ScorerContext scorerContext =  ScorerContext.def().scoreDocsInOrder(true).topScorer(true);
     // always use single thread:
     if (filter == null) {
+      ScorerContext scorerContext =  ScorerContext.def().scoreDocsInOrder(true).topScorer(true);
       for (int i = 0; i < leaves.length; i++) { // search each subreader
         collector.setNextReader(leaves[i]);
-        scorerContext = scorerContext.scoreDocsInOrder(!collector.acceptsDocsOutOfOrder());
-        Scorer scorer = weight.scorer(leaves[i], scorerContext);
+        Scorer scorer = weight.scorer(leaves[i],
+                                      scorerContext.scoreDocsInOrder(!collector.acceptsDocsOutOfOrder())
+                                        .acceptOnlyDocs(leaves[i].reader.getNotDeletedDocs()));
         if (scorer != null) {
           scorer.score(collector);
         }
@@ -560,14 +563,6 @@
       final Filter filter, final Collector collector) throws IOException {
 
     assert filter != null;
-    
-    Scorer scorer = weight.scorer(context, ScorerContext.def());
-    if (scorer == null) {
-      return;
-    }
-
-    int docID = scorer.docID();
-    assert docID == -1 || docID == DocIdSetIterator.NO_MORE_DOCS;
 
     // CHECKME: use ConjunctionScorer here?
     DocIdSet filterDocIdSet = filter.getDocIdSet(context);
@@ -575,29 +570,61 @@
       // this means the filter does not accept any documents.
       return;
     }
+
+    ScorerContext scorerContext = ScorerContext.def();
     
-    DocIdSetIterator filterIter = filterDocIdSet.iterator();
-    if (filterIter == null) {
-      // this means the filter does not accept any documents.
+    Bits notDelDocs = context.reader.getNotDeletedDocs();
+
+    Bits acceptDocs = filterDocIdSet.getRandomAccessBits();
+    if (acceptDocs != null) {
+
+      // Filter by random-access: we push the filter all the
+      // way down to the atomic scorers, so the bits are
+      // applied just like deleted docs:
+      if (!filterDocIdSet.bitsIncludesDeletedDocs() && notDelDocs != null) {
+        acceptDocs = new AndBits(acceptDocs, notDelDocs);
+      }
+
+      scorerContext = scorerContext.scoreDocsInOrder(!collector.acceptsDocsOutOfOrder()).topScorer(true).acceptOnlyDocs(acceptDocs);
+    } else if (notDelDocs != null) {
+      scorerContext = scorerContext.acceptOnlyDocs(notDelDocs);
+    }
+    
+    Scorer scorer = weight.scorer(context, scorerContext);
+    if (scorer == null) {
       return;
     }
-    int filterDoc = filterIter.nextDoc();
-    int scorerDoc = scorer.advance(filterDoc);
-    
-    collector.setScorer(scorer);
-    while (true) {
-      if (scorerDoc == filterDoc) {
-        // Check if scorer has exhausted, only before collecting.
-        if (scorerDoc == DocIdSetIterator.NO_MORE_DOCS) {
-          break;
+
+    if (acceptDocs != null) {
+      collector.setNextReader(context);
+      scorer.score(collector);
+    } else {
+      int docID = scorer.docID();
+      assert docID == -1 || docID == DocIdSetIterator.NO_MORE_DOCS;
+      DocIdSetIterator filterIter = filterDocIdSet.iterator();
+      if (filterIter == null) {
+        // this means the filter does not accept any documents.
+        return;
+      }
+      int filterDoc = filterIter.nextDoc();
+      int scorerDoc = scorer.advance(filterDoc);
+
+      // Filter by iteration:
+      collector.setScorer(scorer);
+      while (true) {
+        if (scorerDoc == filterDoc) {
+          // Check if scorer has exhausted, only before collecting.
+          if (scorerDoc == DocIdSetIterator.NO_MORE_DOCS) {
+            break;
+          }
+          collector.collect(scorerDoc);
+          filterDoc = filterIter.nextDoc();
+          scorerDoc = scorer.advance(filterDoc);
+        } else if (scorerDoc > filterDoc) {
+          filterDoc = filterIter.advance(scorerDoc);
+        } else {
+          scorerDoc = scorer.advance(filterDoc);
         }
-        collector.collect(scorerDoc);
-        filterDoc = filterIter.nextDoc();
-        scorerDoc = scorer.advance(filterDoc);
-      } else if (scorerDoc > filterDoc) {
-        filterDoc = filterIter.advance(scorerDoc);
-      } else {
-        scorerDoc = scorer.advance(filterDoc);
       }
     }
   }
Index: lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
--- lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -50,14 +50,14 @@
     final byte[] norms;
     private int doc = -1;
     private final int maxDoc;
-    private final Bits delDocs;
+    private final Bits acceptDocs;
     private final Similarity similarity;
     
     MatchAllScorer(IndexReader reader, Similarity similarity, Weight w,
         byte[] norms) throws IOException {
       super(w);
       this.similarity = similarity;
-      delDocs = reader.getDeletedDocs();
+      acceptDocs = reader.getNotDeletedDocs();
       score = w.getValue();
       maxDoc = reader.maxDoc();
       this.norms = norms;
@@ -71,7 +71,7 @@
     @Override
     public int nextDoc() throws IOException {
       doc++;
-      while(delDocs != null && doc < maxDoc && delDocs.get(doc)) {
+      while(acceptDocs != null && doc < maxDoc && !acceptDocs.get(doc)) {
         doc++;
       }
       if (doc == maxDoc) {
Index: lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
--- lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -175,7 +175,7 @@
       if (termArrays.size() == 0)                  // optimize zero-term case
         return null;
       final IndexReader reader = context.reader;
-      final Bits delDocs = reader.getDeletedDocs();
+      final Bits acceptDocs = reader.getNotDeletedDocs();
       
       PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()];
 
@@ -196,12 +196,12 @@
           }
         } else {
           final Term term = terms[0];
-          postingsEnum = reader.termPositionsEnum(delDocs,
+          postingsEnum = reader.termPositionsEnum(acceptDocs,
                                                   term.field(),
                                                   term.bytes());
 
           if (postingsEnum == null) {
-            if (reader.termDocsEnum(delDocs, term.field(), term.bytes()) != null) {
+            if (reader.termDocsEnum(acceptDocs, term.field(), term.bytes()) != null) {
               // term does exist, but has no positions
               throw new IllegalStateException("field \"" + term.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + term.text() + ")");
             } else {
@@ -497,15 +497,15 @@
 
   public UnionDocsAndPositionsEnum(IndexReader indexReader, Term[] terms) throws IOException {
     List<DocsAndPositionsEnum> docsEnums = new LinkedList<DocsAndPositionsEnum>();
-    final Bits delDocs = indexReader.getDeletedDocs();
+    final Bits acceptDocs = indexReader.getNotDeletedDocs();
     for (int i = 0; i < terms.length; i++) {
-      DocsAndPositionsEnum postings = indexReader.termPositionsEnum(delDocs,
+      DocsAndPositionsEnum postings = indexReader.termPositionsEnum(acceptDocs,
                                                                     terms[i].field(),
                                                                     terms[i].bytes());
       if (postings != null) {
         docsEnums.add(postings);
       } else {
-        if (indexReader.termDocsEnum(delDocs, terms[i].field(), terms[i].bytes()) != null) {
+        if (indexReader.termDocsEnum(acceptDocs, terms[i].field(), terms[i].bytes()) != null) {
           // term does exist, but has no positions
           throw new IllegalStateException("field \"" + terms[i].field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + terms[i].text() + ")");
         }
Index: lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
--- lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -125,13 +125,12 @@
       // fill into a OpenBitSet
       final OpenBitSet bitSet = new OpenBitSet(context.reader.maxDoc());
       int termCount = 0;
-      final Bits delDocs = reader.getDeletedDocs();
       DocsEnum docsEnum = null;
       do {
         termCount++;
         // System.out.println("  iter termCount=" + termCount + " term=" +
         // enumerator.term().toBytesString());
-        docsEnum = termsEnum.docs(delDocs, docsEnum);
+        docsEnum = termsEnum.docs(reader.getNotDeletedDocs(), docsEnum);
         final DocsEnum.BulkReadResult result = docsEnum.getBulkResult();
         while (true) {
           final int count = docsEnum.read();
Index: lucene/src/java/org/apache/lucene/search/PhraseQuery.java
--- lucene/src/java/org/apache/lucene/search/PhraseQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/PhraseQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -213,16 +213,15 @@
         return null;
       final IndexReader reader = context.reader;
       PostingsAndFreq[] postingsFreqs = new PostingsAndFreq[terms.size()];
-      final Bits delDocs = reader.getDeletedDocs();
       for (int i = 0; i < terms.size(); i++) {
         final Term t = terms.get(i);
-        DocsAndPositionsEnum postingsEnum = reader.termPositionsEnum(delDocs,
+        DocsAndPositionsEnum postingsEnum = reader.termPositionsEnum(scorerContext.acceptOnlyDocs,
                                                                      t.field(),
                                                                      t.bytes());
         // PhraseQuery on a field that did not index
         // positions.
         if (postingsEnum == null) {
-          if (reader.termDocsEnum(delDocs, t.field(), t.bytes()) != null) {
+          if (reader.termDocsEnum(scorerContext.acceptOnlyDocs, t.field(), t.bytes()) != null) {
             // term does exist, but has no positions
             throw new IllegalStateException("field \"" + t.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + t.text() + ")");
           } else {
Index: lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java
--- lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -56,7 +56,8 @@
     return new DocIdSet() {
       @Override
       public DocIdSetIterator iterator() throws IOException {
-        return weight.scorer(privateContext, ScorerContext.def());
+        // nocommit
+        return weight.scorer(privateContext, ScorerContext.def().acceptOnlyDocs(context.reader.getNotDeletedDocs()));
       }
       @Override
       public boolean isCacheable() { return false; }
Index: lucene/src/java/org/apache/lucene/search/TermQuery.java
--- lucene/src/java/org/apache/lucene/search/TermQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/TermQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -90,13 +90,12 @@
       final String field = term.field();
       final IndexReader reader = context.reader;
       assert termStates.topReaderContext == ReaderUtil.getTopLevelContext(context) : "The top-reader used to create Weight (" + termStates.topReaderContext + ") is not the same as the current reader's top-reader (" + ReaderUtil.getTopLevelContext(context);
-      final TermState state = termStates
-          .get(context.ord);
+      final TermState state = termStates.get(context.ord);
       if (state == null) { // term is not present in that reader
         assert termNotInReader(reader, field, term.bytes()) : "no termstate found but term exists in reader";
         return null;
       }
-      final DocsEnum docs = reader.termDocsEnum(reader.getDeletedDocs(), field, term.bytes(), state);
+      final DocsEnum docs = reader.termDocsEnum(scorerContext.acceptOnlyDocs, field, term.bytes(), state);
       assert docs != null;
       return new TermScorer(this, docs, similarity, context.reader.norms(field));
     }
@@ -143,7 +142,7 @@
 
       Explanation tfExplanation = new Explanation();
       int tf = 0;
-      DocsEnum docs = reader.termDocsEnum(reader.getDeletedDocs(), term.field(), term.bytes());
+      DocsEnum docs = reader.termDocsEnum(context.reader.getNotDeletedDocs(), term.field(), term.bytes());
       if (docs != null) {
           int newDoc = docs.advance(doc);
           if (newDoc == doc) {
Index: lucene/src/java/org/apache/lucene/search/Weight.java
--- lucene/src/java/org/apache/lucene/search/Weight.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/Weight.java	Sun Jun 26 14:21:07 2011 -0400
@@ -19,9 +19,10 @@
 
 import java.io.IOException;
 
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.util.Bits;
 
 /**
  * Expert: Calculate query weights and build query scorers.
@@ -140,9 +141,12 @@
      * be called instead.
      */
     public final boolean topScorer;
+
+    /** If non-null, the returned scorer should filter
+     *  according to this {@link Bits} instance. */
+    public final Bits acceptOnlyDocs;
     
-    
-    private static final ScorerContext DEFAULT_CONTEXT = new ScorerContext(true, false);
+    private static final ScorerContext DEFAULT_CONTEXT = new ScorerContext(true, false, null);
 
     /**
      * Returns a default {@link ScorerContext} template initialized with:
@@ -155,9 +159,10 @@
       return DEFAULT_CONTEXT;
     }
     
-    private ScorerContext(boolean scoreDocsInOrder, boolean topScorer) {
+    private ScorerContext(boolean scoreDocsInOrder, boolean topScorer, Bits acceptOnlyDocs) {
       this.scoreDocsInOrder = scoreDocsInOrder;
       this.topScorer = topScorer;
+      this.acceptOnlyDocs = acceptOnlyDocs;
     }
 
     /**
@@ -171,7 +176,7 @@
       if (this.scoreDocsInOrder == scoreDocsInOrder) {
         return this;
       }
-      return new ScorerContext(scoreDocsInOrder, topScorer);
+      return new ScorerContext(scoreDocsInOrder, topScorer, acceptOnlyDocs);
     }
     
     /**
@@ -185,7 +190,21 @@
       if (this.topScorer == topScorer) {
         return this;
       }
-      return new ScorerContext(scoreDocsInOrder, topScorer);
+      return new ScorerContext(scoreDocsInOrder, topScorer, acceptOnlyDocs);
+    }
+
+    /**
+     * Creates and returns a copy of this context with the given value for
+     * {@link #topScorer} and returns a new instance of
+     * {@link ScorerContext} iff the given value differs from the
+     * {@link #topScorer}. Otherwise, this method has no effect and
+     * returns this instance.
+     */
+    public ScorerContext acceptOnlyDocs(Bits acceptOnlyDocs) {
+      if (this.acceptOnlyDocs == acceptOnlyDocs) {
+        return this;
+      }
+      return new ScorerContext(scoreDocsInOrder, topScorer, acceptOnlyDocs);
     }
   }
 }
Index: lucene/src/java/org/apache/lucene/search/cache/DocTermsCreator.java
--- lucene/src/java/org/apache/lucene/search/cache/DocTermsCreator.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/cache/DocTermsCreator.java	Sun Jun 26 14:21:07 2011 -0400
@@ -105,7 +105,7 @@
     if (terms != null) {
       int termCount = 0;
       final TermsEnum termsEnum = terms.iterator();
-      final Bits delDocs = MultiFields.getDeletedDocs(reader);
+      final Bits acceptDocs = MultiFields.getNotDeletedDocs(reader);
       DocsEnum docs = null;
       while(true) {
         if (termCount++ == termCountHardLimit) {
@@ -120,7 +120,7 @@
           break;
         }
         final long pointer = bytes.copyUsingLengthPrefix(term);
-        docs = termsEnum.docs(delDocs, docs);
+        docs = termsEnum.docs(acceptDocs, docs);
         while (true) {
           final int docID = docs.nextDoc();
           if (docID == DocIdSetIterator.NO_MORE_DOCS) {
Index: lucene/src/java/org/apache/lucene/search/cache/DocTermsIndexCreator.java
--- lucene/src/java/org/apache/lucene/search/cache/DocTermsIndexCreator.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/cache/DocTermsIndexCreator.java	Sun Jun 26 14:21:07 2011 -0400
@@ -322,12 +322,12 @@
       }
 
       @Override
-      public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
+      public DocsEnum docs(Bits acceptDocs, DocsEnum reuse) throws IOException {
         throw new UnsupportedOperationException();
       }
 
       @Override
-      public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
+      public DocsAndPositionsEnum docsAndPositions(Bits acceptDocs, DocsAndPositionsEnum reuse) throws IOException {
         throw new UnsupportedOperationException();
       }
 
Index: lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
--- lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -126,7 +126,7 @@
   private class ValueSourceScorer extends Scorer {
     private final float qWeight;
     private final DocValues vals;
-    private final Bits delDocs;
+    private final Bits acceptDocs;
     private final int maxDoc;
     private int doc = -1;
 
@@ -137,14 +137,14 @@
       qWeight = w.getValue();
       // this is when/where the values are first created.
       vals = valSrc.getValues(context);
-      delDocs = reader.getDeletedDocs();
+      acceptDocs = reader.getNotDeletedDocs();
       maxDoc = reader.maxDoc();
     }
 
     @Override
     public int nextDoc() throws IOException {
       doc++;
-      while (delDocs != null && doc < maxDoc && delDocs.get(doc)) {
+      while (acceptDocs != null && doc < maxDoc && !acceptDocs.get(doc)) {
         doc++;
       }
       if (doc == maxDoc) {
Index: lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
--- lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -83,14 +83,14 @@
   @Override
   public Spans getSpans(final AtomicReaderContext context) throws IOException {
     final IndexReader reader = context.reader;
-    final DocsAndPositionsEnum postings = reader.termPositionsEnum(reader.getDeletedDocs(),
+    final DocsAndPositionsEnum postings = reader.termPositionsEnum(reader.getNotDeletedDocs(),
                                                                    term.field(),
                                                                    term.bytes());
 
     if (postings != null) {
       return new TermSpans(postings, term);
     } else {
-      if (reader.termDocsEnum(reader.getDeletedDocs(), term.field(), term.bytes()) != null) {
+      if (reader.termDocsEnum(reader.getNotDeletedDocs(), term.field(), term.bytes()) != null) {
         // term does exist, but has no positions
         throw new IllegalStateException("field \"" + term.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run SpanTermQuery (term=" + term.text() + ")");
       } else {
Index: lucene/src/java/org/apache/lucene/util/AndBits.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ lucene/src/java/org/apache/lucene/util/AndBits.java	Sun Jun 26 14:21:07 2011 -0400
@@ -0,0 +1,43 @@
+package org.apache.lucene.util;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @lucene.experimental
+ */
+
+public final class AndBits implements Bits {
+  private final Bits bits1;
+  private final Bits bits2;
+
+  public AndBits(Bits bits1, Bits bits2) {
+    this.bits1 = bits1;
+    this.bits2 = bits2;
+    if (bits1.length() != bits2.length()) {
+      throw new IllegalArgumentException("bit lengths differ: " + bits1.length() + " vs " + bits2.length());
+    }
+  }
+  
+  public boolean get(int index) {
+    return bits1.get(index) && bits2.get(index);
+  }
+
+  public int length() {
+    return bits1.length();
+  }
+}
Index: lucene/src/java/org/apache/lucene/util/MultiBits.java
--- lucene/src/java/org/apache/lucene/util/MultiBits.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/util/MultiBits.java	Sun Jun 26 14:21:07 2011 -0400
@@ -34,13 +34,16 @@
   // length is 1+subs.length (the last entry has the maxDoc):
   private final int[] starts;
 
-  public MultiBits(List<Bits> bits, List<Integer> starts) {
+  private final boolean defaultValue;
+
+  public MultiBits(List<Bits> bits, List<Integer> starts, boolean defaultValue) {
     assert starts.size() == 1+bits.size();
     this.subs = bits.toArray(Bits.EMPTY_ARRAY);
     this.starts = new int[starts.size()];
     for(int i=0;i<this.starts.length;i++) {
       this.starts[i] = starts.get(i);
     }
+    this.defaultValue = defaultValue;
   }
 
   private boolean checkLength(int reader, int doc) {
@@ -54,7 +57,7 @@
     assert reader != -1;
     final Bits bits = subs[reader];
     if (bits == null) {
-      return false;
+      return defaultValue;
     } else {
       assert checkLength(reader, doc);
       return bits.get(doc-starts[reader]);
Index: lucene/src/java/org/apache/lucene/util/NotBits.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ lucene/src/java/org/apache/lucene/util/NotBits.java	Sun Jun 26 14:21:07 2011 -0400
@@ -0,0 +1,43 @@
+package org.apache.lucene.util;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @lucene.experimental
+ */
+
+public final class NotBits implements Bits {
+  private final Bits bits;
+
+  public NotBits(Bits bits) {
+    this.bits = bits;
+  }
+
+  // nocommit
+  public Bits getBits() {
+    return bits;
+  }
+  
+  public boolean get(int index) {
+    return !bits.get(index);
+  }
+
+  public int length() {
+    return bits.length();
+  }
+}
Index: lucene/src/java/org/apache/lucene/util/OpenBitSet.java
--- lucene/src/java/org/apache/lucene/util/OpenBitSet.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/util/OpenBitSet.java	Sun Jun 26 14:21:07 2011 -0400
@@ -133,12 +133,14 @@
   * compatibility.  This is *not* equal to {@link #cardinality}
   */
   public long size() {
-      return capacity();
+    return capacity();
   }
 
   // @Override -- not until Java 1.6
   public int length() {
-    return bits.length << 6;
+    // nocommit -- maybe return numBits!?
+    // return bits.length << 6;
+    return (int) numBits;
   }
 
   /** Returns true if there are no set bits */
@@ -870,6 +872,30 @@
     return (int)((h>>32) ^ h) + 0x98761234;
   }
 
+  private boolean includesDeletions;
+
+  /** @lucene.experimental */
+  public void setIncludesDeletedDocs(boolean v) {
+    includesDeletions = v;
+  }
+
+  /** @lucene.experimental */
+  @Override
+  public boolean bitsIncludesDeletedDocs() {
+    return includesDeletions;
+  }
+
+  private boolean useRandomAccess;
+
+  /** @lucene.experimental */
+  public void setUseRandomAccess(boolean v) {
+    useRandomAccess = v;
+  }
+
+  @Override
+  public Bits getRandomAccessBits() {
+    return useRandomAccess ? this : null;
+  }
 }
 
 
Index: lucene/src/java/org/apache/lucene/util/OpenBitSetDISI.java
--- lucene/src/java/org/apache/lucene/util/OpenBitSetDISI.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/java/org/apache/lucene/util/OpenBitSetDISI.java	Sun Jun 26 14:21:07 2011 -0400
@@ -19,7 +19,10 @@
 
 import java.io.IOException;
 import org.apache.lucene.search.DocIdSetIterator;
- 
+
+// nocommit -- why extend OBS here?  why not makea new OBS
+// then use util methods to set the bits...
+
 public class OpenBitSetDISI extends OpenBitSet {
 
   /** Construct an OpenBitSetDISI with its bits set
Index: lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
--- lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java	Sun Jun 26 14:21:07 2011 -0400
@@ -1249,6 +1249,8 @@
    * with one that returns null for getSequentialSubReaders.
    */
   public static IndexSearcher newSearcher(IndexReader r, boolean maybeWrap) throws IOException {
+    // nocommit fix IS wrapper to enable "low" filtering for
+    // search methods taking Filter
     if (random.nextBoolean()) {
       if (maybeWrap && rarely()) {
         r = new SlowMultiReaderWrapper(r);
Index: lucene/src/test/org/apache/lucene/TestExternalCodecs.java
--- lucene/src/test/org/apache/lucene/TestExternalCodecs.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/TestExternalCodecs.java	Sun Jun 26 14:21:07 2011 -0400
@@ -346,26 +346,26 @@
       }
 
       @Override
-      public DocsEnum docs(Bits skipDocs, DocsEnum reuse) {
-        return new RAMDocsEnum(ramField.termToDocs.get(current), skipDocs);
+      public DocsEnum docs(Bits keepDocs, DocsEnum reuse) {
+        return new RAMDocsEnum(ramField.termToDocs.get(current), keepDocs);
       }
 
       @Override
-      public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) {
-        return new RAMDocsAndPositionsEnum(ramField.termToDocs.get(current), skipDocs);
+      public DocsAndPositionsEnum docsAndPositions(Bits keepDocs, DocsAndPositionsEnum reuse) {
+        return new RAMDocsAndPositionsEnum(ramField.termToDocs.get(current), keepDocs);
       }
     }
 
     private static class RAMDocsEnum extends DocsEnum {
       private final RAMTerm ramTerm;
-      private final Bits skipDocs;
+      private final Bits keepDocs;
       private RAMDoc current;
       int upto = -1;
       int posUpto = 0;
 
-      public RAMDocsEnum(RAMTerm ramTerm, Bits skipDocs) {
+      public RAMDocsEnum(RAMTerm ramTerm, Bits keepDocs) {
         this.ramTerm = ramTerm;
-        this.skipDocs = skipDocs;
+        this.keepDocs = keepDocs;
       }
 
       @Override
@@ -383,7 +383,7 @@
           upto++;
           if (upto < ramTerm.docs.size()) {
             current = ramTerm.docs.get(upto);
-            if (skipDocs == null || !skipDocs.get(current.docID)) {
+            if (keepDocs == null || keepDocs.get(current.docID)) {
               posUpto = 0;
               return current.docID;
             }
@@ -406,14 +406,14 @@
 
     private static class RAMDocsAndPositionsEnum extends DocsAndPositionsEnum {
       private final RAMTerm ramTerm;
-      private final Bits skipDocs;
+      private final Bits keepDocs;
       private RAMDoc current;
       int upto = -1;
       int posUpto = 0;
 
-      public RAMDocsAndPositionsEnum(RAMTerm ramTerm, Bits skipDocs) {
+      public RAMDocsAndPositionsEnum(RAMTerm ramTerm, Bits keepDocs) {
         this.ramTerm = ramTerm;
-        this.skipDocs = skipDocs;
+        this.keepDocs = keepDocs;
       }
 
       @Override
@@ -431,7 +431,7 @@
           upto++;
           if (upto < ramTerm.docs.size()) {
             current = ramTerm.docs.get(upto);
-            if (skipDocs == null || !skipDocs.get(current.docID)) {
+            if (keepDocs == null || keepDocs.get(current.docID)) {
               posUpto = 0;
               return current.docID;
             }
@@ -560,6 +560,9 @@
     r.close();
     s.close();
 
+    if (VERBOSE) {
+      System.out.println("\nTEST: now delete 2nd doc");
+    }
     w.deleteDocuments(new Term("id", "44"));
     w.optimize();
     r = IndexReader.open(w, true);
Index: lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
--- lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -73,7 +73,7 @@
     
     IndexReader reader = writer.getReader();
     DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader,
-                                                                          MultiFields.getDeletedDocs(reader),
+                                                                          MultiFields.getNotDeletedDocs(reader),
                                                                           "preanalyzed",
                                                                           new BytesRef("term1"));
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
@@ -81,7 +81,7 @@
     assertEquals(0, termPositions.nextPosition());
 
     termPositions = MultiFields.getTermPositionsEnum(reader,
-                                                     MultiFields.getDeletedDocs(reader),
+                                                     MultiFields.getNotDeletedDocs(reader),
                                                      "preanalyzed",
                                                      new BytesRef("term2"));
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
@@ -90,7 +90,7 @@
     assertEquals(3, termPositions.nextPosition());
     
     termPositions = MultiFields.getTermPositionsEnum(reader,
-                                                     MultiFields.getDeletedDocs(reader),
+                                                     MultiFields.getNotDeletedDocs(reader),
                                                      "preanalyzed",
                                                      new BytesRef("term3"));
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
Index: lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
--- lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java	Sun Jun 26 14:21:07 2011 -0400
@@ -281,10 +281,10 @@
 
     _TestUtil.checkIndex(dir);
 
-    final Bits delDocs = MultiFields.getDeletedDocs(reader);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
 
     for(int i=0;i<35;i++) {
-      if (!delDocs.get(i)) {
+      if (notDelDocs.get(i)) {
         Document d = reader.document(i);
         List<Fieldable> fields = d.getFields();
         if (d.getField("content3") == null) {
Index: lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
--- lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java	Sun Jun 26 14:21:07 2011 -0400
@@ -611,6 +611,9 @@
     final int N = 10;
 
     for(int pass=0;pass<2;pass++) {
+      if (VERBOSE) {
+        System.out.println("TEST: pass=" + pass);
+      }
 
       boolean useCompoundFile = (pass % 2) != 0;
 
@@ -631,7 +634,7 @@
 
       for(int i=0;i<N+1;i++) {
         if (VERBOSE) {
-          System.out.println("\nTEST: cycle i=" + i);
+          System.out.println("\nTEST: write i=" + i);
         }
         conf = newIndexWriterConfig(
             TEST_VERSION_CURRENT, new MockAnalyzer(random))
@@ -692,8 +695,14 @@
       int expectedCount = 176;
       searcher.close();
       for(int i=0;i<N+1;i++) {
+        if (VERBOSE) {
+          System.out.println("TEST: i=" + i);
+        }
         try {
           IndexReader reader = IndexReader.open(dir, true);
+          if (VERBOSE) {
+            System.out.println("  got reader=" + reader);
+          }
 
           // Work backwards in commits on what the expected
           // count should be.
@@ -706,7 +715,7 @@
               expectedCount -= 17;
             }
           }
-          assertEquals(expectedCount, hits.length);
+          assertEquals("maxDoc=" + searcher.maxDoc() + " numDocs=" + searcher.getIndexReader().numDocs(), expectedCount, hits.length);
           searcher.close();
           reader.close();
           if (i == N) {
Index: lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
--- lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -168,13 +168,13 @@
     TermsEnum te2 = MultiFields.getTerms(mr2, "body").iterator();
     te2.seekCeil(new BytesRef("wow"));
     DocsEnum td = MultiFields.getTermDocsEnum(mr2,
-                                              MultiFields.getDeletedDocs(mr2),
+                                              MultiFields.getNotDeletedDocs(mr2),
                                               "body",
                                               te2.term());
 
     TermsEnum te3 = MultiFields.getTerms(mr3, "body").iterator();
     te3.seekCeil(new BytesRef("wow"));
-    td = te3.docs(MultiFields.getDeletedDocs(mr3),
+    td = te3.docs(MultiFields.getNotDeletedDocs(mr3),
                   td);
     
     int ret = 0;
Index: lucene/src/test/org/apache/lucene/index/TestDoc.java
--- lucene/src/test/org/apache/lucene/index/TestDoc.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestDoc.java	Sun Jun 26 14:21:07 2011 -0400
@@ -234,7 +234,7 @@
           out.print("  term=" + field + ":" + tis.term());
           out.println("    DF=" + tis.docFreq());
 
-          DocsAndPositionsEnum positions = tis.docsAndPositions(reader.getDeletedDocs(), null);
+          DocsAndPositionsEnum positions = tis.docsAndPositions(reader.getNotDeletedDocs(), null);
 
           while (positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
             out.print(" doc=" + positions.docID());
Index: lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java
--- lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestDocsAndPositions.java	Sun Jun 26 14:21:07 2011 -0400
@@ -89,17 +89,17 @@
   }
 
   public DocsAndPositionsEnum getDocsAndPositions(IndexReader reader,
-      BytesRef bytes, Bits skipDocs) throws IOException {
+      BytesRef bytes, Bits keepDocs) throws IOException {
       return reader.termPositionsEnum(null, fieldName, bytes);
   }
 
   public DocsEnum getDocsEnum(IndexReader reader, BytesRef bytes,
-      boolean freqs, Bits skipDocs) throws IOException {
+      boolean freqs, Bits keepDocs) throws IOException {
     int randInt = random.nextInt(10);
     if (randInt == 0) { // once in a while throw in a positions enum
-      return getDocsAndPositions(reader, bytes, skipDocs);
+      return getDocsAndPositions(reader, bytes, keepDocs);
     } else {
-      return reader.termDocsEnum(skipDocs, fieldName, bytes);
+      return reader.termDocsEnum(keepDocs, fieldName, bytes);
     } 
   }
 
Index: lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
--- lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -131,7 +131,7 @@
     writer.close();
     SegmentReader reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
 
-    DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getDeletedDocs(reader),
+    DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getNotDeletedDocs(reader),
                                                                           "repeated", new BytesRef("repeated"));
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
     int freq = termPositions.freq();
@@ -195,7 +195,7 @@
     writer.close();
     SegmentReader reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
 
-    DocsAndPositionsEnum termPositions = reader.fields().terms("f1").docsAndPositions(reader.getDeletedDocs(), new BytesRef("a"), null);
+    DocsAndPositionsEnum termPositions = reader.fields().terms("f1").docsAndPositions(reader.getNotDeletedDocs(), new BytesRef("a"), null);
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
     int freq = termPositions.freq();
     assertEquals(3, freq);
@@ -239,18 +239,18 @@
     writer.close();
     SegmentReader reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
 
-    DocsAndPositionsEnum termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getDeletedDocs(), new BytesRef("term1"), null);
+    DocsAndPositionsEnum termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getNotDeletedDocs(), new BytesRef("term1"), null);
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
     assertEquals(1, termPositions.freq());
     assertEquals(0, termPositions.nextPosition());
 
-    termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getDeletedDocs(), new BytesRef("term2"), null);
+    termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getNotDeletedDocs(), new BytesRef("term2"), null);
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
     assertEquals(2, termPositions.freq());
     assertEquals(1, termPositions.nextPosition());
     assertEquals(3, termPositions.nextPosition());
     
-    termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getDeletedDocs(), new BytesRef("term3"), null);
+    termPositions = reader.fields().terms("preanalyzed").docsAndPositions(reader.getNotDeletedDocs(), new BytesRef("term3"), null);
     assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
     assertEquals(1, termPositions.freq());
     assertEquals(2, termPositions.nextPosition());
Index: lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
--- lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -87,8 +87,8 @@
       }
 
       @Override
-      public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse) throws IOException {
-        return new TestPositions(super.docsAndPositions(skipDocs, reuse == null ? null : ((FilterDocsAndPositionsEnum) reuse).in));
+      public DocsAndPositionsEnum docsAndPositions(Bits keepDocs, DocsAndPositionsEnum reuse) throws IOException {
+        return new TestPositions(super.docsAndPositions(keepDocs, reuse == null ? null : ((FilterDocsAndPositionsEnum) reuse).in));
       }
     }
 
@@ -157,7 +157,7 @@
     
     assertEquals(TermsEnum.SeekStatus.FOUND, terms.seekCeil(new BytesRef("one")));
     
-    DocsAndPositionsEnum positions = terms.docsAndPositions(MultiFields.getDeletedDocs(reader),
+    DocsAndPositionsEnum positions = terms.docsAndPositions(MultiFields.getNotDeletedDocs(reader),
                                                             null);
     while (positions.nextDoc() != DocsEnum.NO_MORE_DOCS) {
       assertTrue((positions.docID() % 2) == 1);
Index: lucene/src/test/org/apache/lucene/index/TestIndexReader.java
--- lucene/src/test/org/apache/lucene/index/TestIndexReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -310,7 +310,7 @@
                                      int expected)
     throws IOException {
         DocsEnum tdocs = MultiFields.getTermDocsEnum(reader,
-                                                     MultiFields.getDeletedDocs(reader),
+                                                     MultiFields.getNotDeletedDocs(reader),
                                                      term.field(),
                                                      new BytesRef(term.text()));
         int count = 0;
@@ -849,17 +849,17 @@
       }
       
       // check deletions
-      final Bits delDocs1 = MultiFields.getDeletedDocs(index1);
-      final Bits delDocs2 = MultiFields.getDeletedDocs(index2);
+      final Bits notDelDocs1 = MultiFields.getNotDeletedDocs(index1);
+      final Bits notDelDocs2 = MultiFields.getNotDeletedDocs(index2);
       for (int i = 0; i < index1.maxDoc(); i++) {
         assertEquals("Doc " + i + " only deleted in one index.",
-                     delDocs1 == null || delDocs1.get(i),
-                     delDocs2 == null || delDocs2.get(i));
+                     notDelDocs1 == null || !notDelDocs1.get(i),
+                     notDelDocs2 == null || !notDelDocs2.get(i));
       }
       
       // check stored fields
       for (int i = 0; i < index1.maxDoc(); i++) {
-        if (delDocs1 == null || !delDocs1.get(i)) {
+        if (notDelDocs1 == null || notDelDocs1.get(i)) {
           Document doc1 = index1.document(i);
           Document doc2 = index2.document(i);
           List<Fieldable> fieldable1 = doc1.getFields();
@@ -880,15 +880,15 @@
       FieldsEnum fenum1 = MultiFields.getFields(index1).iterator();
       FieldsEnum fenum2 = MultiFields.getFields(index1).iterator();
       String field1 = null;
-      Bits delDocs = MultiFields.getDeletedDocs(index1);
+      Bits notDelDocs = MultiFields.getNotDeletedDocs(index1);
       while((field1=fenum1.next()) != null) {
         assertEquals("Different fields", field1, fenum2.next());
         TermsEnum enum1 = fenum1.terms();
         TermsEnum enum2 = fenum2.terms();
         while(enum1.next() != null) {
           assertEquals("Different terms", enum1.term(), enum2.next());
-          DocsAndPositionsEnum tp1 = enum1.docsAndPositions(delDocs, null);
-          DocsAndPositionsEnum tp2 = enum2.docsAndPositions(delDocs, null);
+          DocsAndPositionsEnum tp1 = enum1.docsAndPositions(notDelDocs, null);
+          DocsAndPositionsEnum tp2 = enum2.docsAndPositions(notDelDocs, null);
 
           while(tp1.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
             assertTrue(tp2.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
Index: lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
--- lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java	Sun Jun 26 14:21:07 2011 -0400
@@ -282,9 +282,9 @@
     assertTrue(sim.decodeNormValue(MultiNorms.norms(r1, "field1")[4]) == norm1);
     assertTrue(sim.decodeNormValue(MultiNorms.norms(pr1Clone, "field1")[4]) != norm1);
 
-    final Bits delDocs = MultiFields.getDeletedDocs(r1);
-    assertTrue(delDocs == null || !delDocs.get(10));
-    assertTrue(MultiFields.getDeletedDocs(pr1Clone).get(10));
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(r1);
+    assertTrue(notDelDocs == null || notDelDocs.get(10));
+    assertFalse(MultiFields.getNotDeletedDocs(pr1Clone).get(10));
 
     // try to update the original reader, which should throw an exception
     try {
@@ -374,10 +374,10 @@
     assertTrue(origSegmentReader.deletedDocs != clonedSegmentReader.deletedDocs);
 
     assertDocDeleted(origSegmentReader, clonedSegmentReader, 1);
-    final Bits delDocs = origSegmentReader.getDeletedDocs();
-    assertTrue(delDocs == null || !delDocs.get(2)); // doc 2 should not be deleted
+    final Bits notDelDocs = origSegmentReader.getNotDeletedDocs();
+    assertTrue(notDelDocs == null || notDelDocs.get(2)); // doc 2 should not be deleted
                                                   // in original segmentreader
-    assertTrue(clonedSegmentReader.getDeletedDocs().get(2)); // doc 2 should be deleted in
+    assertFalse(clonedSegmentReader.getNotDeletedDocs().get(2)); // doc 2 should be deleted in
                                                   // cloned segmentreader
 
     // deleting a doc from the original segmentreader should throw an exception
@@ -419,7 +419,7 @@
     clonedReader.close();
 
     IndexReader r = IndexReader.open(dir1, false);
-    assertTrue(MultiFields.getDeletedDocs(r).get(1));
+    assertFalse(MultiFields.getNotDeletedDocs(r).get(1));
     r.close();
     dir1.close();
   }
@@ -448,7 +448,7 @@
 
   private void assertDocDeleted(SegmentReader reader, SegmentReader reader2,
       int doc) {
-    assertEquals(reader.getDeletedDocs().get(doc), reader2.getDeletedDocs().get(doc));
+    assertEquals(reader.getNotDeletedDocs().get(doc), reader2.getNotDeletedDocs().get(doc));
   }
 
   private void assertDelDocsRefCountEquals(int refCount, SegmentReader reader) {
Index: lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java
--- lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexReaderDelete.java	Sun Jun 26 14:21:07 2011 -0400
@@ -285,17 +285,17 @@
     IndexReader r = new SlowMultiReaderWrapper(w.getReader());
     w.close();
 
-    assertNull(r.getDeletedDocs());
+    assertNull(r.getNotDeletedDocs());
     r.close();
 
     r = new SlowMultiReaderWrapper(IndexReader.open(dir, false));
 
-    assertNull(r.getDeletedDocs());
+    assertNull(r.getNotDeletedDocs());
     assertEquals(1, r.deleteDocuments(new Term("f", "doctor")));
-    assertNotNull(r.getDeletedDocs());
-    assertTrue(r.getDeletedDocs().get(0));
+    assertNotNull(r.getNotDeletedDocs());
+    assertFalse(r.getNotDeletedDocs().get(0));
     assertEquals(1, r.deleteDocuments(new Term("f", "who")));
-    assertTrue(r.getDeletedDocs().get(1));
+    assertFalse(r.getNotDeletedDocs().get(1));
     r.close();
     dir.close();
   }
Index: lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
--- lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java	Sun Jun 26 14:21:07 2011 -0400
@@ -1120,8 +1120,8 @@
     r2.deleteDocument(0);
 
     // r1 should not see the delete
-    final Bits r1DelDocs = MultiFields.getDeletedDocs(r1);
-    assertFalse(r1DelDocs != null && r1DelDocs.get(0));
+    final Bits r1AcceptDocs = MultiFields.getNotDeletedDocs(r1);
+    assertFalse(r1AcceptDocs != null && !r1AcceptDocs.get(0));
 
     // Now r2 should have made a private copy of deleted docs:
     assertTrue(sr1.deletedDocs!=sr2.deletedDocs);
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
--- lucene/src/test/org/apache/lucene/index/TestIndexWriter.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexWriter.java	Sun Jun 26 14:21:07 2011 -0400
@@ -536,7 +536,7 @@
       Term t = new Term("field", "a");
       assertEquals(1, reader.docFreq(t));
       DocsEnum td = MultiFields.getTermDocsEnum(reader,
-                                                MultiFields.getDeletedDocs(reader),
+                                                MultiFields.getNotDeletedDocs(reader),
                                                 "field",
                                                 new BytesRef("a"));
       td.nextDoc();
@@ -947,7 +947,7 @@
     assertEquals(1, hits.length);
 
     DocsAndPositionsEnum tps = MultiFields.getTermPositionsEnum(s.getIndexReader(),
-                                                                MultiFields.getDeletedDocs(s.getIndexReader()),
+                                                                MultiFields.getNotDeletedDocs(s.getIndexReader()),
                                                                 "field",
                                                                 new BytesRef("a"));
 
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
--- lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java	Sun Jun 26 14:21:07 2011 -0400
@@ -484,7 +484,7 @@
     // Make sure the doc that hit the exception was marked
     // as deleted:
     DocsEnum tdocs = MultiFields.getTermDocsEnum(reader,
-                                              MultiFields.getDeletedDocs(reader),
+                                              MultiFields.getNotDeletedDocs(reader),
                                               t.field(),
                                               new BytesRef(t.text()));
 
@@ -624,10 +624,10 @@
         assertEquals(expected, reader.docFreq(new Term("contents", "here")));
         assertEquals(expected, reader.maxDoc());
         int numDel = 0;
-        final Bits delDocs = MultiFields.getDeletedDocs(reader);
-        assertNotNull(delDocs);
+        final Bits acceptDocs = MultiFields.getNotDeletedDocs(reader);
+        assertNotNull(acceptDocs);
         for(int j=0;j<reader.maxDoc();j++) {
-          if (delDocs.get(j))
+          if (!acceptDocs.get(j))
             numDel++;
           else {
             reader.document(j);
@@ -653,7 +653,7 @@
       assertEquals(expected, reader.docFreq(new Term("contents", "here")));
       assertEquals(expected, reader.maxDoc());
       int numDel = 0;
-      assertNull(MultiFields.getDeletedDocs(reader));
+      assertNull(MultiFields.getNotDeletedDocs(reader));
       for(int j=0;j<reader.maxDoc();j++) {
         reader.document(j);
         reader.getTermFreqVectors(j);
@@ -743,10 +743,10 @@
       assertEquals("i=" + i, expected, reader.docFreq(new Term("contents", "here")));
       assertEquals(expected, reader.maxDoc());
       int numDel = 0;
-      final Bits delDocs = MultiFields.getDeletedDocs(reader);
-      assertNotNull(delDocs);
+      final Bits acceptDocs = MultiFields.getNotDeletedDocs(reader);
+      assertNotNull(acceptDocs);
       for(int j=0;j<reader.maxDoc();j++) {
-        if (delDocs.get(j))
+        if (!acceptDocs.get(j))
           numDel++;
         else {
           reader.document(j);
@@ -771,7 +771,7 @@
       expected += 17-NUM_THREAD*NUM_ITER;
       assertEquals(expected, reader.docFreq(new Term("contents", "here")));
       assertEquals(expected, reader.maxDoc());
-      assertNull(MultiFields.getDeletedDocs(reader));
+      assertNull(MultiFields.getNotDeletedDocs(reader));
       for(int j=0;j<reader.maxDoc();j++) {
         reader.document(j);
         reader.getTermFreqVectors(j);
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
--- lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -51,7 +51,7 @@
   public static int count(Term t, IndexReader r) throws IOException {
     int count = 0;
     DocsEnum td = MultiFields.getTermDocsEnum(r,
-                                              MultiFields.getDeletedDocs(r),
+                                              MultiFields.getNotDeletedDocs(r),
                                               t.field(), new BytesRef(t.text()));
 
     if (td != null) {
Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
--- lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java	Sun Jun 26 14:21:07 2011 -0400
@@ -201,7 +201,7 @@
       // Quick test to make sure index is not corrupt:
       IndexReader reader = IndexReader.open(dir, true);
       DocsEnum tdocs = MultiFields.getTermDocsEnum(reader,
-                                                  MultiFields.getDeletedDocs(reader),
+                                                  MultiFields.getNotDeletedDocs(reader),
                                                   "field",
                                                   new BytesRef("aaa"));
       int count = 0;
@@ -266,7 +266,7 @@
 
       if (success) {
         IndexReader reader = IndexReader.open(dir, true);
-        final Bits delDocs = MultiFields.getDeletedDocs(reader);
+        final Bits delDocs = MultiFields.getNotDeletedDocs(reader);
         for(int j=0;j<reader.maxDoc();j++) {
           if (delDocs == null || !delDocs.get(j)) {
             reader.document(j);
Index: lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
--- lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java	Sun Jun 26 14:21:07 2011 -0400
@@ -155,7 +155,7 @@
         IndexReader reader = IndexReader.open(directory, true);
 
         DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader,
-                                                                   MultiFields.getDeletedDocs(reader),
+                                                                   MultiFields.getNotDeletedDocs(reader),
                                                                    this.field,
                                                                    new BytesRef("b"));
 
@@ -166,7 +166,7 @@
         }
 
         tp = MultiFields.getTermPositionsEnum(reader,
-                                              MultiFields.getDeletedDocs(reader),
+                                              MultiFields.getNotDeletedDocs(reader),
                                               this.field,
                                               new BytesRef("a"));
 
Index: lucene/src/test/org/apache/lucene/index/TestMultiFields.java
--- lucene/src/test/org/apache/lucene/index/TestMultiFields.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestMultiFields.java	Sun Jun 26 14:21:07 2011 -0400
@@ -90,9 +90,9 @@
       w.close();
       //System.out.println("TEST reader=" + reader);
 
-      Bits delDocs = MultiFields.getDeletedDocs(reader);
+      Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
       for(int delDoc : deleted) {
-        assertTrue(delDocs.get(delDoc));
+        assertFalse(notDelDocs.get(delDoc));
       }
       Terms terms2 = MultiFields.getTerms(reader, "field");
 
@@ -102,7 +102,7 @@
           System.out.println("TEST: seek to term= "+ UnicodeUtil.toHexString(term.utf8ToString()));
         }
         
-        DocsEnum docsEnum = terms2.docs(delDocs, term, null);
+        DocsEnum docsEnum = terms2.docs(notDelDocs, term, null);
         assertNotNull(docsEnum);
 
         for(int docID : docs.get(term)) {
@@ -121,7 +121,7 @@
   /*
   private void verify(IndexReader r, String term, List<Integer> expected) throws Exception {
     DocsEnum docs = MultiFields.getTermDocsEnum(r,
-                                                MultiFields.getDeletedDocs(r),
+                                                MultiFields.getNotDeletedDocs(r),
                                                 "field",
                                                 new BytesRef(term));
 
Index: lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
--- lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java	Sun Jun 26 14:21:07 2011 -0400
@@ -86,7 +86,7 @@
     
     for (int i = 0; i < 2; i++) {
       counter = 0;
-      DocsAndPositionsEnum tp = reader.termPositionsEnum(reader.getDeletedDocs(),
+      DocsAndPositionsEnum tp = reader.termPositionsEnum(reader.getNotDeletedDocs(),
                                                          term.field(),
                                                          new BytesRef(term.text()));
 
Index: lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
--- lucene/src/test/org/apache/lucene/index/TestNRTThreads.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestNRTThreads.java	Sun Jun 26 14:21:07 2011 -0400
@@ -129,11 +129,11 @@
           System.out.println("TEST: now warm merged reader=" + reader);
         }
         final int maxDoc = reader.maxDoc();
-        final Bits delDocs = reader.getDeletedDocs();
+        final Bits notDelDocs = reader.getNotDeletedDocs();
         int sum = 0;
         final int inc = Math.max(1, maxDoc/50);
         for(int docID=0;docID<maxDoc;docID += inc) {
-          if (delDocs == null || !delDocs.get(docID)) {
+          if (notDelDocs == null || notDelDocs.get(docID)) {
             final Document doc = reader.document(docID);
             sum += doc.getFields().size();
           }
Index: lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
--- lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java	Sun Jun 26 14:21:07 2011 -0400
@@ -80,7 +80,7 @@
         pr.add(ir1);
         pr.add(ir2);
 
-        Bits delDocs = pr.getDeletedDocs();
+        Bits notDelDocs = pr.getNotDeletedDocs();
 
         FieldsEnum fe = pr.fields().iterator();
 
@@ -92,31 +92,31 @@
         TermsEnum te = fe.terms();
 
         assertEquals("brown", te.next().utf8ToString());
-        DocsEnum td = te.docs(delDocs, null);
+        DocsEnum td = te.docs(notDelDocs, null);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("fox", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("jumps", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("quick", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("the", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
@@ -127,31 +127,31 @@
         te = fe.terms();
 
         assertEquals("brown", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("fox", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("jumps", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("quick", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("the", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
@@ -162,37 +162,37 @@
         te = fe.terms();
 
         assertEquals("dog", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("fox", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("jumps", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("lazy", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("over", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
 
         assertEquals("the", te.next().utf8ToString());
-        td = te.docs(delDocs, td);
+        td = te.docs(notDelDocs, td);
         assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
         assertEquals(0, td.docID());
         assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
Index: lucene/src/test/org/apache/lucene/index/TestPayloads.java
--- lucene/src/test/org/apache/lucene/index/TestPayloads.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestPayloads.java	Sun Jun 26 14:21:07 2011 -0400
@@ -223,7 +223,7 @@
         DocsAndPositionsEnum[] tps = new DocsAndPositionsEnum[numTerms];
         for (int i = 0; i < numTerms; i++) {
           tps[i] = MultiFields.getTermPositionsEnum(reader,
-                                                    MultiFields.getDeletedDocs(reader),
+                                                    MultiFields.getNotDeletedDocs(reader),
                                                     terms[i].field(),
                                                     new BytesRef(terms[i].text()));
         }
@@ -252,7 +252,7 @@
          *  test lazy skipping
          */        
         DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader,
-                                                                   MultiFields.getDeletedDocs(reader),
+                                                                   MultiFields.getNotDeletedDocs(reader),
                                                                    terms[0].field(),
                                                                    new BytesRef(terms[0].text()));
         tp.nextDoc();
@@ -280,7 +280,7 @@
          * Test different lengths at skip points
          */
         tp = MultiFields.getTermPositionsEnum(reader,
-                                              MultiFields.getDeletedDocs(reader),
+                                              MultiFields.getNotDeletedDocs(reader),
                                               terms[1].field(),
                                               new BytesRef(terms[1].text()));
         tp.nextDoc();
@@ -323,7 +323,7 @@
         
         reader = IndexReader.open(dir, true);
         tp = MultiFields.getTermPositionsEnum(reader,
-                                              MultiFields.getDeletedDocs(reader),
+                                              MultiFields.getNotDeletedDocs(reader),
                                               fieldName,
                                               new BytesRef(singleTerm));
         tp.nextDoc();
@@ -508,11 +508,11 @@
         writer.close();
         IndexReader reader = IndexReader.open(dir, true);
         TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator();
-        Bits delDocs = MultiFields.getDeletedDocs(reader);
+        Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
         DocsAndPositionsEnum tp = null;
         while (terms.next() != null) {
           String termText = terms.term().utf8ToString();
-          tp = terms.docsAndPositions(delDocs, tp);
+          tp = terms.docsAndPositions(notDelDocs, tp);
           while(tp.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
             int freq = tp.freq();
             for (int i = 0; i < freq; i++) {
Index: lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
--- lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java	Sun Jun 26 14:21:07 2011 -0400
@@ -147,7 +147,7 @@
 
     IndexReader r = writer.getReader();
     IndexReader r1 = r.getSequentialSubReaders()[0];
-    printDelDocs(r1.getDeletedDocs());
+    printDelDocs(r1.getNotDeletedDocs());
     int[] docs = toDocsArray(id3, null, r);
     System.out.println("id3 docs:"+Arrays.toString(docs));
     // there shouldn't be any docs for id:3
Index: lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
--- lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java	Sun Jun 26 14:21:07 2011 -0400
@@ -98,7 +98,7 @@
     assertTrue(DocHelper.numFields(newDoc2) == DocHelper.numFields(doc2) - DocHelper.unstored.size());
 
     DocsEnum termDocs = MultiFields.getTermDocsEnum(mergedReader,
-                                                    MultiFields.getDeletedDocs(mergedReader),
+                                                    MultiFields.getNotDeletedDocs(mergedReader),
                                                     DocHelper.TEXT_FIELD_2_KEY,
                                                     new BytesRef("field"));
     assertTrue(termDocs != null);
Index: lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
--- lucene/src/test/org/apache/lucene/index/TestSegmentReader.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestSegmentReader.java	Sun Jun 26 14:21:07 2011 -0400
@@ -81,7 +81,7 @@
     assertTrue(deleteReader != null);
     assertTrue(deleteReader.numDocs() == 1);
     deleteReader.deleteDocument(0);
-    assertTrue(deleteReader.getDeletedDocs().get(0));
+    assertFalse(deleteReader.getNotDeletedDocs().get(0));
     assertTrue(deleteReader.hasDeletions() == true);
     assertTrue(deleteReader.numDocs() == 0);
     deleteReader.close();
@@ -131,13 +131,13 @@
     }
     
     DocsEnum termDocs = MultiFields.getTermDocsEnum(reader,
-                                                    MultiFields.getDeletedDocs(reader),
+                                                    MultiFields.getNotDeletedDocs(reader),
                                                     DocHelper.TEXT_FIELD_1_KEY,
                                                     new BytesRef("field"));
     assertTrue(termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
 
     termDocs = MultiFields.getTermDocsEnum(reader,
-                                           MultiFields.getDeletedDocs(reader),
+                                           MultiFields.getNotDeletedDocs(reader),
                                            DocHelper.NO_NORMS_KEY,
                                            new BytesRef(DocHelper.NO_NORMS_TEXT));
 
@@ -145,7 +145,7 @@
 
     
     DocsAndPositionsEnum positions = MultiFields.getTermPositionsEnum(reader,
-                                                                      MultiFields.getDeletedDocs(reader),
+                                                                      MultiFields.getNotDeletedDocs(reader),
                                                                       DocHelper.TEXT_FIELD_1_KEY,
                                                                       new BytesRef("field"));
     // NOTE: prior rev of this test was failing to first
Index: lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
--- lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java	Sun Jun 26 14:21:07 2011 -0400
@@ -61,7 +61,7 @@
 
     TermsEnum terms = reader.fields().terms(DocHelper.TEXT_FIELD_2_KEY).iterator();
     terms.seekCeil(new BytesRef("field"));
-    DocsEnum termDocs = terms.docs(reader.getDeletedDocs(), null);
+    DocsEnum termDocs = terms.docs(reader.getNotDeletedDocs(), null);
     if (termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS)    {
       int docId = termDocs.docID();
       assertTrue(docId == 0);
@@ -80,7 +80,7 @@
       //After adding the document, we should be able to read it back in
       SegmentReader reader = SegmentReader.get(true, info, indexDivisor);
       assertTrue(reader != null);
-      DocsEnum termDocs = reader.termDocsEnum(reader.getDeletedDocs(),
+      DocsEnum termDocs = reader.termDocsEnum(reader.getNotDeletedDocs(),
                                               "textField2",
                                               new BytesRef("bad"));
 
@@ -91,7 +91,7 @@
       //After adding the document, we should be able to read it back in
       SegmentReader reader = SegmentReader.get(true, info, indexDivisor);
       assertTrue(reader != null);
-      DocsEnum termDocs = reader.termDocsEnum(reader.getDeletedDocs(),
+      DocsEnum termDocs = reader.termDocsEnum(reader.getNotDeletedDocs(),
                                               "junk",
                                               new BytesRef("bad"));
       assertNull(termDocs);
@@ -126,7 +126,7 @@
     IndexReader reader = IndexReader.open(dir, null, true, indexDivisor);
 
     DocsEnum tdocs = MultiFields.getTermDocsEnum(reader,
-                                                 MultiFields.getDeletedDocs(reader),
+                                                 MultiFields.getNotDeletedDocs(reader),
                                                  ta.field(),
                                                  new BytesRef(ta.text()));
     
@@ -149,7 +149,7 @@
     
     // without next
     tdocs = MultiFields.getTermDocsEnum(reader,
-                                        MultiFields.getDeletedDocs(reader),
+                                        MultiFields.getNotDeletedDocs(reader),
                                         ta.field(),
                                         new BytesRef(ta.text()));
     
@@ -165,7 +165,7 @@
     
     // with next
     tdocs = MultiFields.getTermDocsEnum(reader,
-                                        MultiFields.getDeletedDocs(reader),
+                                        MultiFields.getNotDeletedDocs(reader),
                                         tb.field(),
                                         new BytesRef(tb.text()));
 
@@ -187,7 +187,7 @@
     
     // without next
     tdocs = MultiFields.getTermDocsEnum(reader,
-                                        MultiFields.getDeletedDocs(reader),
+                                        MultiFields.getNotDeletedDocs(reader),
                                         tb.field(),
                                         new BytesRef(tb.text()));
     
@@ -205,7 +205,7 @@
     
     // with next
     tdocs = MultiFields.getTermDocsEnum(reader,
-                                        MultiFields.getDeletedDocs(reader),
+                                        MultiFields.getNotDeletedDocs(reader),
                                         tc.field(),
                                         new BytesRef(tc.text()));
 
@@ -229,7 +229,7 @@
     
     //without next
     tdocs = MultiFields.getTermDocsEnum(reader,
-                                        MultiFields.getDeletedDocs(reader),
+                                        MultiFields.getNotDeletedDocs(reader),
                                         tc.field(),
                                         new BytesRef(tc.text()));
     assertTrue(tdocs.advance(5) != DocsEnum.NO_MORE_DOCS);
Index: lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
--- lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java	Sun Jun 26 14:21:07 2011 -0400
@@ -283,11 +283,11 @@
   private static void printDocs(IndexReader r) throws Throwable {
     IndexReader[] subs = r.getSequentialSubReaders();
     for(IndexReader sub : subs) {
-      Bits delDocs = sub.getDeletedDocs();
+      Bits notDeletedDocs = sub.getNotDeletedDocs();
       System.out.println("  " + ((SegmentReader) sub).getSegmentInfo());
       for(int docID=0;docID<sub.maxDoc();docID++) {
         Document doc = sub.document(docID);
-        if (delDocs == null || !delDocs.get(docID)) {
+        if (notDeletedDocs == null || notDeletedDocs.get(docID)) {
           System.out.println("    docID=" + docID + " id:" + doc.get("id"));
         } else {
           System.out.println("    DEL docID=" + docID + " id:" + doc.get("id"));
@@ -326,8 +326,8 @@
     }
     final TermsEnum termsEnum = terms1.iterator();
 
-    final Bits delDocs1 = MultiFields.getDeletedDocs(r1);
-    final Bits delDocs2 = MultiFields.getDeletedDocs(r2);
+    final Bits notDelDocs1 = MultiFields.getNotDeletedDocs(r1);
+    final Bits notDelDocs2 = MultiFields.getNotDeletedDocs(r2);
     
     Fields fields = MultiFields.getFields(r2);
     if (fields == null) {
@@ -335,7 +335,7 @@
       // deleted docs):
       DocsEnum docs = null;
       while(termsEnum.next() != null) {
-        docs = termsEnum.docs(delDocs1, docs);
+        docs = termsEnum.docs(notDelDocs1, docs);
         while(docs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
           fail("r1 is not empty but r2 is");
         }
@@ -354,8 +354,8 @@
         break;
       }
 
-      termDocs1 = termsEnum.docs(delDocs1, termDocs1);
-      termDocs2 = terms2.docs(delDocs2, term, termDocs2);
+      termDocs1 = termsEnum.docs(notDelDocs1, termDocs1);
+      termDocs2 = terms2.docs(notDelDocs2, term, termDocs2);
 
       if (termDocs1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
         // This doc is deleted and wasn't replaced
@@ -443,7 +443,7 @@
         }
         
         //System.out.println("TEST: term1=" + term1);
-        docs1 = termsEnum1.docs(delDocs1, docs1);
+        docs1 = termsEnum1.docs(notDelDocs1, docs1);
         while (docs1.nextDoc() != DocsEnum.NO_MORE_DOCS) {
           int d = docs1.docID();
           int f = docs1.freq();
@@ -473,7 +473,7 @@
         }
         
         //System.out.println("TEST: term1=" + term1);
-        docs2 = termsEnum2.docs(delDocs2, docs2);
+        docs2 = termsEnum2.docs(notDelDocs2, docs2);
         while (docs2.nextDoc() != DocsEnum.NO_MORE_DOCS) {
           int d = r2r1[docs2.docID()];
           int f = docs2.freq();
Index: lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
--- lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java	Sun Jun 26 14:21:07 2011 -0400
@@ -105,7 +105,7 @@
     DocsEnum tdocs = null;
     for (int i=0; i<iter; i++) {
       tenum.seekCeil(new BytesRef("val"));
-      tdocs = tenum.docs(MultiFields.getDeletedDocs(reader), tdocs);
+      tdocs = tenum.docs(MultiFields.getNotDeletedDocs(reader), tdocs);
       while (tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
         ret += tdocs.docID();
       }
Index: lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
--- lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java	Sun Jun 26 14:21:07 2011 -0400
@@ -90,9 +90,9 @@
 		
     //Perhaps not the most efficient approach but meets our
     //needs here.
-    final Bits delDocs = MultiFields.getDeletedDocs(r);
+    final Bits notDelDocs = MultiFields.getNotDeletedDocs(r);
     for (int i = 0; i < r.maxDoc(); i++) {
-      if(delDocs == null || !delDocs.get(i)) {
+      if (notDelDocs == null || notDelDocs.get(i)) {
         String sval=r.document(i).get(FIELD_RECORD_ID);
         if(sval!=null) {
           int val=Integer.parseInt(sval);
Index: lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
--- lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java	Sun Jun 26 14:21:07 2011 -0400
@@ -98,7 +98,7 @@
     IndexSearcher searcher = newSearcher(reader);
     
     DocsAndPositionsEnum pos = MultiFields.getTermPositionsEnum(searcher.getIndexReader(),
-                                                                MultiFields.getDeletedDocs(searcher.getIndexReader()),
+                                                                MultiFields.getNotDeletedDocs(searcher.getIndexReader()),
                                                                 "field",
                                                                 new BytesRef("1"));
     pos.nextDoc();
@@ -106,7 +106,7 @@
     assertEquals(0, pos.nextPosition());
     
     pos = MultiFields.getTermPositionsEnum(searcher.getIndexReader(),
-                                           MultiFields.getDeletedDocs(searcher.getIndexReader()),
+                                           MultiFields.getNotDeletedDocs(searcher.getIndexReader()),
                                            "field",
                                            new BytesRef("2"));
     pos.nextDoc();
@@ -246,9 +246,9 @@
     final IndexReader readerFromWriter = writer.getReader();
     SlowMultiReaderWrapper r = new SlowMultiReaderWrapper(readerFromWriter);
 
-    DocsAndPositionsEnum tp = r.termPositionsEnum(r.getDeletedDocs(),
-                                                     "content",
-                                                     new BytesRef("a"));
+    DocsAndPositionsEnum tp = r.termPositionsEnum(r.getNotDeletedDocs(),
+                                                  "content",
+                                                  new BytesRef("a"));
     
     int count = 0;
     assertTrue(tp.nextDoc() != DocsAndPositionsEnum.NO_MORE_DOCS);
Index: lucene/src/test/org/apache/lucene/search/TestTermVectors.java
--- lucene/src/test/org/apache/lucene/search/TestTermVectors.java	Sun Jun 26 11:29:28 2011 -0400
+++ lucene/src/test/org/apache/lucene/search/TestTermVectors.java	Sun Jun 26 14:21:07 2011 -0400
@@ -254,7 +254,7 @@
       TermsEnum terms = fields.terms();
       while(terms.next() != null) {
         String text = terms.term().utf8ToString();
-        docs = terms.docs(MultiFields.getDeletedDocs(knownSearcher.reader), docs);
+        docs = terms.docs(MultiFields.getNotDeletedDocs(knownSearcher.reader), docs);
         
         while (docs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
           int docId = docs.docID();
Index: modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
--- modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java	Sun Jun 26 11:29:28 2011 -0400
+++ modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java	Sun Jun 26 14:21:07 2011 -0400
@@ -281,7 +281,7 @@
     // Make sure position is still incremented when
     // massive term is skipped:
     DocsAndPositionsEnum tps = MultiFields.getTermPositionsEnum(reader,
-                                                                MultiFields.getDeletedDocs(reader),
+                                                                MultiFields.getNotDeletedDocs(reader),
                                                                 "content",
                                                                 new BytesRef("another"));
     assertTrue(tps.nextDoc() != DocsEnum.NO_MORE_DOCS);
Index: modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
--- modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java	Sun Jun 26 11:29:28 2011 -0400
+++ modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java	Sun Jun 26 14:21:07 2011 -0400
@@ -83,12 +83,12 @@
 
     IndexReader reader = IndexReader.open(dir, true);
     DocsEnum td = MultiFields.getTermDocsEnum(reader,
-                                              MultiFields.getDeletedDocs(reader),
+                                              MultiFields.getNotDeletedDocs(reader),
                                               "partnum",
                                               new BytesRef("Q36"));
     assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
     td = MultiFields.getTermDocsEnum(reader,
-                                     MultiFields.getDeletedDocs(reader),
+                                     MultiFields.getNotDeletedDocs(reader),
                                      "partnum",
                                      new BytesRef("Q37"));
     assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
Index: modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java
--- modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java	Sun Jun 26 11:29:28 2011 -0400
+++ modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java	Sun Jun 26 14:21:07 2011 -0400
@@ -74,15 +74,15 @@
     }
     while (numDeleted < numToDelete) {
       double delRate = ((double) (numToDelete-numDeleted))/r.numDocs();
-      Bits delDocs = MultiFields.getDeletedDocs(r);
+      Bits notDelDocs = MultiFields.getNotDeletedDocs(r);
       int doc = 0;
       while (doc < maxDoc && numDeleted < numToDelete) {
-        if ((delDocs == null || !delDocs.get(doc)) && random.nextDouble() <= delRate) {
+        if ((notDelDocs == null || notDelDocs.get(doc)) && random.nextDouble() <= delRate) {
           r.deleteDocument(doc);
           numDeleted++;
-          if (delDocs == null) {
-            delDocs = MultiFields.getDeletedDocs(r);
-            assert delDocs != null;
+          if (notDelDocs == null) {
+            notDelDocs = MultiFields.getNotDeletedDocs(r);
+            assert notDelDocs != null;
           }
         }
         doc++;
Index: modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
--- modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java	Sun Jun 26 11:29:28 2011 -0400
+++ modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java	Sun Jun 26 14:21:07 2011 -0400
@@ -96,9 +96,9 @@
     // optionally warm and add num docs traversed to count
     if (withWarm()) {
       Document doc = null;
-      Bits delDocs = MultiFields.getDeletedDocs(reader);
+      Bits notDelDocs = MultiFields.getNotDeletedDocs(reader);
       for (int m = 0; m < reader.maxDoc(); m++) {
-        if (null == delDocs || ! delDocs.get(m)) {
+        if (null == notDelDocs || notDelDocs.get(m)) {
           doc = reader.document(m);
           res += (doc == null ? 0 : 1);
         }
Index: modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
--- modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java	Sun Jun 26 11:29:28 2011 -0400
+++ modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java	Sun Jun 26 14:21:07 2011 -0400
@@ -487,7 +487,7 @@
       TermsEnum terms = fields.terms();
       DocsEnum docs = null;
       while(terms.next() != null) {
-        docs = terms.docs(MultiFields.getDeletedDocs(reader), docs);
+        docs = terms.docs(MultiFields.getNotDeletedDocs(reader), docs);
         while(docs.nextDoc() != docs.NO_MORE_DOCS) {
           totalTokenCount2 += docs.freq();
         }
Index: solr/src/java/org/apache/solr/request/SimpleFacets.java
--- solr/src/java/org/apache/solr/request/SimpleFacets.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/request/SimpleFacets.java	Sun Jun 26 14:21:07 2011 -0400
@@ -673,7 +673,7 @@
             if (deState==null) {
               deState = new SolrIndexSearcher.DocsEnumState();
               deState.fieldName = field;
-              deState.deletedDocs = MultiFields.getDeletedDocs(r);
+              deState.acceptedDocs = MultiFields.getNotDeletedDocs(r);
               deState.termsEnum = termsEnum;
               deState.docsEnum = docsEnum;
             }
Index: solr/src/java/org/apache/solr/schema/LatLonType.java
--- solr/src/java/org/apache/solr/schema/LatLonType.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/schema/LatLonType.java	Sun Jun 26 14:21:07 2011 -0400
@@ -389,7 +389,7 @@
     int doc=-1;
     final DocValues latVals;
     final DocValues lonVals;
-    final Bits delDocs;
+    final Bits acceptDocs;
 
 
     final double lonMin, lonMax, lon2Min, lon2Max, latMin, latMax;
@@ -411,7 +411,7 @@
       this.qWeight = w.getValue();
       this.reader = readerContext.reader;
       this.maxDoc = reader.maxDoc();
-      this.delDocs = reader.getDeletedDocs();
+      this.acceptDocs = reader.getNotDeletedDocs();
       latVals = latSource.getValues(weight.latContext, readerContext);
       lonVals = lonSource.getValues(weight.lonContext, readerContext);
 
@@ -489,7 +489,7 @@
         if (doc>=maxDoc) {
           return doc=NO_MORE_DOCS;
         }
-        if (delDocs != null && delDocs.get(doc)) continue;
+        if (acceptDocs != null && !acceptDocs.get(doc)) continue;
         if (!match()) continue;
         return doc;
       }
Index: solr/src/java/org/apache/solr/search/JoinQParserPlugin.java
--- solr/src/java/org/apache/solr/search/JoinQParserPlugin.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/search/JoinQParserPlugin.java	Sun Jun 26 14:21:07 2011 -0400
@@ -285,19 +285,19 @@
         }
       }
 
-      Bits fromDeletedDocs = MultiFields.getDeletedDocs(fromSearcher.getIndexReader());
-      Bits toDeletedDocs = fromSearcher == toSearcher ? fromDeletedDocs : MultiFields.getDeletedDocs(toSearcher.getIndexReader());
+      Bits fromAcceptDocs = MultiFields.getNotDeletedDocs(fromSearcher.getIndexReader());
+      Bits toAcceptDocs = fromSearcher == toSearcher ? fromAcceptDocs : MultiFields.getNotDeletedDocs(toSearcher.getIndexReader());
 
       fromDeState = new SolrIndexSearcher.DocsEnumState();
       fromDeState.fieldName = fromField;
-      fromDeState.deletedDocs = fromDeletedDocs;
+      fromDeState.acceptedDocs = fromAcceptDocs;
       fromDeState.termsEnum = termsEnum;
       fromDeState.docsEnum = null;
       fromDeState.minSetSizeCached = minDocFreqFrom;
 
       toDeState = new SolrIndexSearcher.DocsEnumState();
       toDeState.fieldName = toField;
-      toDeState.deletedDocs = toDeletedDocs;
+      toDeState.acceptedDocs = toAcceptDocs;
       toDeState.termsEnum = toTermsEnum;
       toDeState.docsEnum = null;
       toDeState.minSetSizeCached = minDocFreqTo;
@@ -314,7 +314,7 @@
 
         if (freq < minDocFreqFrom) {
           fromTermDirectCount++;
-          // OK to skip deletedDocs, since we check for intersection with docs matching query
+          // OK to skip acceptedDocs, since we check for intersection with docs matching query
           fromDeState.docsEnum = fromDeState.termsEnum.docs(null, fromDeState.docsEnum);
           DocsEnum docsEnum = fromDeState.docsEnum;
 
@@ -393,8 +393,8 @@
             } else {
               toTermDirectCount++;
 
-              // need to use deletedDocs here so we don't map to any deleted ones
-              toDeState.docsEnum = toDeState.termsEnum.docs(toDeState.deletedDocs, toDeState.docsEnum);
+              // need to use acceptedDocs here so we don't map to any deleted ones
+              toDeState.docsEnum = toDeState.termsEnum.docs(toDeState.acceptedDocs, toDeState.docsEnum);
               DocsEnum docsEnum = toDeState.docsEnum;              
 
               if (docsEnum instanceof MultiDocsEnum) {
Index: solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
--- solr/src/java/org/apache/solr/search/SolrIndexSearcher.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/search/SolrIndexSearcher.java	Sun Jun 26 14:21:07 2011 -0400
@@ -493,7 +493,7 @@
     Terms terms = fields.terms(t.field());
     if (terms == null) return -1;
     BytesRef termBytes = t.bytes();
-    DocsEnum docs = terms.docs(MultiFields.getDeletedDocs(reader), termBytes, null);
+    DocsEnum docs = terms.docs(MultiFields.getNotDeletedDocs(reader), termBytes, null);
     if (docs == null) return -1;
     int id = docs.nextDoc();
     return id == DocIdSetIterator.NO_MORE_DOCS ? -1 : id;
@@ -730,7 +730,7 @@
     int bitsSet = 0;
     OpenBitSet obs = null;
 
-    DocsEnum docsEnum = deState.termsEnum.docs(deState.deletedDocs, deState.docsEnum);
+    DocsEnum docsEnum = deState.termsEnum.docs(deState.acceptedDocs, deState.docsEnum);
     if (deState.docsEnum == null) {
       deState.docsEnum = docsEnum;
     }
@@ -819,8 +819,8 @@
           Terms terms = fields.terms(t.field());
           BytesRef termBytes = t.bytes();
           
-          Bits skipDocs = reader.getDeletedDocs();
-          DocsEnum docsEnum = terms==null ? null : terms.docs(skipDocs, termBytes, null);
+          Bits acceptDocs = reader.getNotDeletedDocs();
+          DocsEnum docsEnum = terms==null ? null : terms.docs(acceptDocs, termBytes, null);
 
           if (docsEnum != null) {
             DocsEnum.BulkReadResult readResult = docsEnum.getBulkResult();
@@ -1617,7 +1617,7 @@
   public static class DocsEnumState {
     public String fieldName;  // currently interned for as long as lucene requires it
     public TermsEnum termsEnum;
-    public Bits deletedDocs;
+    public Bits acceptedDocs;
     public DocsEnum docsEnum;
 
     public int minSetSizeCached;
Index: solr/src/java/org/apache/solr/search/function/FileFloatSource.java
--- solr/src/java/org/apache/solr/search/function/FileFloatSource.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/search/function/FileFloatSource.java	Sun Jun 26 14:21:07 2011 -0400
@@ -243,7 +243,7 @@
       DocsEnum docsEnum = null;
 
       // removing deleted docs shouldn't matter
-      // final Bits delDocs = MultiFields.getDeletedDocs(reader);
+      // final Bits acceptDocs = MultiFields.getNotDeletedDocs(reader);
 
       for (String line; (line=r.readLine())!=null;) {
         int delimIndex = line.indexOf(delimiter);
Index: solr/src/java/org/apache/solr/search/function/FunctionQuery.java
--- solr/src/java/org/apache/solr/search/function/FunctionQuery.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/search/function/FunctionQuery.java	Sun Jun 26 14:21:07 2011 -0400
@@ -112,7 +112,7 @@
     int doc=-1;
     final DocValues vals;
     final boolean hasDeletions;
-    final Bits delDocs;
+    final Bits acceptDocs;
 
     public AllScorer(AtomicReaderContext context, FunctionWeight w) throws IOException {
       super(w);
@@ -121,8 +121,8 @@
       this.reader = context.reader;
       this.maxDoc = reader.maxDoc();
       this.hasDeletions = reader.hasDeletions();
-      this.delDocs = MultiFields.getDeletedDocs(reader);
-      assert !hasDeletions || delDocs != null;
+      this.acceptDocs = MultiFields.getNotDeletedDocs(reader);
+      assert !hasDeletions || acceptDocs != null;
       vals = func.getValues(weight.context, context);
     }
 
@@ -142,7 +142,7 @@
         if (doc>=maxDoc) {
           return doc=NO_MORE_DOCS;
         }
-        if (hasDeletions && delDocs.get(doc)) continue;
+        if (hasDeletions && !acceptDocs.get(doc)) continue;
         return doc;
       }
     }
Index: solr/src/java/org/apache/solr/search/function/ValueSource.java
--- solr/src/java/org/apache/solr/search/function/ValueSource.java	Sun Jun 26 11:29:28 2011 -0400
+++ solr/src/java/org/apache/solr/search/function/ValueSource.java	Sun Jun 26 14:21:07 2011 -0400
@@ -199,7 +199,7 @@
   protected final int maxDoc;
   protected final DocValues values;
   protected boolean checkDeletes;
-  private final Bits delDocs;
+  private final Bits acceptDocs;
 
   protected ValueSourceScorer(IndexReader reader, DocValues values) {
     super(null);
@@ -207,7 +207,7 @@
     this.maxDoc = reader.maxDoc();
     this.values = values;
     setCheckDeletes(true);
-    this.delDocs = MultiFields.getDeletedDocs(reader);
+    this.acceptDocs = MultiFields.getNotDeletedDocs(reader);
   }
 
   public IndexReader getReader() {
@@ -219,7 +219,7 @@
   }
 
   public boolean matches(int doc) {
-    return (!checkDeletes || !delDocs.get(doc)) && matchesValue(doc);
+    return (!checkDeletes || acceptDocs.get(doc)) && matchesValue(doc);
   }
 
   public boolean matchesValue(int doc) {