svn commit: r1023711 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java

[mi...@apache.org]

Author: mikemccand
Date: Mon Oct 18 09:51:17 2010
New Revision: 1023711

URL: http://svn.apache.org/viewvc?rev=1023711&view=rev
Log:
LUCENE-2711: also use bulk sub-scorer API in BooleanScorer.nextDoc

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1023711&r1=1023710&r2=1023711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer.java Mon Oct 18 09:51:17 2010
@@ -69,7 +69,7 @@ final class BooleanScorer extends Scorer
     }
     
     @Override
-    public final void collect(final int doc) throws IOException {
+    public void collect(final int doc) throws IOException {
       final BucketTable table = bucketTable;
       final int i = doc & BucketTable.MASK;
       Bucket bucket = table.buckets[i];
@@ -159,7 +159,7 @@ final class BooleanScorer extends Scorer
       return new BooleanScorerCollector(mask, this);
     }
 
-    public final int size() { return SIZE; }
+    public int size() { return SIZE; }
   }
 
   static final class SubScorer {
@@ -320,14 +320,10 @@ final class BooleanScorer extends Scorer
       more = false;
       end += BucketTable.SIZE;
       for (SubScorer sub = scorers; sub != null; sub = sub.next) {
-        Scorer scorer = sub.scorer;
-        sub.collector.setScorer(scorer);
-        int doc = scorer.docID();
-        while (doc < end) {
-          sub.collector.collect(doc);
-          doc = scorer.nextDoc();
+        int subScorerDocID = sub.scorer.docID();
+        if (subScorerDocID != NO_MORE_DOCS) {
+          more |= sub.scorer.score(sub.collector, end, subScorerDocID);
         }
-        more |= (doc != NO_MORE_DOCS);
       }
     } while (bucketTable.first != null || more);