You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/07/14 15:22:06 UTC

svn commit: r1361540 [1/2] - in /lucene/dev/branches/LUCENE-2878: lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/java/org/apache/lucene/search/positions/ lucene/core/src/java/org/apache/lucene/search/spans/ lucene/core/src/test/org/apac...

Author: simonw
Date: Sat Jul 14 13:22:04 2012
New Revision: 1361540

URL: http://svn.apache.org/viewvc?rev=1361540&view=rev
Log:
LUCENE-2878: Declare if intervals are collected for ie. highlighting up-front when iterator is pulled

Modified:
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/MockSpanQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
    lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java Sat Jul 14 13:22:04 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery.BooleanWeight;
+import org.apache.lucene.search.positions.BooleanPositionIterator;
 import org.apache.lucene.search.positions.ConjunctionPositionIterator;
 import org.apache.lucene.search.positions.DisjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
@@ -140,7 +141,7 @@ final class BooleanScorer extends Scorer
     public float score() { return score; }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       return PositionIntervalIterator.NO_MORE_POSITIONS;
     }
     
@@ -326,7 +327,7 @@ final class BooleanScorer extends Scorer
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     final List<Scorer> scorers = new ArrayList<Scorer>();
     SubScorer sub = this.scorers;
     while(sub != null) {
@@ -337,9 +338,9 @@ final class BooleanScorer extends Scorer
     }
     if (this.minNrShouldMatch > 1) {
       return new ConjunctionPositionIterator(this,
-          scorers.toArray(new Scorer[0]), this.minNrShouldMatch);
+          collectPositions, this.minNrShouldMatch, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
     }
-    return new DisjunctionPositionIterator(this, scorers.toArray(new Scorer[0]));
+    return new DisjunctionPositionIterator(this, collectPositions,  BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java Sat Jul 14 13:22:04 2012
@@ -147,8 +147,8 @@ class BooleanScorer2 extends Scorer {
     }
     
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-      return scorer.positions(needsPayloads, needsOffsets);
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+      return scorer.positions(needsPayloads, needsOffsets, false);
     }
   }
 
@@ -326,8 +326,8 @@ class BooleanScorer2 extends Scorer {
   }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    return countingSumScorer.positions(needsPayloads, needsOffsets);
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return countingSumScorer.positions(needsPayloads, needsOffsets, collectPositions);
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java Sat Jul 14 13:22:04 2012
@@ -92,7 +92,7 @@ public abstract class CachingCollector e
     public final int nextDoc() { throw new UnsupportedOperationException(); }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException { throw new UnsupportedOperationException(); }
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException { throw new UnsupportedOperationException(); }
     }
 
   // A CachingCollector which caches scores

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java Sat Jul 14 13:22:04 2012
@@ -17,6 +17,7 @@ package org.apache.lucene.search;
  * limitations under the License.
  */
 
+import org.apache.lucene.search.positions.BooleanPositionIterator;
 import org.apache.lucene.search.positions.ConjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
 import org.apache.lucene.util.ArrayUtil;
@@ -144,12 +145,12 @@ class ConjunctionScorer extends Scorer {
   }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     if (scorersOrdered == null) {
       throw new IllegalStateException("no positions requested for this scorer");
     }
       // only created if needed for this scorer - no penalty for non-positional queries
-    return new ConjunctionPositionIterator(this, scorersOrdered);
+    return new ConjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorersOrdered));
   }
 
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java Sat Jul 14 13:22:04 2012
@@ -122,13 +122,13 @@ class ConjunctionTermScorer extends Scor
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     TermPositions[] positionIters = new TermPositions[origDocsAndFreqs.length];
     for (int i = 0; i < positionIters.length; i++) {
       DocsAndFreqs d = origDocsAndFreqs[i];
-      positionIters[i] = new TermPositions(this, d.factory.docsAndPositionsEnum(needsOffsets), needsPayloads);
+      positionIters[i] = new TermPositions(this, d.factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
     }
-    return new ConjunctionPositionIterator(this, positionIters);
+    return new ConjunctionPositionIterator(this, collectPositions, positionIters);
   }
 
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java Sat Jul 14 13:22:04 2012
@@ -256,9 +256,9 @@ public class ConstantScoreQuery extends 
     }
         
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       if (docIdSetIterator instanceof Scorer) {
-        return ((Scorer) docIdSetIterator).positions(needsPayloads, needsOffsets);
+        return ((Scorer) docIdSetIterator).positions(needsPayloads, needsOffsets, false);
       } else {
         throw new UnsupportedOperationException("positions are only supported on Scorer subclasses");
       }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java Sat Jul 14 13:22:04 2012
@@ -16,6 +16,7 @@ package org.apache.lucene.search;
  * limitations under the License.
  */
 
+import org.apache.lucene.search.positions.BooleanPositionIterator;
 import org.apache.lucene.search.positions.DisjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
 
@@ -190,10 +191,8 @@ class DisjunctionMaxScorer extends Score
   }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    final Scorer[] posScorers = new Scorer[numScorers];
-    System.arraycopy(subScorers, 0, posScorers, 0, numScorers);
-    return new DisjunctionPositionIterator(this, posScorers);
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java Sat Jul 14 13:22:04 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
 import java.util.List;
 import java.io.IOException;
 
+import org.apache.lucene.search.positions.BooleanPositionIterator;
 import org.apache.lucene.search.positions.ConjunctionPositionIterator;
 import org.apache.lucene.search.positions.DisjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
