Index: lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java =================================================================== --- lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (revision 1057591) +++ lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (working copy) @@ -28,6 +28,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext;; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Collector; import org.apache.lucene.search.IndexSearcher; @@ -160,9 +161,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { - this.docBase = docBase; + this.docBase = context.docBase; } @Override Index: lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java =================================================================== --- lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (revision 1057591) +++ lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (working copy) @@ -36,6 +36,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermPositionVector; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Collector; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; @@ -133,9 +134,9 @@ } @Override - public void setNextReader(IndexReader indexreader, int i) + public void setNextReader(AtomicReaderContext context) throws IOException { - this.baseDoc = i; + this.baseDoc = context.docBase; } @Override Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java =================================================================== --- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java (revision 1057591) +++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java (working copy) @@ -20,8 +20,8 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.LuceneTestCase; /** @@ -67,7 +67,7 @@ @Override public void setScorer(Scorer scorer) {} @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; } @Override Index: lucene/contrib/lucli/src/java/lucli/LuceneMethods.java =================================================================== --- lucene/contrib/lucli/src/java/lucli/LuceneMethods.java (revision 1057591) +++ lucene/contrib/lucli/src/java/lucli/LuceneMethods.java (working copy) @@ -41,6 +41,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Fields; @@ -232,7 +233,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; Index: lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java =================================================================== --- lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (revision 1057591) +++ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (working copy) @@ -38,6 +38,7 @@ import org.apache.lucene.document.FieldSelector; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.FieldsEnum; @@ -443,7 +444,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) { } + public void setNextReader(AtomicReaderContext context) { } }); float score = scores[0]; return score; Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (revision 1057591) +++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Collector; import org.apache.lucene.search.DefaultSimilarity; import org.apache.lucene.search.IndexSearcher; @@ -122,7 +123,7 @@ scores[doc + docBase] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override @@ -157,7 +158,7 @@ scores[doc + docBase] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override @@ -209,7 +210,7 @@ scores[doc + docBase] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override Index: lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (revision 1057591) +++ lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (working copy) @@ -25,6 +25,7 @@ import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.FieldNormModifier; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiNorms; import org.apache.lucene.index.Term; @@ -139,7 +140,7 @@ scores[doc + docBase] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override @@ -181,7 +182,7 @@ scores[doc + docBase] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java (revision 1057591) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; @@ -77,7 +77,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { this.docBase = docBase; } Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java (revision 1057591) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Filter; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparatorSource; @@ -108,16 +108,14 @@ } - @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) - throws IOException { - - // each reader in a segmented base - // has an offset based on the maxDocs of previous readers - offset = docBase; - - return this; - } + @Override + public FieldComparator setNextReader(AtomicReaderContext context) + throws IOException { + // each reader in a segmented base + // has an offset based on the maxDocs of previous readers + offset = context.docBase; + return this; + } @Override public Comparable value(int slot) { Index: lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java =================================================================== --- lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java (revision 1057591) +++ lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java (working copy) @@ -32,6 +32,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.search.Collector; import org.apache.lucene.search.IndexSearcher; @@ -192,7 +193,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; Index: lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java =================================================================== --- lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (revision 1057591) +++ lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynExpand.java (working copy) @@ -33,6 +33,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Collector; @@ -160,9 +161,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { - this.reader = reader; + this.reader = context.reader; } @Override Index: lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java =================================================================== --- lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (revision 1057591) +++ lucene/contrib/wordnet/src/java/org/apache/lucene/wordnet/SynLookup.java (working copy) @@ -32,6 +32,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Collector; @@ -59,7 +60,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; @@ -169,9 +170,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { - this.reader = reader; + this.reader = context.reader; } @Override Index: lucene/src/java/org/apache/lucene/search/BooleanScorer.java =================================================================== --- lucene/src/java/org/apache/lucene/search/BooleanScorer.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/BooleanScorer.java (working copy) @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.List; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.BooleanClause.Occur; /* Description from Doug Cutting (excerpted from @@ -92,7 +92,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { // not needed by this implementation } Index: lucene/src/java/org/apache/lucene/search/Collector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/Collector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/Collector.java (working copy) @@ -19,7 +19,8 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.index.IndexReader.ReaderContext; /** *

Expert: Collectors are primarily meant to be used to @@ -98,8 +99,8 @@ * bits.set(doc + docBase); * } * - * public void setNextReader(IndexReader reader, int docBase) { - * this.docBase = docBase; + * public void setNextReader(AtomicReaderContext context) { + * this.docBase = context.docBase; * } * }); * @@ -143,17 +144,16 @@ public abstract void collect(int doc) throws IOException; /** - * Called before collecting from each IndexReader. All doc ids in - * {@link #collect(int)} will correspond to reader. + * Called before collecting from each {@link AtomicReaderContext}. All doc ids in + * {@link #collect(int)} will correspond to {@link ReaderContext#reader}. * - * Add docBase to the current IndexReaders internal document id to re-base ids - * in {@link #collect(int)}. + * Add {@link AtomicReaderContext#docBase} to the current {@link ReaderContext#reader}'s + * internal document id to re-base ids in {@link #collect(int)}. * - * @param reader - * next IndexReader - * @param docBase + * @param context + * next atomic reader context */ - public abstract void setNextReader(IndexReader reader, int docBase) throws IOException; + public abstract void setNextReader(AtomicReaderContext context) throws IOException; /** * Return true if this collector does not Index: lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (revision 1057595) +++ lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (working copy) @@ -222,8 +222,8 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - collector.setNextReader(reader, docBase); + public void setNextReader(AtomicReaderContext context) throws IOException { + collector.setNextReader(context); } @Override Index: lucene/src/java/org/apache/lucene/search/FieldComparator.java =================================================================== --- lucene/src/java/org/apache/lucene/search/FieldComparator.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/FieldComparator.java (working copy) @@ -21,7 +21,7 @@ import java.text.Collator; import java.util.Locale; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.FieldCache.DocTermsIndex; import org.apache.lucene.search.FieldCache.DocTerms; import org.apache.lucene.search.cache.ByteValuesCreator; @@ -82,7 +82,7 @@ * priority queue. The {@link FieldValueHitQueue} * calls this method when a new hit is competitive. * - *

  • {@link #setNextReader} Invoked + *
  • {@link #setNextReader(AtomicReaderContext)} Invoked * when the search is switching to the next segment. * You may need to update internal state of the * comparator, for example retrieving new values from @@ -150,19 +150,18 @@ public abstract void copy(int slot, int doc) throws IOException; /** - * Set a new Reader. All subsequent docIDs are relative to + * Set a new {@link AtomicReaderContext}. All subsequent docIDs are relative to * the current reader (you must add docBase if you need to * map it to a top-level docID). * - * @param reader current reader - * @param docBase docBase of this reader + * @param context current reader context * @return the comparator to use for this segment; most * comparators can just return "this" to reuse the same * comparator across segments * @throws IOException * @throws IOException */ - public abstract FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException; + public abstract FieldComparator setNextReader(AtomicReaderContext context) throws IOException; /** Sets the Scorer to use in case a document's score is * needed. @@ -242,8 +241,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup(FieldCache.DEFAULT.getBytes(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup(FieldCache.DEFAULT.getBytes(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -314,8 +313,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup(FieldCache.DEFAULT.getDoubles(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup(FieldCache.DEFAULT.getDoubles(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -388,8 +387,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup(FieldCache.DEFAULT.getFloats(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup(FieldCache.DEFAULT.getFloats(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -444,8 +443,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup( FieldCache.DEFAULT.getShorts(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup( FieldCache.DEFAULT.getShorts(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -522,8 +521,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup(FieldCache.DEFAULT.getInts(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup(FieldCache.DEFAULT.getInts(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -597,8 +596,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - setup(FieldCache.DEFAULT.getLongs(reader, creator.field, creator)); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + setup(FieldCache.DEFAULT.getLongs(context.reader, creator.field, creator)); docValues = cached.values; return this; } @@ -648,7 +647,7 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) { + public FieldComparator setNextReader(AtomicReaderContext context) { return this; } @@ -700,11 +699,11 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) { + public FieldComparator setNextReader(AtomicReaderContext context) { // TODO: can we "map" our docIDs to the current // reader? saves having to then subtract on every // compare call - this.docBase = docBase; + this.docBase = context.docBase; return this; } @@ -781,8 +780,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - currentDocTerms = FieldCache.DEFAULT.getTerms(reader, field); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader, field); return this; } @@ -876,8 +875,8 @@ abstract class PerSegmentComparator extends FieldComparator { @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - return TermOrdValComparator.this.setNextReader(reader, docBase); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + return TermOrdValComparator.this.setNextReader(context); } @Override @@ -1142,8 +1141,9 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - termsIndex = FieldCache.DEFAULT.getTermsIndex(reader, field); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + final int docBase = context.docBase; + termsIndex = FieldCache.DEFAULT.getTermsIndex(context.reader, field); final PackedInts.Reader docToOrd = termsIndex.getDocToOrd(); FieldComparator perSegComp; if (docToOrd instanceof Direct8) { @@ -1257,8 +1257,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - docTerms = FieldCache.DEFAULT.getTerms(reader, field); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + docTerms = FieldCache.DEFAULT.getTerms(context.reader, field); return this; } Index: lucene/src/java/org/apache/lucene/search/IndexSearcher.java =================================================================== --- lucene/src/java/org/apache/lucene/search/IndexSearcher.java (revision 1057595) +++ lucene/src/java/org/apache/lucene/search/IndexSearcher.java (working copy) @@ -486,7 +486,7 @@ // always use single thread: if (filter == null) { for (int i = 0; i < leafContexts.length; i++) { // search each subreader - collector.setNextReader(leafContexts[i].reader, leafContexts[i].docBase); + collector.setNextReader(leafContexts[i]); Scorer scorer = weight.scorer(leafContexts[i], !collector.acceptsDocsOutOfOrder(), true); if (scorer != null) { scorer.score(collector); @@ -494,7 +494,7 @@ } } else { for (int i = 0; i < leafContexts.length; i++) { // search each subreader - collector.setNextReader(leafContexts[i].reader, leafContexts[i].docBase); + collector.setNextReader(leafContexts[i]); searchWithFilter(leafContexts[i], weight, filter, collector); } } Index: lucene/src/java/org/apache/lucene/search/MultiCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/MultiCollector.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; @@ -108,9 +108,9 @@ } @Override - public void setNextReader(IndexReader reader, int o) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { for (Collector c : collectors) { - c.setNextReader(reader, o); + c.setNextReader(context); } } Index: lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; /** * A {@link Collector} implementation which wraps another @@ -43,8 +43,8 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - c.setNextReader(reader, docBase); + public void setNextReader(AtomicReaderContext context) throws IOException { + c.setNextReader(context); } @Override Index: lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/TimeLimitingCollector.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.ThreadInterruptedException; /** @@ -213,9 +213,9 @@ } @Override - public void setNextReader(IndexReader reader, int base) throws IOException { - collector.setNextReader(reader, base); - this.docBase = base; + public void setNextReader(AtomicReaderContext context) throws IOException { + collector.setNextReader(context); + this.docBase = context.docBase; } @Override Index: lucene/src/java/org/apache/lucene/search/TopFieldCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TopFieldCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/TopFieldCollector.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.FieldValueHitQueue.Entry; import org.apache.lucene.util.PriorityQueue; @@ -92,9 +92,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - this.docBase = docBase; - queue.setComparator(0, comparator.setNextReader(reader, docBase)); + public void setNextReader(AtomicReaderContext context) throws IOException { + this.docBase = context.docBase; + queue.setComparator(0, comparator.setNextReader(context)); comparator = queue.firstComparator; } @@ -447,10 +447,10 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - this.docBase = docBase; + public void setNextReader(AtomicReaderContext context) throws IOException { + this.docBase = context.docBase; for (int i = 0; i < comparators.length; i++) { - queue.setComparator(i, comparators[i].setNextReader(reader, docBase)); + queue.setComparator(i, comparators[i].setNextReader(context)); } } Index: lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/TopScoreDocCollector.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; /** * A {@link Collector} implementation that collects the top-scoring hits, @@ -155,8 +155,8 @@ } @Override - public void setNextReader(IndexReader reader, int base) { - docBase = base; + public void setNextReader(AtomicReaderContext context) { + docBase = context.docBase; } @Override Index: lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java (revision 1057591) +++ lucene/src/java/org/apache/lucene/search/TotalHitCountCollector.java (working copy) @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; /** * Just counts the total number of hits. @@ -38,7 +38,7 @@ totalHits++; } - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { } public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/index/TestOmitTf.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestOmitTf.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/index/TestOmitTf.java (working copy) @@ -26,6 +26,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; @@ -414,7 +415,7 @@ public static int getSum() { return sum; } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { this.docBase = docBase; } @Override Index: lucene/src/test/org/apache/lucene/search/CheckHits.java =================================================================== --- lucene/src/test/org/apache/lucene/search/CheckHits.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/CheckHits.java (working copy) @@ -25,6 +25,7 @@ import junit.framework.Assert; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.store.Directory; public class CheckHits { @@ -120,8 +121,8 @@ bag.add(Integer.valueOf(doc + base)); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { @@ -483,8 +484,8 @@ verifyExplanation(d,doc,scorer.score(),deep,exp); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/search/JustCompileSearch.java =================================================================== --- lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (revision 1057595) +++ lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (working copy) @@ -44,7 +44,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } @@ -127,7 +127,7 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } @@ -300,7 +300,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } Index: lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java =================================================================== --- lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; import org.apache.lucene.util.LuceneTestCase; @@ -46,7 +46,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { setNextReaderCalled = true; } @@ -73,7 +73,7 @@ assertTrue(c instanceof MultiCollector); assertTrue(c.acceptsDocsOutOfOrder()); c.collect(1); - c.setNextReader(null, 0); + c.setNextReader(null); c.setScorer(null); } @@ -95,7 +95,7 @@ Collector c = MultiCollector.wrap(dcs); assertTrue(c.acceptsDocsOutOfOrder()); c.collect(1); - c.setNextReader(null, 0); + c.setNextReader(null); c.setScorer(null); for (DummyCollector dc : dcs) { Index: lucene/src/test/org/apache/lucene/search/QueryUtils.java =================================================================== --- lucene/src/test/org/apache/lucene/search/QueryUtils.java (revision 1057595) +++ lucene/src/test/org/apache/lucene/search/QueryUtils.java (working copy) @@ -220,7 +220,7 @@ */ public static void checkSkipTo(final Query q, final IndexSearcher s) throws IOException { //System.out.println("Checking "+q); - final AtomicReaderContext[] context = ReaderUtil.leaves(s.getTopReaderContext()); + final AtomicReaderContext[] readerContextArray = ReaderUtil.leaves(s.getTopReaderContext()); if (q.weight(s).scoresDocsOutOfOrder()) return; // in this case order of skipTo() might differ from that of next(). final int skip_op = 0; @@ -265,7 +265,7 @@ try { if (scorer == null) { Weight w = q.weight(s); - scorer = w.scorer(context[leafPtr], true, false); + scorer = w.scorer(readerContextArray[leafPtr], true, false); } int op = order[(opidx[0]++) % order.length]; @@ -303,7 +303,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { // confirm that skipping beyond the last doc, on the // previous reader, hits NO_MORE_DOCS if (lastReader[0] != null) { @@ -317,8 +317,8 @@ } leafPtr++; } - lastReader[0] = reader; - assert context[leafPtr].reader == reader; + lastReader[0] = context.reader; + assert readerContextArray[leafPtr].reader == context.reader; this.scorer = null; lastDoc[0] = -1; } @@ -385,7 +385,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { // confirm that skipping beyond the last doc, on the // previous reader, hits NO_MORE_DOCS if (lastReader[0] != null) { @@ -400,7 +400,7 @@ leafPtr++; } - lastReader[0] = reader; + lastReader[0] = context.reader; lastDoc[0] = -1; } @Override Index: lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (working copy) @@ -20,6 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -68,7 +69,7 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) { + public void setNextReader(AtomicReaderContext context) { } @Override Index: lucene/src/test/org/apache/lucene/search/TestDocBoost.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDocBoost.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestDocBoost.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.document.*; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -77,8 +78,8 @@ scores[doc + base] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/search/TestElevationComparator.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.*; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.FieldValueHitQueue.Entry; import org.apache.lucene.store.*; import org.apache.lucene.util.LuceneTestCase; @@ -177,8 +178,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - idIndex = FieldCache.DEFAULT.getTermsIndex(reader, fieldname); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + idIndex = FieldCache.DEFAULT.getTermsIndex(context.reader, fieldname); return this; } Index: lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -197,8 +198,8 @@ assertEquals("score for doc " + (doc + base) + " was not correct", 1.0f, scorer.score()); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.LuceneTestCase; public class TestScoreCachingWrappingScorer extends LuceneTestCase { @@ -76,7 +76,7 @@ ++idx; } - @Override public void setNextReader(IndexReader reader, int docBase) + @Override public void setNextReader(AtomicReaderContext context) throws IOException { } Index: lucene/src/test/org/apache/lucene/search/TestScorerPerf.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (revision 1057595) +++ lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (working copy) @@ -6,7 +6,6 @@ import java.util.BitSet; import java.io.IOException; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -110,8 +109,8 @@ public int getSum() { return sum; } @Override - public void setNextReader(IndexReader reader, int base) { - docBase = base; + public void setNextReader(AtomicReaderContext context) { + docBase = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/search/TestSetNorm.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSetNorm.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestSetNorm.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -74,8 +75,8 @@ scores[doc + base] = scorer.score(); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { Index: lucene/src/test/org/apache/lucene/search/TestSimilarity.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSimilarity.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestSimilarity.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -94,7 +95,7 @@ assertEquals(1.0f, scorer.score()); } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; @@ -118,8 +119,8 @@ assertEquals((float)doc+base+1, scorer.score()); } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override public boolean acceptsDocsOutOfOrder() { @@ -144,7 +145,7 @@ assertEquals(1.0f, scorer.score()); } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; @@ -165,7 +166,7 @@ assertEquals(2.0f, scorer.score()); } @Override - public void setNextReader(IndexReader reader, int docBase) {} + public void setNextReader(AtomicReaderContext context) {} @Override public boolean acceptsDocsOutOfOrder() { return true; Index: lucene/src/test/org/apache/lucene/search/TestSort.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSort.java (revision 1057595) +++ lucene/src/test/org/apache/lucene/search/TestSort.java (working copy) @@ -506,8 +506,8 @@ } @Override - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - docValues = FieldCache.DEFAULT.getInts(reader, "parser", new FieldCache.IntParser() { + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + docValues = FieldCache.DEFAULT.getInts(context.reader, "parser", new FieldCache.IntParser() { public final int parseInt(final BytesRef term) { return (term.bytes[term.offset]-'A') * 123456; } Index: lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.*; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.*; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Scorer.ScorerVisitor; @@ -126,10 +127,10 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { this.docBase = docBase; - other.setNextReader(reader, docBase); + other.setNextReader(context); } @Override Index: lucene/src/test/org/apache/lucene/search/TestTermScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermScorer.java (revision 1057595) +++ lucene/src/test/org/apache/lucene/search/TestTermScorer.java (working copy) @@ -98,8 +98,8 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) { - base = docBase; + public void setNextReader(AtomicReaderContext context) { + base = context.docBase; } @Override Index: lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException; @@ -339,8 +340,8 @@ } @Override - public void setNextReader(IndexReader reader, int base) { - docBase = base; + public void setNextReader(AtomicReaderContext context) { + docBase = context.docBase; } @Override Index: lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (revision 1057591) +++ lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -60,9 +61,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) + public void setNextReader(AtomicReaderContext context) throws IOException { - base = docBase; + base = context.docBase; } @Override Index: solr/src/java/org/apache/solr/handler/component/QueryComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/QueryComponent.java (revision 1057591) +++ solr/src/java/org/apache/solr/handler/component/QueryComponent.java (working copy) @@ -18,10 +18,13 @@ package org.apache.solr.handler.component; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.index.IndexReader.ReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.*; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.ReaderUtil; import org.apache.solr.cloud.CloudDescriptor; import org.apache.solr.cloud.ZkController; import org.apache.solr.common.SolrDocument; @@ -444,23 +447,21 @@ SortField[] sortFields = sort==null ? new SortField[]{SortField.FIELD_SCORE} : sort.getSort(); NamedList sortVals = new NamedList(); // order is important for the sort fields Field field = new Field("dummy", "", Field.Store.YES, Field.Index.NO); // a dummy Field - - SolrIndexReader reader = searcher.getReader(); - SolrIndexReader[] readers = reader.getLeafReaders(); - SolrIndexReader subReader = reader; - if (readers.length==1) { + ReaderContext topReaderContext = searcher.getTopReaderContext(); + AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext); + AtomicReaderContext currentLeaf = null; + if (leaves.length==1) { // if there is a single segment, use that subReader and avoid looking up each time - subReader = readers[0]; - readers=null; + currentLeaf = leaves[0]; + leaves=null; } - int[] offsets = reader.getLeafOffsets(); for (SortField sortField: sortFields) { int type = sortField.getType(); if (type==SortField.SCORE || type==SortField.DOC) continue; FieldComparator comparator = null; - FieldComparator comparators[] = (readers==null) ? null : new FieldComparator[readers.length]; + FieldComparator comparators[] = (leaves==null) ? null : new FieldComparator[leaves.length]; String fieldname = sortField.getField(); FieldType ft = fieldname==null ? null : req.getSchema().getFieldTypeNoEx(fieldname); @@ -469,26 +470,24 @@ ArrayList vals = new ArrayList(docList.size()); DocIterator it = rb.getResults().docList.iterator(); - int offset = 0; int idx = 0; while(it.hasNext()) { int doc = it.nextDoc(); - if (readers != null) { - idx = SolrIndexReader.readerIndex(doc, offsets); - subReader = readers[idx]; - offset = offsets[idx]; + if (leaves != null) { + idx = ReaderUtil.subIndex(doc, leaves); + currentLeaf = leaves[idx]; comparator = comparators[idx]; } if (comparator == null) { comparator = sortField.getComparator(1,0); - comparator = comparator.setNextReader(subReader, offset); + comparator = comparator.setNextReader(currentLeaf); if (comparators != null) comparators[idx] = comparator; } - doc -= offset; // adjust for what segment this is in + doc -= currentLeaf.docBase; // adjust for what segment this is in comparator.copy(0, doc); Object val = comparator.value(0); Index: solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (revision 1057591) +++ solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (working copy) @@ -43,6 +43,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; import org.apache.lucene.util.StringHelper; @@ -503,8 +504,8 @@ values[slot] = docVal(doc); } - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - idIndex = FieldCache.DEFAULT.getTermsIndex(reader, fieldname); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + idIndex = FieldCache.DEFAULT.getTermsIndex(context.reader, fieldname); return this; } Index: solr/src/java/org/apache/solr/handler/component/TermsComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/TermsComponent.java (revision 1057591) +++ solr/src/java/org/apache/solr/handler/component/TermsComponent.java (working copy) @@ -27,7 +27,6 @@ import org.apache.solr.schema.FieldType; import org.apache.solr.schema.StrField; import org.apache.solr.request.SimpleFacets.CountPair; -import org.apache.solr.search.SolrIndexReader; import org.apache.solr.util.BoundedTreeSet; import org.apache.solr.client.solrj.response.TermsResponse; @@ -103,8 +102,8 @@ boolean raw = params.getBool(TermsParams.TERMS_RAW, false); - SolrIndexReader sr = rb.req.getSearcher().getReader(); - Fields lfields = MultiFields.getFields(sr); + final IndexReader indexReader = rb.req.getSearcher().getTopReaderContext().reader; + Fields lfields = MultiFields.getFields(indexReader); for (String field : fields) { NamedList fieldTerms = new NamedList(); Index: solr/src/java/org/apache/solr/schema/RandomSortField.java =================================================================== --- solr/src/java/org/apache/solr/schema/RandomSortField.java (revision 1057591) +++ solr/src/java/org/apache/solr/schema/RandomSortField.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.*; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.search.QParser; @@ -89,7 +90,7 @@ // we use the top-level reader. return fieldName.hashCode() + base + (int)top.getVersion(); } - + @Override public SortField getSortField(SchemaField field, boolean reverse) { return new SortField(field.getName(), randomComparatorSource, reverse); @@ -127,8 +128,8 @@ values[slot] = hash(doc+seed); } - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - seed = getSeed(fieldname, reader); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + seed = getSeed(fieldname, context.reader); return this; } Index: solr/src/java/org/apache/solr/search/DocSetHitCollector.java =================================================================== --- solr/src/java/org/apache/solr/search/DocSetHitCollector.java (revision 1057591) +++ solr/src/java/org/apache/solr/search/DocSetHitCollector.java (working copy) @@ -20,7 +20,7 @@ import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; import org.apache.lucene.util.OpenBitSet; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import java.io.IOException; @@ -80,8 +80,8 @@ public void setScorer(Scorer scorer) throws IOException { } - public void setNextReader(IndexReader reader, int docBase) throws IOException { - this.base = docBase; + public void setNextReader(AtomicReaderContext context) throws IOException { + this.base = context.docBase; } public boolean acceptsDocsOutOfOrder() { @@ -135,8 +135,8 @@ collector.setScorer(scorer); } - public void setNextReader(IndexReader reader, int docBase) throws IOException { - collector.setNextReader(reader, docBase); - this.base = docBase; + public void setNextReader(AtomicReaderContext context) throws IOException { + collector.setNextReader(context); + this.base = context.docBase; } } Index: solr/src/java/org/apache/solr/search/Grouping.java =================================================================== --- solr/src/java/org/apache/solr/search/Grouping.java (revision 1057591) +++ solr/src/java/org/apache/solr/search/Grouping.java (working copy) @@ -17,7 +17,7 @@ package org.apache.solr.search; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.*; import org.apache.lucene.util.BytesRef; import org.apache.solr.common.util.NamedList; @@ -457,14 +457,15 @@ @Override public void collect(int doc) throws IOException { matches++; - if (filter.exists(doc + docBase)) + if (filter.exists(doc + docBase)) { collector.collect(doc); + } } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - this.docBase = docBase; - collector.setNextReader(reader, docBase); + public void setNextReader(AtomicReaderContext context) throws IOException { + docBase = context.docBase; + collector.setNextReader(context); } @Override @@ -685,13 +686,13 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - this.docBase = docBase; - docValues = vs.getValues(context, reader); + public void setNextReader(AtomicReaderContext readerContext) throws IOException { + this.docBase = readerContext.docBase; + docValues = vs.getValues(context, readerContext.reader); filler = docValues.getValueFiller(); mval = filler.getValue(); for (int i=0; i topscore[0]) topscore[0]=score; } - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { } public boolean acceptsDocsOutOfOrder() { return true; @@ -1249,7 +1248,7 @@ float score = scorer.score(); if (score > topscore[0]) topscore[0]=score; } - public void setNextReader(IndexReader reader, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext context) throws IOException { } public boolean acceptsDocsOutOfOrder() { return false; @@ -1570,21 +1569,21 @@ int base=0; int end=0; int readerIndex = -1; - SolrIndexReader r=null; - + + AtomicReaderContext leaf = null; - while(iter.hasNext()) { + for (int i = 0; i < leafContexts.length; i++) { int doc = iter.nextDoc(); while (doc>=end) { - r = reader.getLeafReaders()[++readerIndex]; - base = reader.getLeafOffsets()[readerIndex]; - end = base + r.maxDoc(); - topCollector.setNextReader(r, base); + leaf = leafContexts[i++]; + base = leaf.docBase; + end = base + leaf.reader.maxDoc(); + topCollector.setNextReader(leaf); // we should never need to set the scorer given the settings for the collector } topCollector.collect(doc-base); } - + TopDocs topDocs = topCollector.topDocs(0, nDocs); int nDocsReturned = topDocs.scoreDocs.length; Index: solr/src/java/org/apache/solr/search/function/ValueSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ValueSource.java (revision 1057595) +++ solr/src/java/org/apache/solr/search/function/ValueSource.java (working copy) @@ -187,8 +187,8 @@ values[slot] = docVals.doubleVal(doc); } - public FieldComparator setNextReader(IndexReader reader, int docBase) throws IOException { - docVals = getValues(Collections.emptyMap(), reader); + public FieldComparator setNextReader(AtomicReaderContext context) throws IOException { + docVals = getValues(Collections.emptyMap(), context.reader); return this; } Index: solr/src/java/org/apache/solr/update/UpdateHandler.java =================================================================== --- solr/src/java/org/apache/solr/update/UpdateHandler.java (revision 1057591) +++ solr/src/java/org/apache/solr/update/UpdateHandler.java (working copy) @@ -18,7 +18,7 @@ package org.apache.solr.update; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -167,7 +167,7 @@ } @Override - public void setNextReader(IndexReader arg0, int docBase) throws IOException { + public void setNextReader(AtomicReaderContext arg0) throws IOException { this.docBase = docBase; } Index: solr/src/test/org/apache/solr/search/TestDocSet.java =================================================================== --- solr/src/test/org/apache/solr/search/TestDocSet.java (revision 1057595) +++ solr/src/test/org/apache/solr/search/TestDocSet.java (working copy) @@ -406,7 +406,7 @@ } } - public void doFilterTest(SolrIndexReader reader) throws IOException { + public void doFilterTest(IndexReader reader) throws IOException { ReaderContext topLevelContext = reader.getTopReaderContext(); OpenBitSet bs = getRandomSet(reader.maxDoc(), rand.nextInt(reader.maxDoc()+1)); DocSet a = new BitDocSet(bs); @@ -450,8 +450,7 @@ for (int i=0; i<5000; i++) { IndexReader r = dummyMultiReader(maxSeg, maxDoc); - SolrIndexReader sir = new SolrIndexReader(r, null, 0); - doFilterTest(sir); + doFilterTest(r); } } } Index: solr/src/test/org/apache/solr/search/TestIndexSearcher.java =================================================================== --- solr/src/test/org/apache/solr/search/TestIndexSearcher.java (revision 1057591) +++ solr/src/test/org/apache/solr/search/TestIndexSearcher.java (working copy) @@ -16,6 +16,9 @@ */ package org.apache.solr.search; +import org.apache.lucene.index.IndexReader.AtomicReaderContext; +import org.apache.lucene.index.IndexReader.ReaderContext; +import org.apache.lucene.util.ReaderUtil; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.SchemaField; @@ -38,12 +41,12 @@ ValueSource vs = sf.getType().getValueSource(sf, null); Map context = ValueSource.newContext(sqr.getSearcher()); vs.createWeight(context, sqr.getSearcher()); - SolrIndexReader sr = sqr.getSearcher().getReader(); - int idx = SolrIndexReader.readerIndex(doc, sr.getLeafOffsets()); - int base = sr.getLeafOffsets()[idx]; - SolrIndexReader sub = sr.getLeafReaders()[idx]; - DocValues vals = vs.getValues(context, sub); - return vals.strVal(doc-base); + ReaderContext topReaderContext = sqr.getSearcher().getTopReaderContext(); + AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext); + int idx = ReaderUtil.subIndex(doc, leaves); + AtomicReaderContext leaf = leaves[idx]; + DocValues vals = vs.getValues(context, leaf.reader); + return vals.strVal(doc-leaf.docBase); } public void testReopen() throws Exception { @@ -53,7 +56,7 @@ assertU(commit()); SolrQueryRequest sr1 = req("q","foo"); - SolrIndexReader r1 = sr1.getSearcher().getReader(); + ReaderContext rCtx1 = sr1.getSearcher().getTopReaderContext(); String sval1 = getStringVal(sr1, "v_s",0); assertEquals("string1", sval1); @@ -63,33 +66,33 @@ assertU(commit()); SolrQueryRequest sr2 = req("q","foo"); - SolrIndexReader r2 = sr2.getSearcher().getReader(); + ReaderContext rCtx2 = sr2.getSearcher().getTopReaderContext(); // make sure the readers share the first segment // Didn't work w/ older versions of lucene2.9 going from segment -> multi - assertEquals(r1.getLeafReaders()[0], r2.getLeafReaders()[0]); + assertEquals(ReaderUtil.leaves(rCtx1)[0].reader, ReaderUtil.leaves(rCtx2)[0].reader); assertU(adoc("id","5", "v_f","3.14159")); assertU(adoc("id","6", "v_f","8983", "v_s","string6")); assertU(commit()); SolrQueryRequest sr3 = req("q","foo"); - SolrIndexReader r3 = sr3.getSearcher().getReader(); + ReaderContext rCtx3 = sr3.getSearcher().getTopReaderContext(); // make sure the readers share segments // assertEquals(r1.getLeafReaders()[0], r3.getLeafReaders()[0]); - assertEquals(r2.getLeafReaders()[0], r3.getLeafReaders()[0]); - assertEquals(r2.getLeafReaders()[1], r3.getLeafReaders()[1]); + assertEquals(ReaderUtil.leaves(rCtx2)[0].reader, ReaderUtil.leaves(rCtx3)[0].reader); + assertEquals(ReaderUtil.leaves(rCtx2)[1].reader, ReaderUtil.leaves(rCtx3)[1].reader); sr1.close(); sr2.close(); // should currently be 1, but this could change depending on future index management - int baseRefCount = r3.getRefCount(); + int baseRefCount = rCtx3.reader.getRefCount(); assertEquals(1, baseRefCount); assertU(commit()); SolrQueryRequest sr4 = req("q","foo"); - SolrIndexReader r4 = sr4.getSearcher().getReader(); + ReaderContext rCtx4 = sr4.getSearcher().getTopReaderContext(); // force an index change so the registered searcher won't be the one we are testing (and // then we should be able to test the refCount going all the way to 0 @@ -97,23 +100,23 @@ assertU(commit()); // test that reader didn't change (according to equals at least... which uses the wrapped reader) - assertEquals(r3,r4); - assertEquals(baseRefCount+1, r4.getRefCount()); + assertEquals(rCtx3.reader, rCtx4.reader); + assertEquals(baseRefCount+1, rCtx4.reader.getRefCount()); sr3.close(); - assertEquals(baseRefCount, r4.getRefCount()); + assertEquals(baseRefCount, rCtx4.reader.getRefCount()); sr4.close(); - assertEquals(baseRefCount-1, r4.getRefCount()); + assertEquals(baseRefCount-1, rCtx4.reader.getRefCount()); SolrQueryRequest sr5 = req("q","foo"); - SolrIndexReader r5 = sr5.getSearcher().getReader(); + ReaderContext rCtx5 = sr5.getSearcher().getTopReaderContext(); assertU(delI("1")); assertU(commit()); SolrQueryRequest sr6 = req("q","foo"); - SolrIndexReader r6 = sr6.getSearcher().getReader(); - assertEquals(1, r6.getLeafReaders()[0].numDocs()); // only a single doc left in the first segment - assertTrue( !r5.getLeafReaders()[0].equals(r6.getLeafReaders()[0]) ); // readers now different + ReaderContext rCtx6 = sr6.getSearcher().getTopReaderContext(); + assertEquals(1, ReaderUtil.leaves(rCtx6)[0].reader.numDocs()); // only a single doc left in the first segment + assertTrue( !ReaderUtil.leaves(rCtx5)[0].reader.equals(ReaderUtil.leaves(rCtx6)[0].reader) ); // readers now different sr5.close(); sr6.close(); Index: solr/src/test/org/apache/solr/search/TestSort.java =================================================================== --- solr/src/test/org/apache/solr/search/TestSort.java (revision 1057595) +++ solr/src/test/org/apache/solr/search/TestSort.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -160,9 +159,9 @@ } @Override - public void setNextReader(IndexReader reader, int docBase) throws IOException { - topCollector.setNextReader(reader,docBase); - this.docBase = docBase; + public void setNextReader(AtomicReaderContext context) throws IOException { + topCollector.setNextReader(context); + docBase = context.docBase; } @Override Index: solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (revision 1057591) +++ solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (working copy) @@ -20,18 +20,13 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.Field.Index; -import org.apache.lucene.document.Field.Store; +import org.apache.lucene.index.IndexReader; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.core.SolrCore; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.search.SolrIndexReader; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -243,7 +238,7 @@ assertU(commit()); SolrQueryRequest sr = req("q","foo"); - SolrIndexReader r = sr.getSearcher().getReader(); + IndexReader r = sr.getSearcher().getTopReaderContext().reader; assertTrue(r.maxDoc() > r.numDocs()); // should have deletions assertFalse(r.getTopReaderContext().isAtomic); // more than 1 segment sr.close(); @@ -251,7 +246,7 @@ assertU(commit("expungeDeletes","true")); sr = req("q","foo"); - r = sr.getSearcher().getReader(); + r = sr.getSearcher().getTopReaderContext().reader; assertEquals(r.maxDoc(), r.numDocs()); // no deletions assertEquals(4,r.maxDoc()); // no dups assertFalse(r.getTopReaderContext().isAtomic); //still more than 1 segment