Index: solr/core/src/java/org/apache/solr/schema/LatLonType.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/LatLonType.java (revision 1177055) +++ solr/core/src/java/org/apache/solr/schema/LatLonType.java (working copy) @@ -372,7 +372,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - return ((SpatialScorer)scorer(context, ScorerContext.def().scoreDocsInOrder(true).topScorer(true))).explain(doc); + return ((SpatialScorer)scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs()))).explain(doc); } } Index: solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java =================================================================== --- solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (revision 1177055) +++ solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.*; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Bits; @@ -2080,7 +2081,7 @@ iterators.add(iter); } for (Weight w : weights) { - Scorer scorer = w.scorer(context, Weight.ScorerContext.def()); + Scorer scorer = w.scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer == null) return null; iterators.add(scorer); } Index: modules/join/src/java/org/apache/lucene/search/join/BlockJoinQuery.java =================================================================== --- modules/join/src/java/org/apache/lucene/search/join/BlockJoinQuery.java (revision 1177055) +++ modules/join/src/java/org/apache/lucene/search/join/BlockJoinQuery.java (working copy) @@ -148,7 +148,8 @@ @Override public Scorer scorer(AtomicReaderContext readerContext, ScorerContext context) throws IOException { // Pass scoreDocsInOrder true, topScorer false to our sub: - final Scorer childScorer = childWeight.scorer(readerContext, ScorerContext.def().scoreDocsInOrder(true).topScorer(false)); + ScorerContext subContext = new ScorerContext(true, false, context.acceptDocs); + final Scorer childScorer = childWeight.scorer(readerContext, subContext); if (childScorer == null) { // No matches Index: modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java =================================================================== --- modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (revision 1177055) +++ modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (working copy) @@ -92,7 +92,7 @@ @Override public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { - Scorer subQueryScorer = qWeight.scorer(context, ScorerContext.def()); + Scorer subQueryScorer = qWeight.scorer(context, new ScorerContext(scorerContext.acceptDocs)); if(subQueryScorer == null) { return null; } Index: modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java =================================================================== --- modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (revision 1177055) +++ modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (working copy) @@ -95,7 +95,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - return ((AllScorer)scorer(context, ScorerContext.def().scoreDocsInOrder(true).topScorer(true))).explain(doc); + return ((AllScorer)scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs()))).explain(doc); } } Index: modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java =================================================================== --- modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (revision 1177055) +++ modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (working copy) @@ -77,6 +77,7 @@ class QueryDocValues extends FloatDocValues { final AtomicReaderContext readerContext; + final ScorerContext scorerContext; final Weight weight; final float defVal; final Map fcontext; @@ -95,6 +96,7 @@ super(vs); this.readerContext = readerContext; + this.scorerContext = new ScorerContext(readerContext.reader.getLiveDocs()); this.defVal = vs.defVal; this.q = vs.q; this.fcontext = fcontext; @@ -121,7 +123,7 @@ try { if (doc < lastDocRequested) { if (noMatches) return defVal; - scorer = weight.scorer(readerContext, ScorerContext.def()); + scorer = weight.scorer(readerContext, scorerContext); if (scorer==null) { noMatches = true; return defVal; @@ -152,7 +154,7 @@ try { if (doc < lastDocRequested) { if (noMatches) return false; - scorer = weight.scorer(readerContext, ScorerContext.def()); + scorer = weight.scorer(readerContext, scorerContext); scorerDoc = -1; if (scorer==null) { noMatches = true; @@ -210,7 +212,7 @@ mval.exists = false; return; } - scorer = weight.scorer(readerContext, ScorerContext.def()); + scorer = weight.scorer(readerContext, scorerContext); scorerDoc = -1; if (scorer==null) { noMatches = true; Index: modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java =================================================================== --- modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (revision 1177055) +++ modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (working copy) @@ -230,13 +230,14 @@ // since we call advance on the valSrcScorers. Pass // false for "topScorer" because we will not invoke // score(Collector) on these scorers: - Scorer subQueryScorer = subQueryWeight.scorer(context, ScorerContext.def()); + Scorer subQueryScorer = subQueryWeight.scorer(context, new ScorerContext(scorerContext.acceptDocs)); if (subQueryScorer == null) { return null; } Scorer[] valSrcScorers = new Scorer[valSrcWeights.length]; + ScorerContext subContext = new ScorerContext(true, scorerContext.topScorer, scorerContext.acceptDocs); for(int i = 0; i < valSrcScorers.length; i++) { - valSrcScorers[i] = valSrcWeights[i].scorer(context, scorerContext.scoreDocsInOrder(true)); + valSrcScorers[i] = valSrcWeights[i].scorer(context, subContext); } return new CustomScorer(CustomScoreQuery.this.getCustomScoreProvider(context), this, getBoost(), subQueryScorer, valSrcScorers); } Index: lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java =================================================================== --- lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (revision 1177055) +++ lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (working copy) @@ -33,6 +33,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.memory.MemoryIndex; import org.apache.lucene.search.*; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.search.spans.FieldMaskingSpanQuery; import org.apache.lucene.search.spans.SpanFirstQuery; import org.apache.lucene.search.spans.SpanNearQuery; @@ -248,11 +249,12 @@ for (final String field : fieldNames) { AtomicReaderContext context = getLeafContextForField(field); + ScorerContext scorerContext = new ScorerContext(context.reader.getLiveDocs()); final Spans spans; if (mustRewriteQuery) { - spans = queries.get(field).getSpans(context); + spans = queries.get(field).getSpans(context, scorerContext); } else { - spans = spanQuery.getSpans(context); + spans = spanQuery.getSpans(context, scorerContext); } Index: lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (working copy) @@ -170,7 +170,7 @@ Weight w = searcher.createNormalizedWeight(q); ReaderContext topReaderContext = searcher.getTopReaderContext(); AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext); - Scorer s = w.scorer(leaves[0], ScorerContext.def()); + Scorer s = w.scorer(leaves[0], new ScorerContext(leaves[0].reader.getLiveDocs())); assertEquals(1, s.advance(1)); } Index: lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.ReaderContext; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ReaderUtil; /** @@ -49,7 +50,7 @@ public static Spans wrap(ReaderContext topLevelReaderContext, SpanQuery query) throws IOException { AtomicReaderContext[] leaves = ReaderUtil.leaves(topLevelReaderContext); if(leaves.length == 1) { - return query.getSpans(leaves[0]); + return query.getSpans(leaves[0], new ScorerContext(leaves[0].reader.getLiveDocs())); } return new MultiSpansWrapper(leaves, query); } @@ -60,14 +61,14 @@ return false; } if (current == null) { - current = query.getSpans(leaves[leafOrd]); + current = query.getSpans(leaves[leafOrd], new ScorerContext(leaves[leafOrd].reader.getLiveDocs())); } while(true) { if (current.next()) { return true; } if (++leafOrd < leaves.length) { - current = query.getSpans(leaves[leafOrd]); + current = query.getSpans(leaves[leafOrd], new ScorerContext(leaves[leafOrd].reader.getLiveDocs())); } else { current = null; break; @@ -85,17 +86,17 @@ int subIndex = ReaderUtil.subIndex(target, leaves); assert subIndex >= leafOrd; if (subIndex != leafOrd) { - current = query.getSpans(leaves[subIndex]); + current = query.getSpans(leaves[subIndex], new ScorerContext(leaves[subIndex].reader.getLiveDocs())); leafOrd = subIndex; } else if (current == null) { - current = query.getSpans(leaves[leafOrd]); + current = query.getSpans(leaves[leafOrd], new ScorerContext(leaves[leafOrd].reader.getLiveDocs())); } while (true) { if (current.skipTo(target - leaves[leafOrd].docBase)) { return true; } if (++leafOrd < leaves.length) { - current = query.getSpans(leaves[leafOrd]); + current = query.getSpans(leaves[leafOrd], new ScorerContext(leaves[leafOrd].reader.getLiveDocs())); } else { current = null; break; Index: lucene/src/test/org/apache/lucene/search/spans/TestSpans.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (working copy) @@ -435,7 +435,7 @@ slop, ordered); - spanScorer = searcher.createNormalizedWeight(snq).scorer(leaves[i], ScorerContext.def()); + spanScorer = searcher.createNormalizedWeight(snq).scorer(leaves[i], new ScorerContext(leaves[i].reader.getLiveDocs())); } finally { searcher.setSimilarityProvider(oldSim); } Index: lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Weight; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.search.similarities.Similarity; /** @@ -82,7 +83,7 @@ } @Override - public Spans getSpans(AtomicReaderContext context) throws IOException { + public Spans getSpans(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } Index: lucene/src/test/org/apache/lucene/search/TestTermScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermScorer.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/TestTermScorer.java (working copy) @@ -79,7 +79,8 @@ Weight weight = indexSearcher.createNormalizedWeight(termQuery); assertTrue(indexSearcher.getTopReaderContext().isAtomic); - Scorer ts = weight.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def().scoreDocsInOrder(true).topScorer(true)); + AtomicReaderContext context = (AtomicReaderContext)indexSearcher.getTopReaderContext(); + Scorer ts = weight.scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs())); // we have 2 documents with the term all in them, one document for all the // other values final List docs = new ArrayList(); @@ -140,7 +141,8 @@ Weight weight = indexSearcher.createNormalizedWeight(termQuery); assertTrue(indexSearcher.getTopReaderContext().isAtomic); - Scorer ts = weight.scorer((AtomicReaderContext) indexSearcher.getTopReaderContext(), ScorerContext.def().scoreDocsInOrder(true).topScorer(true)); + AtomicReaderContext context = (AtomicReaderContext) indexSearcher.getTopReaderContext(); + Scorer ts = weight.scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs())); assertTrue("next did not return a doc", ts.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertTrue("score is not correct", ts.score() == 1.6931472f); @@ -158,8 +160,8 @@ Weight weight = indexSearcher.createNormalizedWeight(termQuery); assertTrue(indexSearcher.getTopReaderContext().isAtomic); - - Scorer ts = weight.scorer((AtomicReaderContext) indexSearcher.getTopReaderContext(), ScorerContext.def().scoreDocsInOrder(true).topScorer(true)); + AtomicReaderContext context = (AtomicReaderContext) indexSearcher.getTopReaderContext(); + Scorer ts = weight.scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs())); assertTrue("Didn't skip", ts.advance(3) != DocIdSetIterator.NO_MORE_DOCS); // The next doc should be doc 5 assertTrue("doc should be number 5", ts.docID() == 5); Index: lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (revision 1177055) +++ lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (working copy) @@ -178,7 +178,8 @@ QueryUtils.check(random, dq, s); assertTrue(s.getTopReaderContext().isAtomic); final Weight dw = s.createNormalizedWeight(dq); - final Scorer ds = dw.scorer((AtomicReaderContext)s.getTopReaderContext(), ScorerContext.def()); + AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext(); + final Scorer ds = dw.scorer(context, new ScorerContext(context.reader.getLiveDocs())); final boolean skipOk = ds.advance(3) != DocIdSetIterator.NO_MORE_DOCS; if (skipOk) { fail("firsttime skipTo found a match? ... " @@ -193,7 +194,8 @@ assertTrue(s.getTopReaderContext().isAtomic); QueryUtils.check(random, dq, s); final Weight dw = s.createNormalizedWeight(dq); - final Scorer ds = dw.scorer((AtomicReaderContext)s.getTopReaderContext(), ScorerContext.def()); + AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext(); + final Scorer ds = dw.scorer(context, new ScorerContext(context.reader.getLiveDocs())); assertTrue("firsttime skipTo found no match", ds.advance(3) != DocIdSetIterator.NO_MORE_DOCS); assertEquals("found wrong docid", "d4", r.document(ds.docID()).get("id")); Index: lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (working copy) @@ -153,7 +153,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - final Scorer cs = scorer(context, ScorerContext.def()); + final Scorer cs = scorer(context, new ScorerContext(context.reader.getLiveDocs())); final boolean exists = (cs != null && cs.advance(doc) == doc); final ComplexExplanation result = new ComplexExplanation(); Index: lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (working copy) @@ -138,8 +138,9 @@ public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { Scorer[] scorers = new Scorer[weights.size()]; int idx = 0; + ScorerContext subContext = new ScorerContext(scorerContext.acceptDocs); for (Weight w : weights) { - Scorer subScorer = w.scorer(context, ScorerContext.def()); + Scorer subScorer = w.scorer(context, subContext); if (subScorer != null && subScorer.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { scorers[idx++] = subScorer; } Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (working copy) @@ -148,13 +148,13 @@ @Override public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { - return new PayloadNearSpanScorer(query.getSpans(context), this, + return new PayloadNearSpanScorer(query.getSpans(context, scorerContext), this, similarity, similarity.sloppyDocScorer(stats, query.getField(), context)); } @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - PayloadNearSpanScorer scorer = (PayloadNearSpanScorer) scorer(context, ScorerContext.def()); + PayloadNearSpanScorer scorer = (PayloadNearSpanScorer) scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer != null) { int newDoc = scorer.advance(doc); if (newDoc == doc) { Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (working copy) @@ -80,7 +80,7 @@ @Override public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { - return new PayloadTermSpanScorer((TermSpans) query.getSpans(context), + return new PayloadTermSpanScorer((TermSpans) query.getSpans(context, scorerContext), this, similarity.sloppyDocScorer(stats, query.getField(), context)); } @@ -174,7 +174,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - PayloadTermSpanScorer scorer = (PayloadTermSpanScorer) scorer(context, ScorerContext.def()); + PayloadTermSpanScorer scorer = (PayloadTermSpanScorer) scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer != null) { int newDoc = scorer.advance(doc); if (newDoc == doc) { Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (working copy) @@ -35,6 +35,7 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanOrQuery; import org.apache.lucene.search.spans.SpanQuery; @@ -176,7 +177,7 @@ throws IOException { final AtomicReaderContext[] leaves = ReaderUtil.leaves(context); for (AtomicReaderContext atomicReaderContext : leaves) { - final Spans spans = query.getSpans(atomicReaderContext); + final Spans spans = query.getSpans(atomicReaderContext, new ScorerContext(atomicReaderContext.reader.getLiveDocs())); while (spans.next() == true) { if (spans.isPayloadAvailable()) { Collection payload = spans.getPayload(); Index: lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java (working copy) @@ -17,6 +17,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.Spans; import org.apache.lucene.util.FixedBitSet; @@ -61,7 +62,7 @@ public SpanFilterResult bitSpans(AtomicReaderContext context) throws IOException { final FixedBitSet bits = new FixedBitSet(context.reader.maxDoc()); - Spans spans = query.getSpans(context); + Spans spans = query.getSpans(context, new ScorerContext(context.reader.getLiveDocs())); List tmp = new ArrayList(20); int currentDoc = -1; SpanFilterResult.PositionInfo currentInfo = null; Index: lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ArrayUtil; import java.io.IOException; @@ -77,11 +78,11 @@ private SpanNearQuery query; private boolean collectPayloads = true; - public NearSpansOrdered(SpanNearQuery spanNearQuery, AtomicReaderContext context) throws IOException { - this(spanNearQuery, context, true); + public NearSpansOrdered(SpanNearQuery spanNearQuery, AtomicReaderContext context, ScorerContext scorerContext) throws IOException { + this(spanNearQuery, context, scorerContext, true); } - public NearSpansOrdered(SpanNearQuery spanNearQuery, AtomicReaderContext context, boolean collectPayloads) + public NearSpansOrdered(SpanNearQuery spanNearQuery, AtomicReaderContext context, ScorerContext scorerContext, boolean collectPayloads) throws IOException { if (spanNearQuery.getClauses().length < 2) { throw new IllegalArgumentException("Less than 2 clauses: " @@ -94,7 +95,7 @@ matchPayload = new LinkedList(); subSpansByDoc = new Spans[clauses.length]; for (int i = 0; i < clauses.length; i++) { - subSpans[i] = clauses[i].getSpans(context); + subSpans[i] = clauses[i].getSpans(context, scorerContext); subSpansByDoc[i] = subSpans[i]; // used in toSameDoc() } query = spanNearQuery; // kept for toString() only. Index: lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.PriorityQueue; import java.io.IOException; @@ -131,7 +132,7 @@ } - public NearSpansUnordered(SpanNearQuery query, AtomicReaderContext context) + public NearSpansUnordered(SpanNearQuery query, AtomicReaderContext context, ScorerContext scorerContext) throws IOException { this.query = query; this.slop = query.getSlop(); @@ -141,7 +142,7 @@ subSpans = new Spans[clauses.length]; for (int i = 0; i < clauses.length; i++) { SpansCell cell = - new SpansCell(clauses[i].getSpans(context), i); + new SpansCell(clauses[i].getSpans(context, scorerContext), i); ordered.add(cell); subSpans[i] = cell.spans; } Index: lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (working copy) @@ -26,6 +26,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.Weight; import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ToStringUtils; /** @@ -92,8 +93,8 @@ // ...this is done to be more consistent with things like SpanFirstQuery @Override - public Spans getSpans(AtomicReaderContext context) throws IOException { - return maskedQuery.getSpans(context); + public Spans getSpans(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { + return maskedQuery.getSpans(context, scorerContext); } @Override Index: lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ToStringUtils; import java.io.IOException; @@ -75,12 +76,12 @@ } @Override - public Spans getSpans(final AtomicReaderContext context) throws IOException { + public Spans getSpans(final AtomicReaderContext context, final ScorerContext scorerContext) throws IOException { return new Spans() { - private Spans includeSpans = include.getSpans(context); + private Spans includeSpans = include.getSpans(context, scorerContext); private boolean moreInclude = true; - private Spans excludeSpans = exclude.getSpans(context); + private Spans excludeSpans = exclude.getSpans(context, scorerContext); private boolean moreExclude = excludeSpans.next(); @Override Index: lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (working copy) @@ -68,12 +68,12 @@ @Override public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { - return new SpanScorer(query.getSpans(context), this, similarity.sloppyDocScorer(stats, query.getField(), context)); + return new SpanScorer(query.getSpans(context, scorerContext), this, similarity.sloppyDocScorer(stats, query.getField(), context)); } @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - Scorer scorer = scorer(context, ScorerContext.def()); + Scorer scorer = scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer != null) { int newDoc = scorer.advance(doc); if (newDoc == doc) { Index: lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; +import org.apache.lucene.search.Weight.ScorerContext; import java.io.IOException; import java.util.ArrayList; @@ -81,8 +82,8 @@ protected abstract AcceptStatus acceptPosition(Spans spans) throws IOException; @Override - public Spans getSpans(final AtomicReaderContext context) throws IOException { - return new PositionCheckSpan(context); + public Spans getSpans(final AtomicReaderContext context, ScorerContext scorerContext) throws IOException { + return new PositionCheckSpan(context, scorerContext); } @@ -106,8 +107,8 @@ protected class PositionCheckSpan extends Spans { private Spans spans; - public PositionCheckSpan(AtomicReaderContext context) throws IOException { - spans = match.getSpans(context); + public PositionCheckSpan(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { + spans = match.getSpans(context, scorerContext); } @Override Index: lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ToStringUtils; import java.io.IOException; @@ -81,9 +82,9 @@ } @Override - public Spans getSpans(final AtomicReaderContext context) throws IOException { + public Spans getSpans(final AtomicReaderContext context, ScorerContext scorerContext) throws IOException { final IndexReader reader = context.reader; - final DocsAndPositionsEnum postings = reader.termPositionsEnum(reader.getLiveDocs(), + final DocsAndPositionsEnum postings = reader.termPositionsEnum(scorerContext.acceptDocs, term.field(), term.bytes()); Index: lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java (working copy) @@ -23,12 +23,13 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Weight; +import org.apache.lucene.search.Weight.ScorerContext; /** Base class for span-based queries. */ public abstract class SpanQuery extends Query { /** Expert: Returns the matches for this query in an index. Used internally * to search for spans. */ - public abstract Spans getSpans(AtomicReaderContext context) throws IOException; + public abstract Spans getSpans(AtomicReaderContext context, ScorerContext scorerContext) throws IOException; /** Returns the name of the field matched by this query.*/ public abstract String getField(); Index: lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (working copy) @@ -31,6 +31,7 @@ import org.apache.lucene.util.PriorityQueue; import org.apache.lucene.util.ToStringUtils; import org.apache.lucene.search.Query; +import org.apache.lucene.search.Weight.ScorerContext; /** Matches the union of its clauses.*/ public class SpanOrQuery extends SpanQuery implements Cloneable { @@ -163,9 +164,9 @@ } @Override - public Spans getSpans(final AtomicReaderContext context) throws IOException { + public Spans getSpans(final AtomicReaderContext context, final ScorerContext scorerContext) throws IOException { if (clauses.size() == 1) // optimize 1-clause case - return (clauses.get(0)).getSpans(context); + return (clauses.get(0)).getSpans(context, scorerContext); return new Spans() { private SpanQueue queue = null; @@ -174,7 +175,7 @@ queue = new SpanQueue(clauses.size()); Iterator i = clauses.iterator(); while (i.hasNext()) { - Spans spans = i.next().getSpans(context); + Spans spans = i.next().getSpans(context, scorerContext); if ( ((target == -1) && spans.next()) || ((target != -1) && spans.skipTo(target))) { queue.add(spans); Index: lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java (working copy) @@ -27,6 +27,7 @@ import org.apache.lucene.search.TopTermsRewrite; import org.apache.lucene.search.ScoringRewrite; import org.apache.lucene.search.BooleanClause.Occur; // javadocs only +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.TermContext; /** @@ -89,7 +90,7 @@ } @Override - public Spans getSpans(AtomicReaderContext context) throws IOException { + public Spans getSpans(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { throw new UnsupportedOperationException("Query should have been rewritten"); } Index: lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (working copy) @@ -30,6 +30,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; +import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ToStringUtils; /** Matches spans which are near one another. One can specify slop, the @@ -117,16 +118,16 @@ } @Override - public Spans getSpans(final AtomicReaderContext context) throws IOException { + public Spans getSpans(final AtomicReaderContext context, ScorerContext scorerContext) throws IOException { if (clauses.size() == 0) // optimize 0-clause case - return new SpanOrQuery(getClauses()).getSpans(context); + return new SpanOrQuery(getClauses()).getSpans(context, scorerContext); if (clauses.size() == 1) // optimize 1-clause case - return clauses.get(0).getSpans(context); + return clauses.get(0).getSpans(context, scorerContext); return inOrder - ? (Spans) new NearSpansOrdered(this, context, collectPayloads) - : (Spans) new NearSpansUnordered(this, context); + ? (Spans) new NearSpansOrdered(this, context, scorerContext, collectPayloads) + : (Spans) new NearSpansUnordered(this, context, scorerContext); } @Override Index: lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (working copy) @@ -167,7 +167,7 @@ public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { assert !termArrays.isEmpty(); final IndexReader reader = context.reader; - final Bits liveDocs = reader.getLiveDocs(); + final Bits liveDocs = scorerContext.acceptDocs; PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()]; @@ -227,7 +227,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - Scorer scorer = scorer(context, ScorerContext.def()); + Scorer scorer = scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer != null) { int newDoc = scorer.advance(doc); if (newDoc == doc) { Index: lucene/src/java/org/apache/lucene/search/FilteredQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/FilteredQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/FilteredQuery.java (working copy) @@ -107,7 +107,7 @@ @Override public Scorer scorer(AtomicReaderContext context, ScorerContext scoreContext) throws IOException { - final Scorer scorer = weight.scorer(context, ScorerContext.def()); + final Scorer scorer = weight.scorer(context, new ScorerContext(scoreContext.acceptDocs)); if (scorer == null) { return null; } Index: lucene/src/java/org/apache/lucene/search/BooleanQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/BooleanQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/BooleanQuery.java (working copy) @@ -238,7 +238,7 @@ for (Iterator wIter = weights.iterator(); wIter.hasNext();) { Weight w = wIter.next(); BooleanClause c = cIter.next(); - if (w.scorer(context, ScorerContext.def().scoreDocsInOrder(true).topScorer(true)) == null) { + if (w.scorer(context, new ScorerContext(true, true, context.reader.getLiveDocs())) == null) { if (c.isRequired()) { fail = true; Explanation r = new Explanation(0.0f, "no match on required clause (" + c.getQuery().toString() + ")"); @@ -310,9 +310,10 @@ List prohibited = new ArrayList(); List optional = new ArrayList(); Iterator cIter = clauses.iterator(); + ScorerContext subContext = new ScorerContext(scorerContext.acceptDocs); for (Weight w : weights) { BooleanClause c = cIter.next(); - Scorer subScorer = w.scorer(context, ScorerContext.def()); + Scorer subScorer = w.scorer(context, subContext); if (subScorer == null) { if (c.isRequired()) { return null; Index: lucene/src/java/org/apache/lucene/search/PhraseQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/PhraseQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/PhraseQuery.java (working copy) @@ -215,7 +215,7 @@ public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException { assert !terms.isEmpty(); final IndexReader reader = context.reader; - final Bits liveDocs = reader.getLiveDocs(); + final Bits liveDocs = scorerContext.acceptDocs; PostingsAndFreq[] postingsFreqs = new PostingsAndFreq[terms.size()]; for (int i = 0; i < terms.size(); i++) { final Term t = terms.get(i); @@ -267,7 +267,7 @@ @Override public Explanation explain(AtomicReaderContext context, int doc) throws IOException { - Scorer scorer = scorer(context, ScorerContext.def()); + Scorer scorer = scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer != null) { int newDoc = scorer.advance(doc); if (newDoc == doc) { Index: lucene/src/java/org/apache/lucene/search/TermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TermQuery.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/TermQuery.java (working copy) @@ -80,7 +80,7 @@ return null; } // TODO should we reuse the DocsEnum here? - final DocsEnum docs = termsEnum.docs(context.reader.getLiveDocs(), null); + final DocsEnum docs = termsEnum.docs(scorerContext.acceptDocs, null); assert docs != null; return new TermScorer(this, docs, createDocScorer(context)); } Index: lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (working copy) @@ -56,7 +56,7 @@ return new DocIdSet() { @Override public DocIdSetIterator iterator() throws IOException { - return weight.scorer(privateContext, ScorerContext.def()); + return weight.scorer(privateContext, new ScorerContext(privateContext.reader.getLiveDocs())); } @Override public boolean isCacheable() { return false; } Index: lucene/src/java/org/apache/lucene/search/IndexSearcher.java =================================================================== --- lucene/src/java/org/apache/lucene/search/IndexSearcher.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/IndexSearcher.java (working copy) @@ -569,12 +569,11 @@ // TODO: should we make this // threaded...? the Collector could be sync'd? - ScorerContext scorerContext = ScorerContext.def().scoreDocsInOrder(true).topScorer(true); // always use single thread: if (filter == null) { for (int i = 0; i < leaves.length; i++) { // search each subreader collector.setNextReader(leaves[i]); - scorerContext = scorerContext.scoreDocsInOrder(!collector.acceptsDocsOutOfOrder()); + ScorerContext scorerContext = new ScorerContext(!collector.acceptsDocsOutOfOrder(), true, leaves[i].reader.getLiveDocs()); Scorer scorer = weight.scorer(leaves[i], scorerContext); if (scorer != null) { scorer.score(collector); @@ -593,7 +592,7 @@ assert filter != null; - Scorer scorer = weight.scorer(context, ScorerContext.def()); + Scorer scorer = weight.scorer(context, new ScorerContext(context.reader.getLiveDocs())); if (scorer == null) { return; } Index: lucene/src/java/org/apache/lucene/search/Weight.java =================================================================== --- lucene/src/java/org/apache/lucene/search/Weight.java (revision 1177055) +++ lucene/src/java/org/apache/lucene/search/Weight.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexReader.ReaderContext; import org.apache.lucene.search.similarities.SimilarityProvider; +import org.apache.lucene.util.Bits; /** * Expert: Calculate query weights and build query scorers. @@ -110,14 +111,7 @@ /** * A struct like class encapsulating a scorer's context variables. - * ScorerContex is a strictly immutable struct that follows a - * create on modification pattern. If a context variable changes - * through one of the modifiers like {@link #topScorer(boolean)} a new - * {@link ScorerContext} instance is creates. If the modifier call doesn't - * change the instance the method call has no effect and the same instance is - * returned from the modifier. - * - * @lucene.experimental + * @lucene.internal */ public static final class ScorerContext { @@ -130,17 +124,16 @@ * is recommended to request an in-order scorer if use of these methods is * required. */ - public final boolean scoreDocsInOrder; + public boolean scoreDocsInOrder; /** * if true, {@link Scorer#score(Collector)} will be called; if * false, {@link Scorer#nextDoc()} and/or {@link Scorer#advance(int)} will * be called instead. */ - public final boolean topScorer; + public boolean topScorer; - - private static final ScorerContext DEFAULT_CONTEXT = new ScorerContext(true, false); + public Bits acceptDocs; /** * Returns a default {@link ScorerContext} template initialized with: @@ -149,41 +142,14 @@ *
  • {@link #topScorer} = false
    • * */ - public static ScorerContext def() { - return DEFAULT_CONTEXT; + public ScorerContext(Bits acceptDocs) { + this(true, false, acceptDocs); } - private ScorerContext(boolean scoreDocsInOrder, boolean topScorer) { + public ScorerContext(boolean scoreDocsInOrder, boolean topScorer, Bits acceptDocs) { this.scoreDocsInOrder = scoreDocsInOrder; this.topScorer = topScorer; + this.acceptDocs = acceptDocs; } - - /** - * Creates and returns a copy of this context with the given value for - * {@link #scoreDocsInOrder} and returns a new instance of - * {@link ScorerContext} iff the given value differs from the - * {@link #scoreDocsInOrder}. Otherwise, this method has no effect and - * returns this instance. - */ - public ScorerContext scoreDocsInOrder(boolean scoreDocsInOrder) { - if (this.scoreDocsInOrder == scoreDocsInOrder) { - return this; - } - return new ScorerContext(scoreDocsInOrder, topScorer); - } - - /** - * Creates and returns a copy of this context with the given value for - * {@link #topScorer} and returns a new instance of - * {@link ScorerContext} iff the given value differs from the - * {@link #topScorer}. Otherwise, this method has no effect and - * returns this instance. - */ - public ScorerContext topScorer(boolean topScorer) { - if (this.topScorer == topScorer) { - return this; - } - return new ScorerContext(scoreDocsInOrder, topScorer); - } } } Index: lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java =================================================================== --- lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java (revision 1177055) +++ lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java (working copy) @@ -33,6 +33,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.RAMDirectory; +import org.apache.lucene.util.Bits; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ReaderUtil; import org.apache.lucene.util._TestUtil; @@ -256,7 +257,8 @@ try { if (scorer == null) { Weight w = s.createNormalizedWeight(q); - scorer = w.scorer(readerContextArray[leafPtr], ScorerContext.def()); + AtomicReaderContext context = readerContextArray[leafPtr]; + scorer = w.scorer(context, new ScorerContext(context.reader.getLiveDocs())); } int op = order[(opidx[0]++) % order.length]; @@ -301,7 +303,8 @@ final IndexReader previousReader = lastReader[0]; IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader); Weight w = indexSearcher.createNormalizedWeight(q); - Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def()); + AtomicReaderContext ctx = (AtomicReaderContext)indexSearcher.getTopReaderContext(); + Scorer scorer = w.scorer(ctx, new ScorerContext(ctx.reader.getLiveDocs())); if (scorer != null) { boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS; Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more); @@ -327,7 +330,8 @@ final IndexReader previousReader = lastReader[0]; IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader, false); Weight w = indexSearcher.createNormalizedWeight(q); - Scorer scorer = w.scorer((AtomicReaderContext)previousReader.getTopReaderContext(), ScorerContext.def()); + AtomicReaderContext ctx = (AtomicReaderContext)previousReader.getTopReaderContext(); + Scorer scorer = w.scorer(ctx, new ScorerContext(ctx.reader.getLiveDocs())); if (scorer != null) { boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS; Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more); @@ -347,6 +351,7 @@ s.search(q,new Collector() { private Scorer scorer; private int leafPtr; + private Bits liveDocs; @Override public void setScorer(Scorer scorer) throws IOException { this.scorer = scorer; @@ -358,7 +363,7 @@ long startMS = System.currentTimeMillis(); for (int i=lastDoc[0]+1; i<=doc; i++) { Weight w = s.createNormalizedWeight(q); - Scorer scorer = w.scorer(context[leafPtr], ScorerContext.def()); + Scorer scorer = w.scorer(context[leafPtr], new ScorerContext(liveDocs)); Assert.assertTrue("query collected "+doc+" but skipTo("+i+") says no more docs!",scorer.advance(i) != DocIdSetIterator.NO_MORE_DOCS); Assert.assertEquals("query collected "+doc+" but skipTo("+i+") got to "+scorer.docID(),doc,scorer.docID()); float skipToScore = scorer.score(); @@ -385,7 +390,7 @@ final IndexReader previousReader = lastReader[0]; IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader); Weight w = indexSearcher.createNormalizedWeight(q); - Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def()); + Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), new ScorerContext(previousReader.getLiveDocs())); if (scorer != null) { boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS; Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more); @@ -396,6 +401,7 @@ lastReader[0] = context.reader; lastDoc[0] = -1; + liveDocs = context.reader.getLiveDocs(); } @Override public boolean acceptsDocsOutOfOrder() { @@ -409,7 +415,7 @@ final IndexReader previousReader = lastReader[0]; IndexSearcher indexSearcher = LuceneTestCase.newSearcher(previousReader); Weight w = indexSearcher.createNormalizedWeight(q); - Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), ScorerContext.def()); + Scorer scorer = w.scorer((AtomicReaderContext)indexSearcher.getTopReaderContext(), new ScorerContext(previousReader.getLiveDocs())); if (scorer != null) { boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS; Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);