@@ -243,11 +244,11 @@ class DisjunctionSumScorer extends Score
   }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     if (minimumNrMatchers > 1) {
       return new ConjunctionPositionIterator(this,
-          subScorers.toArray(new Scorer[0]), minimumNrMatchers);
+          collectPositions, minimumNrMatchers, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
     }
-    return new DisjunctionPositionIterator(this, subScorers.toArray(new Scorer[0]));
+    return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
   }
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java Sat Jul 14 13:22:04 2012
@@ -325,11 +325,11 @@ final class ExactPhraseScorer extends Sc
   }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     TermScorer.TermPositions[] posIters = new TermScorer.TermPositions[chunkStates.length];
     for (int i = 0; i < chunkStates.length; i++) {
-      posIters[i] = new TermScorer.TermPositions(this, chunkStates[i].factory.docsAndPositionsEnum(needsOffsets), needsPayloads);
+      posIters[i] = new TermScorer.TermPositions(this, chunkStates[i].factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
     }
-    return new BlockPositionIterator(this, posIters);
+    return new BlockPositionIterator(this, collectPositions, posIters);
   }
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java Sat Jul 14 13:22:04 2012
@@ -224,7 +224,7 @@ public class FilteredQuery extends Query
             }
 
             @Override
-            public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+            public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
               // nocommit what should we do in this case with positions?
               throw new UnsupportedOperationException();
             }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Sat Jul 14 13:22:04 2012
@@ -757,7 +757,7 @@ public class IndexSearcher {
 
       @Override
       public PositionIntervalIterator positions(boolean needsPayloads,
-          boolean needsOffsets) throws IOException {
+          boolean needsOffsets, boolean collectPositions) throws IOException {
         return null;
       }
     }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Sat Jul 14 13:22:04 2012
@@ -75,7 +75,7 @@ public class MatchAllDocsQuery extends Q
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       // nocommit this is tricky - I think we can't really provide positions here?
       throw new UnsupportedOperationException();
     }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java Sat Jul 14 13:22:04 2012
@@ -94,7 +94,7 @@ final class MatchOnlyTermScorer extends 
   public String toString() { return "scorer(" + weight + ")"; }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     // nocommit is this ok here?
     throw new UnsupportedOperationException();
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java Sat Jul 14 13:22:04 2012
@@ -17,11 +17,11 @@ package org.apache.lucene.search;
  * limitations under the License.
  */
 
+import java.io.IOException;
+
 import org.apache.lucene.search.positions.ConjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
 
-import java.io.IOException;
-
 
 /** A Scorer for queries with a required subscorer
  * and an excluding (prohibited) sub DocIdSetIterator.
@@ -122,7 +122,7 @@ class ReqExclScorer extends Scorer {
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    return new ConjunctionPositionIterator(this, new Scorer[] { reqScorer });
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return new ConjunctionPositionIterator(this, collectPositions, reqScorer.positions(needsPayloads, needsOffsets, collectPositions));
   }
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java Sat Jul 14 13:22:04 2012
@@ -16,6 +16,7 @@ package org.apache.lucene.search;
  * limitations under the License.
  */
 
+import org.apache.lucene.search.positions.BooleanPositionIterator;
 import org.apache.lucene.search.positions.DisjunctionPositionIterator;
 import org.apache.lucene.search.positions.PositionIntervalIterator;
 
@@ -84,8 +85,8 @@ class ReqOptSumScorer extends Scorer {
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    return new DisjunctionPositionIterator(this, new Scorer[] { reqScorer, optScorer });
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, reqScorer, optScorer));
   }
 
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java Sat Jul 14 13:22:04 2012
@@ -81,8 +81,8 @@ public class ScoreCachingWrappingScorer 
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    return scorer.positions(needsPayloads, needsOffsets);
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return scorer.positions(needsPayloads, needsOffsets, false);
   }
   
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java Sat Jul 14 13:22:04 2012
@@ -63,7 +63,7 @@ public abstract class Scorer extends Doc
     }
   }
   
-  public abstract PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException;
+  public abstract PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException;
 
   /**
    * Expert: Collects matching documents in a range. Hook for optimization.

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Sat Jul 14 13:22:04 2012
@@ -480,7 +480,7 @@ final class SloppyPhraseScorer extends P
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     // nocommit implement this (and get a beer before you do so!)
     throw new UnsupportedOperationException();
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search;
 
-/**
+/*
  * 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.
@@ -97,8 +97,8 @@ final class TermScorer extends Scorer {
   public String toString() { return "scorer(" + weight + ")"; }
   
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
-    return new TermPositions(this, factory.docsAndPositionsEnum(needsOffsets), needsPayloads);
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+    return new TermPositions(this, factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
   }
 
  static final class TermPositions extends PositionIntervalIterator {
@@ -107,8 +107,8 @@ final class TermScorer extends Scorer {
     private final DocsAndPositionsEnum docsAndPos;
     private int docID = -1;
 
-    public TermPositions(Scorer scorer, DocsAndPositionsEnum docsAndPos, boolean doPayloads) {
-      super(scorer);
+    public TermPositions(Scorer scorer, DocsAndPositionsEnum docsAndPos, boolean doPayloads,  boolean collectPositions) {
+      super(scorer, collectPositions);
       this.docsAndPos = docsAndPos;
       this.interval = doPayloads ? new PayloadPosInterval(docsAndPos, this)
           : new PositionInterval();
@@ -137,7 +137,7 @@ final class TermScorer extends Scorer {
     }
 
     @Override
-    public void collect() {
+    public void collect(PositionCollector collector) {
       collector.collectLeafPosition(scorer, interval, docID);
     }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -17,6 +17,7 @@ package org.apache.lucene.search.positio
  * limitations under the License.
  */
 import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.positions.PositionIntervalIterator.PositionCollector;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -38,12 +39,12 @@ public final class BlockPositionIterator
 
   private final int lastIter;
 
