Index: lucene/core/src/test/org/apache/lucene/search/TestSort.java
===================================================================
--- lucene/core/src/test/org/apache/lucene/search/TestSort.java	(revision 1381712)
+++ lucene/core/src/test/org/apache/lucene/search/TestSort.java	(working copy)
@@ -1039,7 +1039,7 @@
         
         TopDocs td = tdc.topDocs();
         ScoreDoc[] sd = td.scoreDocs;
-        assertEquals(10, sd.length);
+        assertEquals("collector=" + tdc + " sort=" + sort[i], 10, sd.length);
       }
     }
   }
Index: lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java	(revision 1381712)
+++ lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java	(working copy)
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.lucene.index.AtomicReaderContext;
@@ -60,54 +61,111 @@
 
 final class BooleanScorer extends Scorer {
   
-  private static final class BooleanScorerCollector extends Collector {
-    private BucketTable bucketTable;
-    private int mask;
-    private Scorer scorer;
+  static final int TABLE_SIZE = 1 << 11;
+  static final int TABLE_MASK = TABLE_SIZE - 1;
+
+  final Bucket[] buckets = new Bucket[TABLE_SIZE];
+
+  // Which slots are valid for the current chunk
+  final int[] validSlots = new int[TABLE_SIZE];
+
+  // How many valid slots
+  int validCount;
+
+  // End of current chunk we are processing
+  private int end;
+
+  private final SubScorer[] scorers;
+  private final float[] coordFactors;
+  private final int minNrShouldMatch;
+
+  private abstract class BooleanScorerCollectorBase extends Collector {
+    protected final Scorer scorer;
+
+    protected BooleanScorerCollectorBase(Scorer scorer) {
+      this.scorer = scorer;
+    }
+
+    @Override
+    public void setNextReader(AtomicReaderContext context) {
+      // not needed by this implementation
+    }
     
-    public BooleanScorerCollector(int mask, BucketTable bucketTable) {
-      this.mask = mask;
-      this.bucketTable = bucketTable;
+    @Override
+    public void setScorer(Scorer scorer) {
+      // nocommit why does this trip...
+      // assert scorer == this.scorer: "scorer=" + scorer + " vs this.scorer=" + this.scorer;
     }
     
     @Override
+    public boolean acceptsDocsOutOfOrder() {
+      return true;
+    }
+  }
+
+  // First, not prohibited
+  private final class FirstBooleanScorerCollector extends BooleanScorerCollectorBase {
+    
+    public FirstBooleanScorerCollector(Scorer scorer) {
+      super(scorer);
+    }
+    
+    @Override
     public void collect(final int doc) throws IOException {
-      final BucketTable table = bucketTable;
-      final int i = doc & BucketTable.MASK;
-      final Bucket bucket = table.buckets[i];
-      
+      //System.out.println("    collect doc=" + doc);
+      final int slot = doc & TABLE_MASK;
+      final Bucket bucket = buckets[slot];
+      assert bucket.doc != doc: "bucket.doc=" + bucket.doc + "; doc=" + doc;
+      bucket.doc = doc;                         // set doc
+      bucket.score = scorer.score();            // initialize score
+      bucket.prohibited = false;
+      bucket.coord = 1;                         // initialize coord
+      validSlots[validCount++] = slot;
+    }
+  }
+
+  // nocommit need random test that covers all of this...
+
+  // Not first, not prohibited
+  private final class BooleanScorerCollector extends BooleanScorerCollectorBase {
+
+    public BooleanScorerCollector(Scorer scorer) {
+      super(scorer);
+    }
+    
+    @Override
+    public void collect(final int doc) throws IOException {
+      final int slot = doc & TABLE_MASK;
+      final Bucket bucket = buckets[slot];
       if (bucket.doc != doc) {                    // invalid bucket
         bucket.doc = doc;                         // set doc
         bucket.score = scorer.score();            // initialize score
-        bucket.bits = mask;                       // initialize mask
         bucket.coord = 1;                         // initialize coord
-
-        bucket.next = table.first;                // push onto valid list
-        table.first = bucket;
-      } else {                                    // valid bucket
+        bucket.prohibited = false;
+        validSlots[validCount++] = slot;
+      } else if (!bucket.prohibited) {
         bucket.score += scorer.score();           // increment score
-        bucket.bits |= mask;                      // add bits in mask
         bucket.coord++;                           // increment coord
       }
     }
+  }
+
+  // Not first, prohibited
+  private final class ProhibitedBooleanScorerCollector extends BooleanScorerCollectorBase {
     
-    @Override
-    public void setNextReader(AtomicReaderContext context) {
-      // not needed by this implementation
+    public ProhibitedBooleanScorerCollector(Scorer scorer) {
+      super(scorer);
     }
     
     @Override
-    public void setScorer(Scorer scorer) {
-      this.scorer = scorer;
+    public void collect(final int doc) throws IOException {
+      final Bucket bucket = buckets[doc & TABLE_MASK];
+      bucket.doc = doc;
+      bucket.prohibited = true;
+      // NOTE: do not add to valid slots
     }
-    
-    @Override
-    public boolean acceptsDocsOutOfOrder() {
-      return true;
-    }
+  }
 
-  }
-  
   // An internal class which is used in score(Collector, int) for setting the
   // current score. This is required since Collector exposes a setScorer method
   // and implementations that need the score will call scorer.score().
@@ -140,159 +198,157 @@
   static final class Bucket {
     int doc = -1;            // tells if bucket is valid
     double score;             // incremental score
-    // TODO: break out bool anyProhibited, int
-    // numRequiredMatched; then we can remove 32 limit on
-    // required clauses
-    int bits;                // used for bool constraints
+    boolean prohibited;      // used for NOT constraint
     int coord;               // count of terms in score
-    Bucket next;             // next valid bucket
   }
   
-  /** A simple hash table of document scores within a range. */
-  static final class BucketTable {
-    public static final int SIZE = 1 << 11;
-    public static final int MASK = SIZE - 1;
-
-    final Bucket[] buckets = new Bucket[SIZE];
-    Bucket first = null;                          // head of valid list
-  
-    public BucketTable() {
-      // Pre-fill to save the lazy init when collecting
-      // each sub:
-      for(int idx=0;idx<SIZE;idx++) {
-        buckets[idx] = new Bucket();
-      }
+  private Collector newCollector(Scorer scorer, boolean isProhibited, boolean isFirst) {
+    if (isProhibited) {
+      return new ProhibitedBooleanScorerCollector(scorer);
+    } else if (isFirst) {
+      return new FirstBooleanScorerCollector(scorer);
+    } else {
+      return new BooleanScorerCollector(scorer);
     }
+  }
 
-    public Collector newCollector(int mask) {
-      return new BooleanScorerCollector(mask, this);
-    }
 
-    public int size() { return SIZE; }
-  }
-
   static final class SubScorer {
-    public Scorer scorer;
-    // TODO: re-enable this if BQ ever sends us required clauses
-    //public boolean required = false;
-    public boolean prohibited;
-    public Collector collector;
-    public SubScorer next;
+    public final Scorer scorer;
+    public final boolean prohibited;
+    public final Collector collector;
 
     public SubScorer(Scorer scorer, boolean required, boolean prohibited,
-        Collector collector, SubScorer next) {
+                     Collector collector) {
       if (required) {
         throw new IllegalArgumentException("this scorer cannot handle required=true");
       }
       this.scorer = scorer;
-      // TODO: re-enable this if BQ ever sends us required clauses
-      //this.required = required;
       this.prohibited = prohibited;
       this.collector = collector;
-      this.next = next;
     }
   }
   
-  private SubScorer scorers = null;
-  private BucketTable bucketTable = new BucketTable();
-  private final float[] coordFactors;
-  // TODO: re-enable this if BQ ever sends us required clauses
-  //private int requiredMask = 0;
-  private final int minNrShouldMatch;
-  private int end;
-  private Bucket current;
-  // Any time a prohibited clause matches we set bit 0:
-  private static final int PROHIBITED_MASK = 1;
+  private static class ScorerAndProhibited implements Comparable<ScorerAndProhibited> {
+    Scorer scorer;
+    boolean prohibited;
+
+    public ScorerAndProhibited(Scorer scorer, boolean prohibited) {
+      this.scorer = scorer;
+      this.prohibited = prohibited;
+    }
+    
+    @Override
+    public int compareTo(ScorerAndProhibited other) {
+      if (prohibited && !other.prohibited) {
+        // All prohibited clauses first:
+        return -1;
+      } else if (!prohibited && other.prohibited) {
+        // All prohibited clauses first:
+        return 1;
+      } else {
+        // Then, sort by lower docID (= higher hit count, approx):
+        return scorer.docID() - other.scorer.docID();
+      }
+    }
+  }
   
   BooleanScorer(BooleanWeight weight, boolean disableCoord, int minNrShouldMatch,
       List<Scorer> optionalScorers, List<Scorer> prohibitedScorers, int maxCoord) throws IOException {
     super(weight);
     this.minNrShouldMatch = minNrShouldMatch;
 
+    // Pre-fill to save the lazy init when collecting
+    // each sub:
+    for(int idx=0;idx<TABLE_SIZE;idx++) {
+      buckets[idx] = new Bucket();
+    }
+
+    boolean isFirst = true;
+    List<ScorerAndProhibited> subs = new ArrayList<ScorerAndProhibited>();
+
     if (optionalScorers != null && optionalScorers.size() > 0) {
       for (Scorer scorer : optionalScorers) {
-        if (scorer.nextDoc() != NO_MORE_DOCS) {
-          scorers = new SubScorer(scorer, false, false, bucketTable.newCollector(0), scorers);
+        int doc = scorer.nextDoc();
+        if (doc != NO_MORE_DOCS) {
+          subs.add(new ScorerAndProhibited(scorer, false));
         }
       }
     }
     
     if (prohibitedScorers != null && prohibitedScorers.size() > 0) {
       for (Scorer scorer : prohibitedScorers) {
-        if (scorer.nextDoc() != NO_MORE_DOCS) {
-          scorers = new SubScorer(scorer, false, true, bucketTable.newCollector(PROHIBITED_MASK), scorers);
+        int doc = scorer.nextDoc();
+        if (doc != NO_MORE_DOCS) {
+          subs.add(new ScorerAndProhibited(scorer, true));
         }
       }
     }
 
+    Collections.sort(subs);
+
+    scorers = new SubScorer[subs.size()];
+    //System.out.println("subs");
+    for(int i=0;i<subs.size();i++) {
+      ScorerAndProhibited sub = subs.get(i);
+      scorers[i] = new SubScorer(sub.scorer, false, sub.prohibited,
+                                 newCollector(sub.scorer, sub.prohibited, i == 0));
+      //System.out.println("  i=" + i + " docID=" + sub.scorer.docID() + " prohib=" + sub.prohibited);
+    }
+
     coordFactors = new float[optionalScorers.size() + 1];
     for (int i = 0; i < coordFactors.length; i++) {
       coordFactors[i] = disableCoord ? 1.0f : weight.coord(i, maxCoord); 
     }
   }
 
-  // firstDocID is ignored since nextDoc() initializes 'current'
   @Override
   public boolean score(Collector collector, int max, int firstDocID) throws IOException {
     // Make sure it's only BooleanScorer that calls us:
     assert firstDocID == -1;
-    boolean more;
-    Bucket tmp;
+    assert max == Integer.MAX_VALUE;
+
+    // nocommit what about BS inside BS?
+
     BucketScorer bs = new BucketScorer(weight);
 
     // The internal loop will set the score and doc before calling collect.
     collector.setScorer(bs);
+    boolean more;
     do {
-      bucketTable.first = null;
-      
-      while (current != null) {         // more queued 
 
-        // check prohibited & required
-        if ((current.bits & PROHIBITED_MASK) == 0) {
-
-          // TODO: re-enable this if BQ ever sends us required
-          // clauses
-          //&& (current.bits & requiredMask) == requiredMask) {
-          
-          // TODO: can we remove this?  
-          if (current.doc >= max){
-            tmp = current;
-            current = current.next;
-            tmp.next = bucketTable.first;
-            bucketTable.first = tmp;
-            continue;
-          }
-          
-          if (current.coord >= minNrShouldMatch) {
-            bs.score = current.score * coordFactors[current.coord];
-            bs.doc = current.doc;
-            bs.freq = current.coord;
-            collector.collect(current.doc);
-          }
-        }
-        
-        current = current.next;         // pop the queue
-      }
+      assert validCount == 0;
       
-      if (bucketTable.first != null){
-        current = bucketTable.first;
-        bucketTable.first = current.next;
-        return true;
-      }
-
       // refill the queue
       more = false;
-      end += BucketTable.SIZE;
-      for (SubScorer sub = scorers; sub != null; sub = sub.next) {
+      end += TABLE_SIZE;
+
+      //System.out.println("  refill end=" + end);
+      for (SubScorer sub : scorers) {
         int subScorerDocID = sub.scorer.docID();
         if (subScorerDocID != NO_MORE_DOCS) {
+          //System.out.println("  sub=" + sub.scorer + " docID=" + subScorerDocID + " collector=" + sub.collector);
           more |= sub.scorer.score(sub.collector, end, subScorerDocID);
         }
       }
-      current = bucketTable.first;
+      //System.out.println("  more=" + more);
+
+      for(int i=0;i<validCount;i++) {
+        final Bucket current = buckets[validSlots[i]];
       
-    } while (current != null || more);
+        // check prohibited & minShouldMatch
+        if (!current.prohibited && current.coord >= minNrShouldMatch) {
+          bs.score = current.score * coordFactors[current.coord];
+          bs.doc = current.doc;
+          bs.freq = current.coord;
+          collector.collect(current.doc);
+        }
+      }
 
+      validCount = 0;
+      
+    } while (more);
+
     return false;
   }
   
@@ -318,7 +374,9 @@
 
   @Override
   public float freq() throws IOException {
-    return current.coord;
+    // nocommit hmm?
+    throw new UnsupportedOperationException();
+    //return current.coord;
   }
 
   @Override
@@ -330,7 +388,7 @@
   public String toString() {
     StringBuilder buffer = new StringBuilder();
     buffer.append("boolean(");
-    for (SubScorer sub = scorers; sub != null; sub = sub.next) {
+    for (SubScorer sub : scorers) {
       buffer.append(sub.scorer.toString());
       buffer.append(" ");
     }
@@ -341,7 +399,7 @@
   @Override
   public Collection<ChildScorer> getChildren() {
     List<ChildScorer> children = new ArrayList<ChildScorer>();
-    for (SubScorer sub = scorers; sub != null; sub = sub.next) {
+    for (SubScorer sub : scorers) {
       // TODO: fix this if BQ ever sends us required clauses
       children.add(new ChildScorer(sub.scorer, sub.prohibited ? "MUST_NOT" : "SHOULD"));
     }