svn commit: r1087435 - /lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java

[sa...@apache.org]

Author: sarowe
Date: Thu Mar 31 21:03:18 2011
New Revision: 1087435

URL: http://svn.apache.org/viewvc?rev=1087435&view=rev
Log:
Updated to the new method for obtaining a top-level deleted docs bitset.  Also checking the bitset for null, when there are no deleted docs.

Modified:
    lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java

Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1087435&r1=1087434&r2=1087435&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Thu Mar 31 21:03:18 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.benchmark.byTas
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiFields;
 import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.MultiTermQuery;
@@ -95,9 +96,9 @@ public abstract class ReadTask extends P
     // optionally warm and add num docs traversed to count
     if (withWarm()) {
       Document doc = null;
-      Bits delDocs = reader.getDeletedDocs();
+      Bits delDocs = MultiFields.getDeletedDocs(reader);
       for (int m = 0; m < reader.maxDoc(); m++) {
-        if (!delDocs.get(m)) {
+        if (null == delDocs || ! delDocs.get(m)) {
           doc = reader.document(m);
           res += (doc == null ? 0 : 1);
         }