-  public BlockPositionIterator(PositionIntervalIterator other) {
-    this(other, defaultGaps(other.subs(true).length));
+  public BlockPositionIterator(boolean collectPositions, PositionIntervalIterator other) {
+    this(other, collectPositions, defaultGaps(other.subs(true).length));
   }
 
-  public BlockPositionIterator(PositionIntervalIterator other, int[] gaps) {
-    super(other.getScorer());
+  public BlockPositionIterator(PositionIntervalIterator other, boolean collectPositions, int[] gaps) {
+    super(other.getScorer(), collectPositions);
     assert other.subs(true) != null;
     iterators = other.subs(true);
     assert iterators.length > 1;
@@ -52,9 +53,9 @@ public final class BlockPositionIterator
     this.gaps = gaps;
   }
 
-  public BlockPositionIterator(Scorer scorer, Scorer... subScorers)
+  public BlockPositionIterator(Scorer scorer, boolean collectPositions, Scorer... subScorers)
       throws IOException {
-    this(scorer, defaultGaps(subScorers.length), subScorers);
+    this(scorer, collectPositions, defaultGaps(subScorers.length), subScorers);
   }
 
   private static int[] defaultGaps(int num) {
@@ -63,23 +64,23 @@ public final class BlockPositionIterator
     return gaps;
   }
 
-  public BlockPositionIterator(Scorer scorer, int[] gaps, Scorer... subScorers)
+  public BlockPositionIterator(Scorer scorer,  boolean collectPositions, int[] gaps, Scorer... subScorers)
       throws IOException {
-    super(scorer);
+    super(scorer, collectPositions);
     assert subScorers.length > 1;
     iterators = new PositionIntervalIterator[subScorers.length];
     intervals = new PositionInterval[subScorers.length];
     for (int i = 0; i < subScorers.length; i++) {
       // nocommit - offsets and payloads?
-      iterators[i] = subScorers[i].positions(false, false);
+      iterators[i] = subScorers[i].positions(false, false, false);
       assert iterators[i] != null;
     }
     lastIter = iterators.length - 1;
     this.gaps = gaps;
   }
 
-  public BlockPositionIterator(Scorer scorer, int[] gaps, PositionIntervalIterator[] iterators) {
-    super(scorer);
+  public BlockPositionIterator(Scorer scorer, int[] gaps, boolean collectPositions, PositionIntervalIterator... iterators) {
+    super(scorer, collectPositions);
     assert iterators.length > 1;
     this.iterators = iterators;
     intervals = new PositionInterval[iterators.length];
@@ -87,8 +88,8 @@ public final class BlockPositionIterator
     this.gaps = gaps;
   }
 
-  public BlockPositionIterator(Scorer scorer, PositionIntervalIterator[] iterators) {
-    this(scorer, defaultGaps(iterators.length), iterators);
+  public BlockPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... iterators) {
+    this(scorer, defaultGaps(iterators.length), collectPositions, iterators);
   }
 
   @Override
@@ -135,10 +136,11 @@ public final class BlockPositionIterator
   }
 
   @Override
-  public void collect() {
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(scorer, interval, currentDoc);
     for (PositionIntervalIterator iter : iterators) {
-      iter.collect();
+      iter.collect(collector);
     }
   }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -19,31 +19,21 @@ package org.apache.lucene.search.positio
 import org.apache.lucene.search.Scorer;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * 
  * @lucene.experimental
  */
 // nocommit - javadoc
-abstract class BooleanPositionIterator extends PositionIntervalIterator {
+public abstract class BooleanPositionIterator extends PositionIntervalIterator {
 
   protected final PositionIntervalIterator[] iterators;
   protected final IntervalQueue queue;
 
-  public BooleanPositionIterator(Scorer scorer, Scorer[] subScorers,
-      IntervalQueue queue) throws IOException {
-    super(scorer);
-    this.queue = queue;
-    iterators = new PositionIntervalIterator[subScorers.length];
-    for (int i = 0; i < subScorers.length; i++) {
-      // nocommit - offsets and payloads?
-      iterators[i] = subScorers[i].positions(false, false);
-    }
-  }
-  
-  public BooleanPositionIterator(Scorer scorer, PositionIntervalIterator[] iterators,
-      IntervalQueue queue) throws IOException {
-    super(scorer);
+  protected BooleanPositionIterator(Scorer scorer, PositionIntervalIterator[] iterators,
+      IntervalQueue queue, boolean collectPositions) throws IOException {
+    super(scorer, collectPositions);
     this.queue = queue;
     this.iterators = iterators;
   }
@@ -54,5 +44,26 @@ abstract class BooleanPositionIterator e
   }
 
   abstract void advance() throws IOException;
-
+  
+  public static PositionIntervalIterator[] pullIterators(boolean needsPayloads,
+      boolean needsOffsets, boolean collectPositions, Scorer... scorers)
+      throws IOException {
+    PositionIntervalIterator[] iterators = new PositionIntervalIterator[scorers.length];
+    for (int i = 0; i < scorers.length; i++) {
+      iterators[i] = scorers[i].positions(needsPayloads, needsOffsets,
+          collectPositions);
+    }
+    return iterators;
+  }
+  
+  public static PositionIntervalIterator[] pullIterators(boolean needsPayloads,
+      boolean needsOffsets, boolean collectPositions, List<Scorer> scorers)
+      throws IOException {
+    PositionIntervalIterator[] iterators = new PositionIntervalIterator[scorers.size()];
+    for (int i = 0; i < iterators.length; i++) {
+      iterators[i] = scorers.get(i).positions(needsPayloads, needsOffsets,
+          collectPositions);
+    }
+    return iterators;
+  }
 }
\ No newline at end of file

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
 package org.apache.lucene.search.positions;
-/**
+/*
  * 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.
@@ -19,6 +19,8 @@ import java.io.IOException;
 
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.positions.IntervalQueue.IntervalRef;
+import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.RamUsageEstimator;
 
 /**
  * ConjuctionPositionIterator based on minimal interval semantics for AND
@@ -32,23 +34,18 @@ import org.apache.lucene.search.position
 public final class ConjunctionPositionIterator extends BooleanPositionIterator {
   private final IntervalQueueAnd queue;
   private final int nrMustMatch;
+  private SnapshotPositionCollector snapshot;
   
-  public ConjunctionPositionIterator(Scorer scorer, Scorer[] subScorers) throws IOException {
-    this (scorer, subScorers, subScorers.length);
+  public ConjunctionPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... iterators) throws IOException {
+    this(scorer, collectPositions, iterators.length, iterators);
   }
   
-  public ConjunctionPositionIterator(Scorer scorer, PositionIntervalIterator... iterators) throws IOException {
-    super(scorer, iterators, new IntervalQueueAnd(iterators.length));
+  public ConjunctionPositionIterator(Scorer scorer, boolean collectPositions, int minimuNumShouldMatch, PositionIntervalIterator... iterators) throws IOException {
+    super(scorer, iterators, new IntervalQueueAnd(iterators.length), collectPositions);
     queue = (IntervalQueueAnd) super.queue; // avoid lots of casts?
-    this.nrMustMatch = iterators.length;
+    this.nrMustMatch = minimuNumShouldMatch;
 
   }
-  
-  public ConjunctionPositionIterator(Scorer scorer, Scorer[] subScorers, int nrMustMatch) throws IOException {
-    super(scorer, subScorers, new IntervalQueueAnd(subScorers.length));
-    queue = (IntervalQueueAnd) super.queue; // avoid lots of casts?
-    this.nrMustMatch = nrMustMatch;
-  }
 
   void advance() throws IOException {
     final IntervalRef top = queue.top();
@@ -61,7 +58,7 @@ public final class ConjunctionPositionIt
       queue.pop();
     }
   }
-
+  
   @Override
   public PositionInterval next() throws IOException {
     
@@ -78,6 +75,9 @@ public final class ConjunctionPositionIt
       if(queue.currentCandidate.begin == top.begin && queue.currentCandidate.end == top.end) {
         return queue.currentCandidate;
       }
+      if (collectPositions) {
+        snapShotSubPositions(); // oddity! see SnapShotCollector below for details!
+      }
       advance();
       if (queue.size() < nrMustMatch) {
         break;
@@ -86,11 +86,30 @@ public final class ConjunctionPositionIt
     return queue.currentCandidate; // TODO support payloads
   }
 
-  @Override
-  public void collect() {
+  private void snapShotSubPositions() {
+    if (snapshot == null) {
+      snapshot = new SnapshotPositionCollector(queue.size());
+    }
+    snapshot.reset();
+    collectInternal(snapshot);
+  }
+  
+  private void collectInternal(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(scorer, queue.currentCandidate, currentDoc);
     for (PositionIntervalIterator iter : iterators) {
-      iter.collect();
+      iter.collect(collector);
+    }
+  }
+
+  @Override
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
+    if(snapshot==null) {
+      // we might not be initialized if the first interval matches
+      collectInternal(collector);
+    } else { 
+      snapshot.replay(collector);
     }
   }
 
@@ -105,10 +124,92 @@ public final class ConjunctionPositionIt
       if (interval != null) {
         queue.updateRightExtreme(interval);
         queue.add(new IntervalRef(interval, i));
-        iterators[i].collect();
       }
     }
     return currentDoc;
   }
 
+
+  /*
+   * Due to the laziness of this position iterator and the minimizing algorithm
+   * we advance the underlying iterators before the consumer can call collect on
+   * the top level iterator. If we need to collect positions we need to record the
+   * last possible match in order to allow the consumer to get the right positions
+   * for the match. This is particularly important if leaf positions are required.
+   */
+  private static final class SnapshotPositionCollector implements PositionCollector {
+    private SingleSnapshot[] snapshots;
+    private int index = 0;
+    
+    SnapshotPositionCollector(int subs) {
+      snapshots = new SingleSnapshot[subs];
+    }
+    
+    @Override
+    public void collectLeafPosition(Scorer scorer, PositionInterval interval,
+        int docID) {
+      collect(scorer, interval, docID, true);
+      
+    }
+
+    private void collect(Scorer scorer, PositionInterval interval, int docID, boolean isLeaf) {
+      if (snapshots.length <= index) {
+        grow(ArrayUtil.oversize(index + 1,
+            (RamUsageEstimator.NUM_BYTES_OBJECT_REF * 2)
+                + RamUsageEstimator.NUM_BYTES_OBJECT_HEADER
+                + RamUsageEstimator.NUM_BYTES_BOOLEAN
+                + RamUsageEstimator.NUM_BYTES_INT));
+      }
+      if (snapshots[index] == null) {
+        snapshots[index] = new SingleSnapshot();
+      }
+      snapshots[index++].set(scorer, interval, isLeaf, docID);
+    }
+
+    @Override
+    public void collectComposite(Scorer scorer, PositionInterval interval,
+        int docID) {
+      collect(scorer, interval, docID, false);
+    }
+    
+    void replay(PositionCollector collector) {
+      for (int i = 0; i < index; i++) {
+        SingleSnapshot singleSnapshot = snapshots[i];
+        if (singleSnapshot.isLeaf) {
+          collector.collectLeafPosition(singleSnapshot.scorer, singleSnapshot.interval, singleSnapshot.docID);
+        } else {
+          collector.collectComposite(singleSnapshot.scorer, singleSnapshot.interval, singleSnapshot.docID);
+        }
+      }
+    }
+    
+    void reset() {
+      index = 0;
+    }
+    
+    private void grow(int size) {
+      final SingleSnapshot[] newArray = new SingleSnapshot[size];
+      System.arraycopy(snapshots, 0, newArray, 0, index);
+      snapshots = newArray;
+    }
+    
+    private static final class SingleSnapshot {
+      Scorer scorer;
+      final PositionInterval interval = new PositionInterval();
+      boolean isLeaf;
+      int docID;
+     
+      
+      void set(Scorer scorer, PositionInterval interval, boolean isLeaf,
+          int docID)  {
+        this.scorer = scorer;
+        this.interval.copy(interval);
+        this.isLeaf = isLeaf;
+        this.docID = docID;
+      }
+      
+      
+    }
+    
+  }
 }
\ No newline at end of file

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -20,6 +20,7 @@ import java.io.IOException;
 
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.positions.IntervalQueue.IntervalRef;
+import org.apache.lucene.search.positions.PositionIntervalIterator.PositionCollector;
 
 /**
  * DisjunctionPositionIterator based on minimal interval semantics for OR
@@ -34,9 +35,9 @@ import org.apache.lucene.search.position
 // nocommit - javadoc
 public final class DisjunctionPositionIterator extends BooleanPositionIterator {
 
-  public DisjunctionPositionIterator(Scorer scorer, Scorer[] subScorers)
+  public DisjunctionPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... intervals)
       throws IOException {
-    super(scorer, subScorers, new IntervalQueueOr(subScorers.length));
+    super(scorer, intervals, new IntervalQueueOr(intervals.length), collectPositions);
   }
 
   void advance() throws IOException {
@@ -68,9 +69,10 @@ public final class DisjunctionPositionIt
   }
 
   @Override
-  public void collect() {
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(scorer, queue.currentCandidate, currentDoc);
-    iterators[queue.top().index].collect();
+    iterators[queue.top().index].collect(collector);
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
 package org.apache.lucene.search.positions;
-/**
+/*
  * 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.

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
 package org.apache.lucene.search.positions;
-/**
+/*
  * 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.
@@ -37,11 +37,7 @@ final class IntervalQueueOr extends Inte
   }
 
   public void updateCurrentCandidate() {
-    PositionInterval interval = top().interval;
-    currentCandidate.begin = interval.begin;
-    currentCandidate.offsetBegin = interval.offsetBegin;
-    currentCandidate.end = interval.end;
-    currentCandidate.offsetEnd = interval.offsetEnd;
+    currentCandidate.copy(top().interval);
   }
   
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -18,6 +18,8 @@ package org.apache.lucene.search.positio
  */
 import java.io.IOException;
 
+import org.apache.lucene.search.Scorer;
+
 /**
  * @lucene.experimental
  */ // nocommit - javadoc
@@ -33,23 +35,28 @@ public final class OrderedConjunctionPos
       Integer.MAX_VALUE, Integer.MAX_VALUE, -1, -1);
   private int index = 1;
 
-  public OrderedConjunctionPositionIterator(PositionIntervalIterator other) {
-    super(other.scorer);
+  public OrderedConjunctionPositionIterator(boolean collectPositions, PositionIntervalIterator other) {
+    super(other.scorer, collectPositions);
     assert other.subs(true) != null;
     iterators = other.subs(true);
     assert iterators.length > 1;
     intervals = new PositionInterval[iterators.length];
     lastIter = iterators.length - 1;
   }
+  
+  public OrderedConjunctionPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... iterators) throws IOException {
+    super(scorer, collectPositions);
+    this.iterators = iterators;
+    assert iterators.length > 1;
+    intervals = new PositionInterval[iterators.length];
+    lastIter = iterators.length - 1;
+  }
 
   @Override
   public PositionInterval next() throws IOException {
-    
-    
     if(intervals[0] == null) {
       return null;
     }
-      
     interval.begin = Integer.MAX_VALUE;
     interval.end = Integer.MAX_VALUE;
     interval.offsetBegin = -1;
@@ -94,10 +101,11 @@ public final class OrderedConjunctionPos
   }
 
   @Override
-  public void collect() {
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(scorer, interval, currentDoc);
     for (PositionIntervalIterator iter : iterators) {
-      iter.collect();
+      iter.collect(collector);
     }
   }
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -117,8 +117,8 @@ public class PositionFilterQuery extends
       this.other = other;
       // nocommit - offsets and payloads?
       this.filter = PositionFilterQuery.this.filter != null
-          ? PositionFilterQuery.this.filter.filter(other.positions(false, false))
-          : other.positions(false, false);
+          ? PositionFilterQuery.this.filter.filter(other.positions(false, false, false))
+          : other.positions(false, false, false);
       filtered = new FilteredPositions(this, filter);
     }
 
@@ -128,9 +128,9 @@ public class PositionFilterQuery extends
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       return PositionFilterQuery.this.filter != null ? PositionFilterQuery.this.filter
-          .filter(other.positions(needsPayloads, needsOffsets)) : other.positions(needsPayloads, needsOffsets);
+          .filter(other.positions(needsPayloads, needsOffsets, false)) : other.positions(needsPayloads, needsOffsets, false);
     }
 
     @Override
@@ -174,7 +174,7 @@ public class PositionFilterQuery extends
   
   private final class FilteredPositions extends PositionIntervalIterator {
     public FilteredPositions(Scorer scorer, PositionIntervalIterator other) {
-      super(scorer);
+      super(scorer, other.collectPositions);
       this.other = other;
     }
 
@@ -193,8 +193,9 @@ public class PositionFilterQuery extends
     }
 
     @Override
-    public void collect() {
-      other.collect();
+    public void collect(PositionCollector collector) {
+      assert this.collectPositions;
+      other.collect(collector);
       
     }
     @Override
@@ -202,12 +203,8 @@ public class PositionFilterQuery extends
       return EMPTY;
     }
 
-    public void setPositionCollector(PositionCollector collector) {
-      other.setPositionCollector(collector);
-    }
-
   }
-  
+
   @Override
   public int hashCode() {
     final int prime = 31;
@@ -232,5 +229,4 @@ public class PositionFilterQuery extends
     return true;
   }
 
-
 }
\ No newline at end of file

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.positions;
 
-/**
+/*
  * 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.
@@ -30,45 +30,21 @@ public abstract class PositionIntervalIt
   public static final PositionIntervalIterator[] EMPTY = new PositionIntervalIterator[0];
   public static final PositionIntervalIterator NO_MORE_POSITIONS = new NoPositionsIntervalIterator();
   public static final int NO_MORE_DOCS = Integer.MAX_VALUE;
-  public static final PositionCollector EMPTY_COLLECTOR = new PositionCollector() {
-
-    @Override
-    public void collectLeafPosition(Scorer scorer, PositionInterval interval,
-        int docID) {
-    }
-
-    @Override
-    public void collectComposite(Scorer scorer, PositionInterval interval,
-        int docID) {
-    }
-
-  };
 
   protected int currentDoc = -1;
   protected final Scorer scorer;
-  protected PositionCollector collector = EMPTY_COLLECTOR;
+  protected final boolean collectPositions;
 
-  public PositionIntervalIterator(Scorer scorer) {
+  public PositionIntervalIterator(Scorer scorer, boolean collectPositions) {
     this.scorer = scorer;
+    this.collectPositions = collectPositions;
   }
 
   public abstract int advanceTo(int docId) throws IOException;
 
   public abstract PositionInterval next() throws IOException;
 
-  public void setPositionCollector(PositionCollector collector) {
-    if (collector == null) {
-      throw new IllegalArgumentException("PositionCollector must not be null");
-    }
-    this.collector = collector;
-    PositionIntervalIterator[] subs = subs(false);
-    for (PositionIntervalIterator positionIntervalIterator : subs) {
-      positionIntervalIterator.setPositionCollector(collector);
-    }
-  }
-
-
-  public abstract void collect();
+  public abstract void collect(PositionCollector collector);
 
   public abstract PositionIntervalIterator[] subs(boolean inOrder);
   
@@ -102,6 +78,13 @@ public abstract class PositionIntervalIt
     public PositionInterval() {
       this(0, 0, -1, -1);
     }
+    
+    public void copy(PositionInterval other) {
+      begin = other.begin;
+      end = other.end;
+      offsetBegin = other.offsetBegin;
+      offsetEnd = other.offsetEnd;
+    }
 
     public boolean nextPayload(BytesRef ref) throws IOException {
       return false;
@@ -112,7 +95,7 @@ public abstract class PositionIntervalIt
     }
 
     public void reset() {
-      begin = end = -1;
+      offsetBegin = offsetEnd = begin = end = -1;
     }
 
     @Override
@@ -141,7 +124,7 @@ public abstract class PositionIntervalIt
   PositionIntervalIterator {
 
     public NoPositionsIntervalIterator() {
-      super(null);
+      super(null, false);
     }
 
     @Override
@@ -155,7 +138,7 @@ public abstract class PositionIntervalIt
     }
 
     @Override
-    public void collect() {}
+    public void collect(PositionCollector collectoc) {}
 
     @Override
     public PositionIntervalIterator[] subs(boolean inOrder) {

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
 package org.apache.lucene.search.positions;
-/**
+/*
  * 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.
@@ -18,6 +18,7 @@ package org.apache.lucene.search.positio
 
 import java.io.IOException;
 
+import org.apache.lucene.search.positions.PositionIntervalIterator.PositionCollector;
 import org.apache.lucene.search.positions.PositionIntervalIterator.PositionIntervalFilter;
 
 /**
@@ -36,7 +37,8 @@ public class RangePositionsIterator exte
   }
   
   public RangePositionsIterator(int start, int end, PositionIntervalIterator iterator) {
-    super(iterator != null ? iterator.scorer : null);
+    super(iterator != null ? iterator.scorer : null,
+        iterator != null ? iterator.collectPositions : false);
     this.iterator = iterator;
     this.start = start;
     this.end = end;
@@ -64,9 +66,10 @@ public class RangePositionsIterator exte
   }
 
   @Override
-  public void collect() {
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(null, interval, iterator.docID());
-    iterator.collect();
+    iterator.collect(collector);
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
 package org.apache.lucene.search.positions;
-/**
+/*
  * 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.
@@ -17,6 +17,7 @@ package org.apache.lucene.search.positio
  */
 import java.io.IOException;
 
+import org.apache.lucene.search.positions.PositionIntervalIterator.PositionCollector;
 import org.apache.lucene.search.positions.PositionIntervalIterator.PositionIntervalFilter;
 
 
@@ -29,7 +30,7 @@ public class WithinPositionIterator exte
   private PositionInterval interval;
   
   public WithinPositionIterator(int howMany, PositionIntervalIterator iterator) {
-    super(iterator != null ? iterator.scorer : null);
+    super(iterator != null ? iterator.scorer : null, iterator != null ? iterator.collectPositions : false);
     this.howMany = howMany;
     this.iterator = iterator;
   }
@@ -57,9 +58,10 @@ public class WithinPositionIterator exte
   }
 
   @Override
-  public void collect() {
+  public void collect(PositionCollector collector) {
+    assert collectPositions;
     collector.collectComposite(null, interval, iterator.docID());
-    iterator.collect();
+    iterator.collect(collector);
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/MockSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/MockSpanQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/MockSpanQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/MockSpanQuery.java Sat Jul 14 13:22:04 2012
@@ -66,9 +66,8 @@ public class MockSpanQuery extends SpanQ
     if (scorer == null) {
       return EMPTY_SPANS;
     }
-    // nocommit - what about offsets here?
-    return new SpansScorerWrapper(scorer, filter == null ? scorer.positions(needsPayloads, false)
-                                                         : filter.filter(scorer.positions(needsPayloads, false)));
+    return new SpansScorerWrapper(scorer, filter == null ? scorer.positions(needsPayloads, false, false)
+                                                         : filter.filter(scorer.positions(needsPayloads, false, false)));
   }
   
 

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java Sat Jul 14 13:22:04 2012
@@ -100,7 +100,7 @@ public class SpanScorer extends Scorer {
   }
 
   @Override
-  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+  public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
     return null;
   }
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Sat Jul 14 13:22:04 2012
@@ -50,4 +50,24 @@ public class SpanTermQuery extends MockS
     terms.add(term);
   }
 
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = super.hashCode();
+    result = prime * result + ((term == null) ? 0 : term.hashCode());
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) return true;
+    if (!super.equals(obj)) return false;
+    if (getClass() != obj.getClass()) return false;
+    SpanTermQuery other = (SpanTermQuery) obj;
+    if (term == null) {
+      if (other.term != null) return false;
+    } else if (!term.equals(other.term)) return false;
+    return true;
+  }
+
 }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java Sat Jul 14 13:22:04 2012
@@ -203,7 +203,7 @@ final class JustCompileSearch {
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       throw new UnsupportedOperationException(UNSUPPORTED_MSG);
     }
     
@@ -250,7 +250,7 @@ final class JustCompileSearch {
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       throw new UnsupportedOperationException(UNSUPPORTED_MSG);
     }
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Sat Jul 14 13:22:04 2012
@@ -94,7 +94,7 @@ public class TestBooleanScorer extends L
       }
       @Override
       public PositionIntervalIterator positions(boolean needsPayloads,
-          boolean needsOffsets) throws IOException {
+          boolean needsOffsets, boolean collectPositions) throws IOException {
         return null;
       }
       

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java Sat Jul 14 13:22:04 2012
@@ -46,7 +46,7 @@ public class TestCachingCollector extend
     public int advance(int target) throws IOException { return 0; }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       return PositionIntervalIterator.NO_MORE_POSITIONS;
     }
     

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Sat Jul 14 13:22:04 2012
@@ -51,7 +51,7 @@ public class TestPositiveScoresOnlyColle
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       throw new UnsupportedOperationException();
     }
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Sat Jul 14 13:22:04 2012
@@ -57,7 +57,7 @@ public class TestScoreCachingWrappingSco
     }
 
     @Override
-    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+    public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
       throw new UnsupportedOperationException(); 
     }
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java Sat Jul 14 13:22:04 2012
@@ -42,7 +42,7 @@ public class TestTermQuery extends Lucen
   private String fieldName = "field";
 
   /**
-   * Simple testcase for {@link TermScorer#positions(boolean, boolean)}
+   * Simple testcase for {@link TermScorer#positions(boolean, boolean, boolean)}
    */
   public void testPositionsSimple() throws IOException {
     Directory directory = newDirectory();
@@ -81,7 +81,7 @@ public class TestTermQuery extends Lucen
         assertNotNull(scorer);
         int toDoc = 1 + random().nextInt(atomicReaderContext.reader().docFreq(new Term(fieldName, "1")) - 1 );
         final int advance = scorer.advance(toDoc);
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
 
         do {
           assertEquals(scorer.docID(), positions.advanceTo(scorer.docID()));
@@ -197,7 +197,7 @@ public class TestTermQuery extends Lucen
           if (docID == Scorer.NO_MORE_DOCS) {
             break;
           }
-          PositionIntervalIterator positions = scorer.positions(false, false);
+          PositionIntervalIterator positions = scorer.positions(false, false, false);
           Integer[] pos = positionsInDoc[atomicReaderContext.docBase + docID];
 
           assertEquals((float) pos.length, positions.getScorer().freq(), 0.0f);
@@ -279,7 +279,7 @@ public class TestTermQuery extends Lucen
           initDoc = scorer.advance(random().nextInt(maxDoc));
         }
         String msg = "Iteration: " + i + " initDoc: " + initDoc;
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
         assertEquals(howMany / 2.f, positions.getScorer().freq(), 0.0);
         assertEquals(scorer.docID(), positions.advanceTo(scorer.docID()));
         for (int j = 0; j < howMany; j += 2) {

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java Sat Jul 14 13:22:04 2012
@@ -118,7 +118,7 @@ public class TestBlockPositionsIterator 
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(0, nextDoc);
-        PositionIntervalIterator positions = new BlockPositionIterator(scorer.positions(false, false));
+        PositionIntervalIterator positions = new BlockPositionIterator(false, scorer.positions(false, false, false));
         assertEquals(0, positions.advanceTo(0));
         PositionInterval interval = null;
         int[] start = new int[] {0, 31};
@@ -137,7 +137,7 @@ public class TestBlockPositionsIterator 
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(1, nextDoc);
-        PositionIntervalIterator positions =  new BlockPositionIterator(scorer.positions(false, false));
+        PositionIntervalIterator positions =  new BlockPositionIterator(false, scorer.positions(false, false, false));
         assertEquals(1, positions.advanceTo(1));
         PositionInterval interval = null;
         int[] start = new int[] {3, 34};
@@ -165,7 +165,7 @@ public class TestBlockPositionsIterator 
 
     @Override
     public PositionIntervalIterator filter(PositionIntervalIterator iter) {
-      return new BlockPositionIterator(iter);
+      return new BlockPositionIterator(false, iter);
     }
     
   }

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java Sat Jul 14 13:22:04 2012
@@ -106,7 +106,7 @@ public class TestConjunctionPositionsIte
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(0, nextDoc);
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
         assertEquals(0, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] {0, 1, 2, 3, 4, 6, 7, 31, 32, 33};
@@ -125,7 +125,7 @@ public class TestConjunctionPositionsIte
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(1, nextDoc);
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
         assertEquals(1, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] {0, 1, 3, 4, 5, 6, 7, 31, 32, 34 };

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java Sat Jul 14 13:22:04 2012
@@ -111,7 +111,7 @@ public class TestDisjunctionPositionIter
 
       int nextDoc = scorer.nextDoc();
       assertEquals(i, nextDoc);
-      PositionIntervalIterator positions = scorer.positions(false, false);
+      PositionIntervalIterator positions = scorer.positions(false, false, false);
       assertEquals(i, positions.advanceTo(nextDoc));
       PositionInterval interval = positions.next();
       assertEquals(1, interval.begin);
@@ -165,7 +165,7 @@ public class TestDisjunctionPositionIter
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(0, nextDoc);
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
         assertEquals(0, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] { 0, 1, 2, 3, 4, 6, 7, 31, 32, 33 };
@@ -187,7 +187,7 @@ public class TestDisjunctionPositionIter
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(1, nextDoc);
-        PositionIntervalIterator positions = scorer.positions(false, false);
+        PositionIntervalIterator positions = scorer.positions(false, false, false);
         assertEquals(1, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] { 0, 1, 3, 4, 5, 6, 7, 31, 32, 34 };

Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java Sat Jul 14 13:22:04 2012
@@ -112,7 +112,7 @@ public class TestOrderedConjunctionPosit
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(0, nextDoc);
-        PositionIntervalIterator positions = new OrderedConjunctionPositionIterator(scorer.positions(false, false));
+        PositionIntervalIterator positions = new OrderedConjunctionPositionIterator(false, scorer.positions(false, false, false));
         assertEquals(0, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] {0, 31};
@@ -133,7 +133,7 @@ public class TestOrderedConjunctionPosit
       {
         int nextDoc = scorer.nextDoc();
         assertEquals(1, nextDoc);
-        PositionIntervalIterator positions = new OrderedConjunctionPositionIterator(scorer.positions(false, false));
+        PositionIntervalIterator positions = new OrderedConjunctionPositionIterator(false, scorer.positions(false, false, false));
         assertEquals(1, positions.advanceTo(nextDoc));
         PositionInterval interval = null;
         int[] start = new int[] {3, 34};
@@ -158,7 +158,7 @@ public class TestOrderedConjunctionPosit
 
     @Override
     public PositionIntervalIterator filter(PositionIntervalIterator iter) {
-      return new OrderedConjunctionPositionIterator(iter);
+      return new OrderedConjunctionPositionIterator(false, iter);
     }
     
   }