Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java =================================================================== --- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (revision 1052196) +++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (working copy) @@ -31,6 +31,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; import org.apache.lucene.index.*; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BitVector; import org.apache.lucene.util.BytesRef; @@ -45,6 +46,8 @@ public class InstantiatedIndexReader extends IndexReader { private final InstantiatedIndex index; + private ReaderInfo[] readerInfos = new ReaderInfo[] { new ReaderInfo(this) }; + public InstantiatedIndexReader(InstantiatedIndex index) { super(); @@ -424,6 +427,11 @@ } }; } + + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } @Override public TermFreqVector[] getTermFreqVectors(int docNumber) throws IOException { 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 1052196) +++ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (working copy) @@ -739,6 +739,7 @@ private final class MemoryIndexReader extends IndexReader { private Searcher searcher; // needed to find searcher.getSimilarity() + private final ReaderInfo[] readerInfos = new ReaderInfo[] { new ReaderInfo(this) }; private MemoryIndexReader() { super(); // avoid as much superclass baggage as possible @@ -765,6 +766,11 @@ if (DEBUG) System.err.println("MemoryIndexReader.docFreq: " + term + ", freq:" + freq); return freq; } + + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } @Override public Fields fields() { Index: lucene/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java =================================================================== --- lucene/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java (revision 1052196) +++ lucene/contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java (working copy) @@ -21,6 +21,7 @@ import java.util.ArrayList; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.util.OpenBitSet; import org.apache.lucene.util.OpenBitSetDISI; @@ -41,10 +42,10 @@ ArrayList notFilters = null; ArrayList mustFilters = null; - private DocIdSetIterator getDISI(ArrayList filters, int index, IndexReader reader) + private DocIdSetIterator getDISI(ArrayList filters, int index, ReaderInfo info) throws IOException { - return filters.get(index).getDocIdSet(reader).iterator(); + return filters.get(index).getDocIdSet(info).iterator(); } /** @@ -52,21 +53,21 @@ * of the filters that have been added. */ @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { OpenBitSetDISI res = null; - + final IndexReader reader = info.sub; if (shouldFilters != null) { for (int i = 0; i < shouldFilters.size(); i++) { if (res == null) { - res = new OpenBitSetDISI(getDISI(shouldFilters, i, reader), reader.maxDoc()); + res = new OpenBitSetDISI(getDISI(shouldFilters, i, info), reader.maxDoc()); } else { - DocIdSet dis = shouldFilters.get(i).getDocIdSet(reader); + DocIdSet dis = shouldFilters.get(i).getDocIdSet(info); if(dis instanceof OpenBitSet) { // optimized case for OpenBitSets res.or((OpenBitSet) dis); } else { - res.inPlaceOr(getDISI(shouldFilters, i, reader)); + res.inPlaceOr(getDISI(shouldFilters, i, info)); } } } @@ -75,15 +76,15 @@ if (notFilters!=null) { for (int i = 0; i < notFilters.size(); i++) { if (res == null) { - res = new OpenBitSetDISI(getDISI(notFilters, i, reader), reader.maxDoc()); + res = new OpenBitSetDISI(getDISI(notFilters, i, info), reader.maxDoc()); res.flip(0, reader.maxDoc()); // NOTE: may set bits on deleted docs } else { - DocIdSet dis = notFilters.get(i).getDocIdSet(reader); + DocIdSet dis = notFilters.get(i).getDocIdSet(info); if(dis instanceof OpenBitSet) { // optimized case for OpenBitSets res.andNot((OpenBitSet) dis); } else { - res.inPlaceNot(getDISI(notFilters, i, reader)); + res.inPlaceNot(getDISI(notFilters, i, info)); } } } @@ -92,14 +93,14 @@ if (mustFilters!=null) { for (int i = 0; i < mustFilters.size(); i++) { if (res == null) { - res = new OpenBitSetDISI(getDISI(mustFilters, i, reader), reader.maxDoc()); + res = new OpenBitSetDISI(getDISI(mustFilters, i, info), reader.maxDoc()); } else { - DocIdSet dis = mustFilters.get(i).getDocIdSet(reader); + DocIdSet dis = mustFilters.get(i).getDocIdSet(info); if(dis instanceof OpenBitSet) { // optimized case for OpenBitSets res.and((OpenBitSet) dis); } else { - res.inPlaceAnd(getDISI(mustFilters, i, reader)); + res.inPlaceAnd(getDISI(mustFilters, i, info)); } } } Index: lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java =================================================================== --- lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java (revision 1052196) +++ lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Filter; @@ -96,21 +97,21 @@ * {@link Filter#getDocIdSet}. */ @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { int[] index = new int[1]; // use array as reference to modifiable int; index[0] = 0; // an object attribute would not be thread safe. if (logic != -1) - return getDocIdSet(reader, logic, index); + return getDocIdSet(info, logic, index); else if (logicArray != null) - return getDocIdSet(reader, logicArray, index); + return getDocIdSet(info, logicArray, index); else - return getDocIdSet(reader, DEFAULT, index); + return getDocIdSet(info, DEFAULT, index); } - private DocIdSetIterator getDISI(Filter filter, IndexReader reader) + private DocIdSetIterator getDISI(Filter filter, ReaderInfo info) throws IOException { - DocIdSet docIdSet = filter.getDocIdSet(reader); + DocIdSet docIdSet = filter.getDocIdSet(info); if (docIdSet == null) { return DocIdSet.EMPTY_DOCIDSET.iterator(); } else { @@ -123,9 +124,10 @@ } } - private OpenBitSetDISI initialResult(IndexReader reader, int logic, int[] index) + private OpenBitSetDISI initialResult(ReaderInfo info, int logic, int[] index) throws IOException { + IndexReader reader = info.sub; OpenBitSetDISI result; /** * First AND operation takes place against a completely false @@ -133,12 +135,12 @@ */ if (logic == AND) { - result = new OpenBitSetDISI(getDISI(chain[index[0]], reader), reader.maxDoc()); + result = new OpenBitSetDISI(getDISI(chain[index[0]], info), reader.maxDoc()); ++index[0]; } else if (logic == ANDNOT) { - result = new OpenBitSetDISI(getDISI(chain[index[0]], reader), reader.maxDoc()); + result = new OpenBitSetDISI(getDISI(chain[index[0]], info), reader.maxDoc()); result.flip(0,reader.maxDoc()); // NOTE: may set bits for deleted docs. ++index[0]; } @@ -155,13 +157,13 @@ * @param logic Logical operation * @return DocIdSet */ - private DocIdSet getDocIdSet(IndexReader reader, int logic, int[] index) + private DocIdSet getDocIdSet(ReaderInfo info, int logic, int[] index) throws IOException { - OpenBitSetDISI result = initialResult(reader, logic, index); + OpenBitSetDISI result = initialResult(info, logic, index); for (; index[0] < chain.length; index[0]++) { - doChain(result, logic, chain[index[0]].getDocIdSet(reader)); + doChain(result, logic, chain[index[0]].getDocIdSet(info)); } return result; } @@ -172,16 +174,16 @@ * @param logic Logical operation * @return DocIdSet */ - private DocIdSet getDocIdSet(IndexReader reader, int[] logic, int[] index) + private DocIdSet getDocIdSet(ReaderInfo info, int[] logic, int[] index) throws IOException { if (logic.length != chain.length) throw new IllegalArgumentException("Invalid number of elements in logic array"); - OpenBitSetDISI result = initialResult(reader, logic[0], index); + OpenBitSetDISI result = initialResult(info, logic[0], index); for (; index[0] < chain.length; index[0]++) { - doChain(result, logic[index[0]], chain[index[0]].getDocIdSet(reader)); + doChain(result, logic[index[0]], chain[index[0]].getDocIdSet(info)); } return result; } Index: lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java =================================================================== --- lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java (revision 1052196) +++ lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Terms; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.TermsEnum; @@ -70,15 +71,15 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { if(processingMode==PM_FAST_INVALIDATION) { - return fastBits(reader); + return fastBits(info.sub); } else { - return correctBits(reader); + return correctBits(info.sub); } } Index: lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java =================================================================== --- lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java (revision 1052196) +++ lucene/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java (working copy) @@ -23,6 +23,7 @@ import java.util.TreeSet; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Terms; @@ -57,7 +58,8 @@ * @see org.apache.lucene.search.Filter#getDocIdSet(org.apache.lucene.index.IndexReader) */ @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + IndexReader reader = info.sub; OpenBitSet result=new OpenBitSet(reader.maxDoc()); Fields fields = reader.fields(); BytesRef br = new BytesRef(); Index: lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (revision 1052196) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.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.ReaderInfo; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.Term; @@ -83,7 +84,7 @@ private void tstFilterCard(String mes, int expected, Filter filt) throws Throwable { - DocIdSetIterator disi = filt.getDocIdSet(reader).iterator(); + DocIdSetIterator disi = filt.getDocIdSet(new ReaderInfo(reader)).iterator(); int actual = 0; while (disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { actual++; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (revision 1052196) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (working copy) @@ -23,6 +23,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.ReaderInfo; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; @@ -61,23 +62,25 @@ w.addDocument(doc); } IndexReader reader = new SlowMultiReaderWrapper(w.getReader()); + assertEquals(1, reader.readerInfos().length); + ReaderInfo info = reader.readerInfos()[0]; w.close(); TermsFilter tf=new TermsFilter(); tf.addTerm(new Term(fieldName,"19")); - OpenBitSet bits = (OpenBitSet)tf.getDocIdSet(reader); + OpenBitSet bits = (OpenBitSet)tf.getDocIdSet(info); assertEquals("Must match nothing", 0, bits.cardinality()); tf.addTerm(new Term(fieldName,"20")); - bits = (OpenBitSet)tf.getDocIdSet(reader); + bits = (OpenBitSet)tf.getDocIdSet(info); assertEquals("Must match 1", 1, bits.cardinality()); tf.addTerm(new Term(fieldName,"10")); - bits = (OpenBitSet)tf.getDocIdSet(reader); + bits = (OpenBitSet)tf.getDocIdSet(info); assertEquals("Must match 2", 2, bits.cardinality()); tf.addTerm(new Term(fieldName,"00")); - bits = (OpenBitSet)tf.getDocIdSet(reader); + bits = (OpenBitSet)tf.getDocIdSet(info); assertEquals("Must match 2", 2, bits.cardinality()); reader.close(); Index: lucene/contrib/remote/src/java/org/apache/lucene/search/RemoteCachingWrapperFilter.java =================================================================== --- lucene/contrib/remote/src/java/org/apache/lucene/search/RemoteCachingWrapperFilter.java (revision 1052196) +++ lucene/contrib/remote/src/java/org/apache/lucene/search/RemoteCachingWrapperFilter.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; /** * Provides caching of {@link org.apache.lucene.search.Filter}s themselves on the remote end of an RMI connection. @@ -50,8 +51,8 @@ * @return the DocIdSet */ @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { Filter cachedFilter = FilterManager.getInstance().getFilter(filter); - return cachedFilter.getDocIdSet(reader); + return cachedFilter.getDocIdSet(info); } } Index: lucene/contrib/remote/src/test/org/apache/lucene/search/RemoteCachingWrapperFilterHelper.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/RemoteCachingWrapperFilterHelper.java (revision 1052196) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/RemoteCachingWrapperFilterHelper.java (working copy) @@ -22,6 +22,7 @@ import junit.framework.Assert; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; /** * A unit test helper class to help with RemoteCachingWrapperFilter testing and @@ -41,7 +42,7 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { Filter cachedFilter = FilterManager.getInstance().getFilter(filter); Assert.assertNotNull("Filter should not be null", cachedFilter); @@ -54,6 +55,6 @@ if (filter instanceof CachingWrapperFilterHelper) { ((CachingWrapperFilterHelper)cachedFilter).setShouldHaveCache(shouldHaveCache); } - return cachedFilter.getDocIdSet(reader); + return cachedFilter.getDocIdSet(info); } } Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java (revision 1052196) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache.DocTerms; import org.apache.lucene.search.Filter; @@ -62,15 +62,15 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { - final DocTerms geoHashValues = FieldCache.DEFAULT.getTerms(reader, geoHashField); + final DocTerms geoHashValues = FieldCache.DEFAULT.getTerms(info.sub, geoHashField); final BytesRef br = new BytesRef(); final int docBase = nextDocBase; - nextDocBase += reader.maxDoc(); + nextDocBase += info.sub.maxDoc(); - return new FilteredDocIdSet(startingFilter.getDocIdSet(reader)) { + return new FilteredDocIdSet(startingFilter.getDocIdSet(info)) { @Override public boolean match(int doc) { Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java (revision 1052196) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java (working copy) @@ -20,7 +20,7 @@ import java.util.List; import org.apache.lucene.index.DocsEnum; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.Filter; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; @@ -45,8 +45,8 @@ } @Override - public DocIdSet getDocIdSet(final IndexReader reader) throws IOException { - final Bits delDocs = reader.getDeletedDocs(); + public DocIdSet getDocIdSet(final ReaderInfo info) throws IOException { + final Bits delDocs = info.sub.getDeletedDocs(); final List area = shape.getArea(); final int sz = area.size(); @@ -58,7 +58,7 @@ return new DocIdSet() { @Override public DocIdSetIterator iterator() throws IOException { - return reader.termDocsEnum(delDocs, fieldName, bytesRef); + return info.sub.termDocsEnum(delDocs, fieldName, bytesRef); } @Override @@ -67,11 +67,11 @@ } }; } else { - final OpenBitSet bits = new OpenBitSet(reader.maxDoc()); + final OpenBitSet bits = new OpenBitSet(info.sub.maxDoc()); for (int i =0; i< sz; i++) { double boxId = area.get(i).doubleValue(); NumericUtils.longToPrefixCoded(NumericUtils.doubleToSortableLong(boxId), 0, bytesRef); - final DocsEnum docsEnum = reader.termDocsEnum(delDocs, fieldName, bytesRef); + final DocsEnum docsEnum = info.sub.termDocsEnum(delDocs, fieldName, bytesRef); if (docsEnum == null) continue; // iterate through all documents // which have this boxId Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java (revision 1052196) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java (working copy) @@ -18,7 +18,8 @@ package org.apache.lucene.spatial.tier; import java.io.IOException; -import org.apache.lucene.index.IndexReader; + +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.FilteredDocIdSet; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.Filter; @@ -64,15 +65,15 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { - final double[] latIndex = FieldCache.DEFAULT.getDoubles(reader, latField); - final double[] lngIndex = FieldCache.DEFAULT.getDoubles(reader, lngField); + final double[] latIndex = FieldCache.DEFAULT.getDoubles(info.sub, latField); + final double[] lngIndex = FieldCache.DEFAULT.getDoubles(info.sub, lngField); final int docBase = nextDocBase; - nextDocBase += reader.maxDoc(); + nextDocBase += info.sub.maxDoc(); - return new FilteredDocIdSet(startingFilter.getDocIdSet(reader)) { + return new FilteredDocIdSet(startingFilter.getDocIdSet(info)) { @Override protected boolean match(int doc) { double x = latIndex[doc]; Index: lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java =================================================================== --- lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (revision 1052196) +++ lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (working copy) @@ -25,6 +25,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.QueryWrapperFilter; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.util.LuceneTestCase; @@ -100,9 +101,9 @@ LatLongDistanceFilter f = new LatLongDistanceFilter(new QueryWrapperFilter(new MatchAllDocsQuery()), lat, lng, 1.0, latField, lngField); - IndexReader[] readers = r.getSequentialSubReaders(); - for(int i=0;i 0) { IndexSearcher searcher = new IndexSearcher(reader); + + final ReaderInfo[] readerContext = searcher.readerInfos(); + assert readerContext.length == 1; + final ReaderInfo info = readerContext[0]; try { for (Entry entry : deletes.queries.entrySet()) { Query query = entry.getKey(); int limit = entry.getValue().intValue(); Weight weight = query.weight(searcher); - Scorer scorer = weight.scorer(reader, true, false); + + Scorer scorer = weight.scorer(info, true, false); if (scorer != null) { while(true) { int doc = scorer.nextDoc(); Index: lucene/src/java/org/apache/lucene/index/DirectoryReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/DirectoryReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/DirectoryReader.java (working copy) @@ -35,6 +35,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.Lock; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.codecs.CodecProvider; import org.apache.lucene.util.Bits; import org.apache.lucene.util.ReaderUtil; @@ -61,6 +62,7 @@ private boolean rollbackHasChanges; + private ReaderInfo[] readerInfos; private SegmentReader[] subReaders; private int[] starts; // 1st docno for each segment private final Map subReaderToSlice = new HashMap(); @@ -334,12 +336,14 @@ private void initialize(SegmentReader[] subReaders) throws IOException { this.subReaders = subReaders; + readerInfos = new ReaderInfo[this.subReaders.length]; starts = new int[subReaders.length + 1]; // build starts array final List subFields = new ArrayList(); final List fieldSlices = new ArrayList(); for (int i = 0; i < subReaders.length; i++) { + readerInfos[i] = new ReaderInfo(this, subReaders[i], i); starts[i] = maxDoc; maxDoc += subReaders[i].maxDoc(); // compute maxDocs @@ -903,7 +907,12 @@ fieldSet.addAll(names); } return fieldSet; - } + } + + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } @Override public IndexReader[] getSequentialSubReaders() { Index: lucene/src/java/org/apache/lucene/index/FilterIndexReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; import org.apache.lucene.search.FieldCache; // not great (circular); used only to purge FieldCache entry on close @@ -417,6 +418,11 @@ public IndexReader[] getSequentialSubReaders() { return in.getSequentialSubReaders(); } + + @Override + public ReaderInfo[] readerInfos() { + return in.readerInfos(); + } @Override public Fields fields() throws IOException { Index: lucene/src/java/org/apache/lucene/index/IndexReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/IndexReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/IndexReader.java (working copy) @@ -32,6 +32,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.Closeable; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -1431,4 +1432,65 @@ Fields retrieveFields() { return fields; } + + + // nocommit - add JAVADOC + // this could maybe replace sequential subreaders as well as its docBase relative. + public ReaderInfo[] readerInfos() { + throw new UnsupportedOperationException("This reader does not support this method."); + } + + /** + * Builds a ReaderInfo array from the this {@link IndexReader} instance and its sub-readers. This + * method behaves similar to {@link ReaderUtil#gatherSubReaders(List, IndexReader)}. + * @return a ReaderInfo array build from the this {@link IndexReader} instance and its sub-readers. This + */ + protected static ReaderInfo[] buildReaderInfo(IndexReader parent) { + final ArrayList readers = new ArrayList(); + ReaderUtil.gatherSubReaders(readers, parent); + return ReaderInfo.buildFrom(parent, readers.toArray(new IndexReader[readers.size()])); + } + + /** + * A struct like class to represent an + * {@link IndexReader} and its parent {@link IndexReader} including its + * ordinal within the parent reader. + */ + public static final class ReaderInfo { + public final IndexReader parent; + public final IndexReader sub; + public final int ord; + // TODO: we should add docStart to the reader info to that way we can get + // rid of all the additional mapping though + // public final int docStart; + + /** + * Creates a new {@link ReaderInfo} + */ + public ReaderInfo(IndexReader parent, IndexReader sub, int ord) { + this.parent = parent; + this.sub = sub; + this.ord = ord; + } + + /** + * Creates a new {@link ReaderInfo} instance with the given reader as the + * parent and the one and only sub. The assigned ord will be 0 + */ + public ReaderInfo(IndexReader reader) { + this(reader, reader, 0); + } + + /** + * Constructs a ReaderInfo array from the given parent and subs. the index + * of the sub reader in the array corresponds to its ord + */ + public static ReaderInfo[] buildFrom(IndexReader parent, IndexReader[] subs) { + final ReaderInfo[] info = new ReaderInfo[subs.length]; + for (int i = 0; i < info.length; i++) { + info[i] = new ReaderInfo(parent, subs[i], i); + } + return info; + } + } } Index: lucene/src/java/org/apache/lucene/index/MultiReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/MultiReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/MultiReader.java (working copy) @@ -42,6 +42,7 @@ private int maxDoc = 0; private int numDocs = -1; private boolean hasDeletions = false; + private ReaderInfo[] readerInfos; /** *

Construct a MultiReader aggregating the named set of (sub)readers. @@ -93,6 +94,7 @@ } starts[subReaders.length] = maxDoc; + readerInfos = buildReaderInfo(this); } @Override @@ -433,4 +435,9 @@ public IndexReader[] getSequentialSubReaders() { return subReaders; } + + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } } Index: lucene/src/java/org/apache/lucene/index/ParallelReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/ParallelReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/ParallelReader.java (working copy) @@ -53,6 +53,7 @@ private SortedMap fieldToReader = new TreeMap(); private Map> readerToFields = new HashMap>(); private List storedFieldReaders = new ArrayList(); + private final ReaderInfo[] readerInfos; private int maxDoc; private int numDocs; @@ -72,8 +73,14 @@ public ParallelReader(boolean closeSubReaders) throws IOException { super(); this.incRefReaders = !closeSubReaders; + readerInfos = buildReaderInfo(this); } + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } + /** {@inheritDoc} */ @Override public String toString() { Index: lucene/src/java/org/apache/lucene/index/SegmentReader.java =================================================================== --- lucene/src/java/org/apache/lucene/index/SegmentReader.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/SegmentReader.java (working copy) @@ -51,7 +51,7 @@ private SegmentInfo si; private int readBufferSize; - + private final ReaderInfo[] readerInfos = new ReaderInfo[] { new ReaderInfo(this) }; CloseableThreadLocal fieldsReaderLocal = new FieldsReaderLocal(); CloseableThreadLocal termVectorsLocal = new CloseableThreadLocal(); @@ -1183,6 +1183,11 @@ buffer.append(si.toString(core.dir, pendingDeleteCount)); return buffer.toString(); } + + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } /** * Return the name of the segment this reader is reading. Index: lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java =================================================================== --- lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/index/SlowMultiReaderWrapper.java (working copy) @@ -47,9 +47,10 @@ */ public final class SlowMultiReaderWrapper extends FilterIndexReader { - + private final ReaderInfo[] readerInfos; public SlowMultiReaderWrapper(IndexReader other) { super(other); + readerInfos = buildReaderInfo(this); } @Override @@ -67,4 +68,9 @@ return null; } + @Override + public ReaderInfo[] readerInfos() { + return readerInfos; + } + } Index: lucene/src/java/org/apache/lucene/search/BooleanQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/BooleanQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/BooleanQuery.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.util.ToStringUtils; import org.apache.lucene.search.BooleanClause.Occur; @@ -223,7 +224,7 @@ } @Override - public Explanation explain(IndexReader reader, int doc) + public Explanation explain(ReaderInfo info, int doc) throws IOException { final int minShouldMatch = BooleanQuery.this.getMinimumNumberShouldMatch(); @@ -237,7 +238,7 @@ for (Iterator wIter = weights.iterator(); wIter.hasNext();) { Weight w = wIter.next(); BooleanClause c = cIter.next(); - if (w.scorer(reader, true, true) == null) { + if (w.scorer(info, true, true) == null) { if (c.isRequired()) { fail = true; Explanation r = new Explanation(0.0f, "no match on required clause (" + c.getQuery().toString() + ")"); @@ -245,7 +246,7 @@ } continue; } - Explanation e = w.explain(reader, doc); + Explanation e = w.explain(info, doc); if (e.isMatch()) { if (!c.isProhibited()) { sumExpl.addDetail(e); @@ -299,7 +300,7 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { List required = new ArrayList(); List prohibited = new ArrayList(); @@ -307,7 +308,7 @@ Iterator cIter = clauses.iterator(); for (Weight w : weights) { BooleanClause c = cIter.next(); - Scorer subScorer = w.scorer(reader, true, false); + Scorer subScorer = w.scorer(info, true, false); if (subScorer == null) { if (c.isRequired()) { return null; Index: lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java (working copy) @@ -17,6 +17,7 @@ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.Bits; @@ -61,8 +62,8 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - SpanFilterResult result = getCachedResult(reader); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + SpanFilterResult result = getCachedResult(info.sub); return result != null ? result.getDocIdSet() : null; } Index: lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (working copy) @@ -23,6 +23,7 @@ import java.util.WeakHashMap; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.OpenBitSetDISI; import org.apache.lucene.util.Bits; @@ -192,8 +193,8 @@ int hitCount, missCount; @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + final IndexReader reader = info.sub; final Object coreKey = reader.getCoreCacheKey(); final Object delCoreKey = reader.hasDeletions() ? MultiFields.getDeletedDocs(reader) : coreKey; @@ -206,7 +207,7 @@ missCount++; // cache miss - docIdSet = docIdSetToCache(filter.getDocIdSet(reader), reader); + docIdSet = docIdSetToCache(filter.getDocIdSet(info), reader); if (docIdSet != null) { cache.put(coreKey, delCoreKey, docIdSet); Index: lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import java.io.IOException; @@ -88,14 +89,14 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new ConstantScorer(similarity, reader, this); + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + return new ConstantScorer(similarity, info, this); } @Override - public Explanation explain(IndexReader reader, int doc) throws IOException { + public Explanation explain(ReaderInfo info, int doc) throws IOException { - ConstantScorer cs = new ConstantScorer(similarity, reader, this); + ConstantScorer cs = new ConstantScorer(similarity, info, this); boolean exists = cs.docIdSetIterator.advance(doc) == doc; ComplexExplanation result = new ComplexExplanation(); @@ -122,10 +123,10 @@ final float theScore; int doc = -1; - public ConstantScorer(Similarity similarity, IndexReader reader, Weight w) throws IOException { + public ConstantScorer(Similarity similarity, ReaderInfo info, Weight w) throws IOException { super(similarity,w); theScore = w.getValue(); - DocIdSet docIdSet = filter.getDocIdSet(reader); + DocIdSet docIdSet = filter.getDocIdSet(info); if (docIdSet == null) { docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator(); } else { Index: lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (working copy) @@ -23,6 +23,7 @@ import java.util.Set; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; /** @@ -141,12 +142,12 @@ /* Create the scorer used to score our associated DisjunctionMaxQuery */ @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { Scorer[] scorers = new Scorer[weights.size()]; int idx = 0; for (Weight w : weights) { - Scorer subScorer = w.scorer(reader, true, false); + Scorer subScorer = w.scorer(info, true, false); if (subScorer != null && subScorer.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { scorers[idx++] = subScorer; } @@ -158,13 +159,13 @@ /* Explain the score we computed for doc */ @Override - public Explanation explain(IndexReader reader, int doc) throws IOException { - if (disjuncts.size() == 1) return weights.get(0).explain(reader,doc); + public Explanation explain(ReaderInfo info, int doc) throws IOException { + if (disjuncts.size() == 1) return weights.get(0).explain(info,doc); ComplexExplanation result = new ComplexExplanation(); float max = 0.0f, sum = 0.0f; result.setDescription(tieBreakerMultiplier == 0.0f ? "max of:" : "max plus " + tieBreakerMultiplier + " times others of:"); for (Weight wt : weights) { - Explanation e = wt.explain(reader, doc); + Explanation e = wt.explain(info, doc); if (e.isMatch()) { result.setMatch(Boolean.TRUE); result.addDetail(e); Index: lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java (working copy) @@ -19,6 +19,7 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.Bits; @@ -73,7 +74,7 @@ /** This method is implemented for each data type */ @Override - public abstract DocIdSet getDocIdSet(IndexReader reader) throws IOException; + public abstract DocIdSet getDocIdSet(ReaderInfo info) throws IOException; /** * Creates a string range filter using {@link FieldCache#getTermsIndex}. This works with all @@ -83,8 +84,8 @@ public static FieldCacheRangeFilter newStringRange(String field, String lowerVal, String upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, null, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - final FieldCache.DocTermsIndex fcsi = FieldCache.DEFAULT.getTermsIndex(reader, field); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + final FieldCache.DocTermsIndex fcsi = FieldCache.DEFAULT.getTermsIndex(info.sub, field); final BytesRef spare = new BytesRef(); final int lowerPoint = fcsi.binarySearchLookup(lowerVal == null ? null : new BytesRef(lowerVal), spare); final int upperPoint = fcsi.binarySearchLookup(upperVal == null ? null : new BytesRef(upperVal), spare); @@ -124,7 +125,7 @@ // for this DocIdSet, we can ignore deleted docs // because deleted docs have an order of 0 (null entry in StringIndex) - return new FieldCacheDocIdSet(reader, true) { + return new FieldCacheDocIdSet(info.sub, true) { @Override final boolean matchDoc(int doc) { final int docOrd = fcsi.getOrd(doc); @@ -152,7 +153,7 @@ public static FieldCacheRangeFilter newByteRange(String field, FieldCache.ByteParser parser, Byte lowerVal, Byte upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { final byte inclusiveLowerPoint, inclusiveUpperPoint; if (lowerVal != null) { final byte i = lowerVal.byteValue(); @@ -174,9 +175,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final byte[] values = FieldCache.DEFAULT.getBytes(reader, field, (FieldCache.ByteParser) parser); + final byte[] values = FieldCache.DEFAULT.getBytes(info.sub, field, (FieldCache.ByteParser) parser); // we only respect deleted docs if the range contains 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; @@ -203,7 +204,7 @@ public static FieldCacheRangeFilter newShortRange(String field, FieldCache.ShortParser parser, Short lowerVal, Short upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { final short inclusiveLowerPoint, inclusiveUpperPoint; if (lowerVal != null) { short i = lowerVal.shortValue(); @@ -225,9 +226,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final short[] values = FieldCache.DEFAULT.getShorts(reader, field, (FieldCache.ShortParser) parser); + final short[] values = FieldCache.DEFAULT.getShorts(info.sub, field, (FieldCache.ShortParser) parser); // ignore deleted docs if range doesn't contain 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; @@ -254,7 +255,7 @@ public static FieldCacheRangeFilter newIntRange(String field, FieldCache.IntParser parser, Integer lowerVal, Integer upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { final int inclusiveLowerPoint, inclusiveUpperPoint; if (lowerVal != null) { int i = lowerVal.intValue(); @@ -276,9 +277,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final int[] values = FieldCache.DEFAULT.getInts(reader, field, (FieldCache.IntParser) parser); + final int[] values = FieldCache.DEFAULT.getInts(info.sub, field, (FieldCache.IntParser) parser); // ignore deleted docs if range doesn't contain 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0 && inclusiveUpperPoint >= 0)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; @@ -305,7 +306,7 @@ public static FieldCacheRangeFilter newLongRange(String field, FieldCache.LongParser parser, Long lowerVal, Long upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { final long inclusiveLowerPoint, inclusiveUpperPoint; if (lowerVal != null) { long i = lowerVal.longValue(); @@ -327,9 +328,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final long[] values = FieldCache.DEFAULT.getLongs(reader, field, (FieldCache.LongParser) parser); + final long[] values = FieldCache.DEFAULT.getLongs(info.sub, field, (FieldCache.LongParser) parser); // ignore deleted docs if range doesn't contain 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0L && inclusiveUpperPoint >= 0L)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0L && inclusiveUpperPoint >= 0L)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; @@ -356,7 +357,7 @@ public static FieldCacheRangeFilter newFloatRange(String field, FieldCache.FloatParser parser, Float lowerVal, Float upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { // we transform the floating point numbers to sortable integers // using NumericUtils to easier find the next bigger/lower value final float inclusiveLowerPoint, inclusiveUpperPoint; @@ -382,9 +383,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final float[] values = FieldCache.DEFAULT.getFloats(reader, field, (FieldCache.FloatParser) parser); + final float[] values = FieldCache.DEFAULT.getFloats(info.sub, field, (FieldCache.FloatParser) parser); // ignore deleted docs if range doesn't contain 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0.0f && inclusiveUpperPoint >= 0.0f)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0.0f && inclusiveUpperPoint >= 0.0f)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; @@ -411,7 +412,7 @@ public static FieldCacheRangeFilter newDoubleRange(String field, FieldCache.DoubleParser parser, Double lowerVal, Double upperVal, boolean includeLower, boolean includeUpper) { return new FieldCacheRangeFilter(field, parser, lowerVal, upperVal, includeLower, includeUpper) { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { // we transform the floating point numbers to sortable integers // using NumericUtils to easier find the next bigger/lower value final double inclusiveLowerPoint, inclusiveUpperPoint; @@ -437,9 +438,9 @@ if (inclusiveLowerPoint > inclusiveUpperPoint) return DocIdSet.EMPTY_DOCIDSET; - final double[] values = FieldCache.DEFAULT.getDoubles(reader, field, (FieldCache.DoubleParser) parser); + final double[] values = FieldCache.DEFAULT.getDoubles(info.sub, field, (FieldCache.DoubleParser) parser); // ignore deleted docs if range doesn't contain 0 - return new FieldCacheDocIdSet(reader, !(inclusiveLowerPoint <= 0.0 && inclusiveUpperPoint >= 0.0)) { + return new FieldCacheDocIdSet(info.sub, !(inclusiveLowerPoint <= 0.0 && inclusiveUpperPoint >= 0.0)) { @Override boolean matchDoc(int doc) { return values[doc] >= inclusiveLowerPoint && values[doc] <= inclusiveUpperPoint; Index: lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.DocsEnum; // javadoc @link import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.util.OpenBitSet; import org.apache.lucene.util.BytesRef; @@ -115,8 +116,8 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - return new FieldCacheTermsFilterDocIdSet(getFieldCache().getTermsIndex(reader, field)); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + return new FieldCacheTermsFilterDocIdSet(getFieldCache().getTermsIndex(info.sub, field)); } protected class FieldCacheTermsFilterDocIdSet extends DocIdSet { Index: lucene/src/java/org/apache/lucene/search/Filter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/Filter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/Filter.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.util.DocIdBitSet; /** @@ -38,8 +38,8 @@ * must refer to document IDs for that segment, not for * the top-level reader. * - * @param reader a {@link IndexReader} instance opened on the index currently - * searched on. Note, it is likely that the provided reader does not + * @param info a {@link ReaderInfo} instance opened on the index currently + * searched on. Note, it is likely that the provided reader info does not * represent the whole underlying index i.e. if the index has more than * one segment the given reader only represents a single segment. * @@ -49,5 +49,5 @@ * * @see DocIdBitSet */ - public abstract DocIdSet getDocIdSet(IndexReader reader) throws IOException; + public abstract DocIdSet getDocIdSet(ReaderInfo info) throws IOException; } Index: lucene/src/java/org/apache/lucene/search/FilteredQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/FilteredQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/FilteredQuery.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.util.ToStringUtils; @@ -81,7 +82,7 @@ } @Override - public Explanation explain (IndexReader ir, int i) throws IOException { + public Explanation explain (ReaderInfo ir, int i) throws IOException { Explanation inner = weight.explain (ir, i); if (getBoost()!=1) { Explanation preBoost = inner; @@ -111,7 +112,7 @@ // return a filtering scorer @Override - public Scorer scorer(IndexReader indexReader, boolean scoreDocsInOrder, boolean topScorer) + public Scorer scorer(ReaderInfo indexReader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { final Scorer scorer = weight.scorer(indexReader, true, false); if (scorer == null) { Index: lucene/src/java/org/apache/lucene/search/IndexSearcher.java =================================================================== --- lucene/src/java/org/apache/lucene/search/IndexSearcher.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/IndexSearcher.java (working copy) @@ -18,13 +18,13 @@ */ import java.io.IOException; -import java.util.ArrayList; import java.util.List; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldSelector; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.util.ReaderUtil; @@ -50,8 +50,8 @@ // NOTE: these members might change in incompatible ways // in the next release - protected IndexReader[] subReaders; protected int[] docStarts; + private final ReaderInfo[] readerContext; /** Creates a searcher searching the index in the named * directory, with readOnly=true @@ -89,23 +89,21 @@ * @lucene.experimental */ public IndexSearcher(IndexReader reader, IndexReader[] subReaders, int[] docStarts) { this.reader = reader; - this.subReaders = subReaders; + this.readerContext = ReaderInfo.buildFrom(reader, subReaders); this.docStarts = docStarts; closeReader = false; } + private IndexSearcher(IndexReader r, boolean closeReader) { reader = r; this.closeReader = closeReader; - - List subReadersList = new ArrayList(); - gatherSubReaders(subReadersList, reader); - subReaders = subReadersList.toArray(new IndexReader[subReadersList.size()]); - docStarts = new int[subReaders.length]; + readerContext = reader.readerInfos(); + docStarts = new int[readerContext.length]; int maxDoc = 0; - for (int i = 0; i < subReaders.length; i++) { + for (int i = 0; i < readerContext.length; i++) { docStarts[i] = maxDoc; - maxDoc += subReaders[i].maxDoc(); + maxDoc += readerContext[i].sub.maxDoc(); } } @@ -207,27 +205,27 @@ throws IOException { if (filter == null) { - for (int i = 0; i < subReaders.length; i++) { // search each subreader - collector.setNextReader(subReaders[i], docStarts[i]); - Scorer scorer = weight.scorer(subReaders[i], !collector.acceptsDocsOutOfOrder(), true); + for (int i = 0; i < readerContext.length; i++) { // search each subreader + collector.setNextReader(readerContext[i].sub, docStarts[i]); + Scorer scorer = weight.scorer(readerContext[i], !collector.acceptsDocsOutOfOrder(), true); if (scorer != null) { scorer.score(collector); } } } else { - for (int i = 0; i < subReaders.length; i++) { // search each subreader - collector.setNextReader(subReaders[i], docStarts[i]); - searchWithFilter(subReaders[i], weight, filter, collector); + for (int i = 0; i < readerContext.length; i++) { // search each subreader + collector.setNextReader(readerContext[i].sub, docStarts[i]); + searchWithFilter(readerContext[i], weight, filter, collector); } } } - private void searchWithFilter(IndexReader reader, Weight weight, + private void searchWithFilter(ReaderInfo info, Weight weight, final Filter filter, final Collector collector) throws IOException { assert filter != null; - Scorer scorer = weight.scorer(reader, true, false); + Scorer scorer = weight.scorer(info, true, false); if (scorer == null) { return; } @@ -236,7 +234,7 @@ assert docID == -1 || docID == DocIdSetIterator.NO_MORE_DOCS; // CHECKME: use ConjunctionScorer here? - DocIdSet filterDocIdSet = filter.getDocIdSet(reader); + DocIdSet filterDocIdSet = filter.getDocIdSet(info); if (filterDocIdSet == null) { // this means the filter does not accept any documents. return; @@ -283,7 +281,7 @@ int n = ReaderUtil.subIndex(doc, docStarts); int deBasedDoc = doc - docStarts[n]; - return weight.explain(subReaders[n], deBasedDoc); + return weight.explain(readerContext[n], deBasedDoc); } private boolean fieldSortDoTrackScores; @@ -305,4 +303,9 @@ fieldSortDoTrackScores = doTrackScores; fieldSortDoMaxScore = doMaxScore; } + + @Override + public ReaderInfo[] readerInfos() { + return readerContext; + } } Index: lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.ToStringUtils; @@ -127,13 +128,13 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new MatchAllScorer(reader, similarity, this, - normsField != null ? reader.norms(normsField) : null); + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + return new MatchAllScorer(info.sub, similarity, this, + normsField != null ? info.sub.norms(normsField) : null); } @Override - public Explanation explain(IndexReader reader, int doc) { + public Explanation explain(ReaderInfo info, int doc) { // explain query weight Explanation queryExpl = new ComplexExplanation (true, getValue(), "MatchAllDocsQuery, product of:"); Index: lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (working copy) @@ -21,6 +21,7 @@ import java.util.*; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.DocsAndPositionsEnum; @@ -167,10 +168,10 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { if (termArrays.size() == 0) // optimize zero-term case return null; - + final IndexReader reader = info.sub; final Bits delDocs = reader.getDeletedDocs(); PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()]; @@ -219,7 +220,7 @@ if (slop == 0) { ExactPhraseScorer s = new ExactPhraseScorer(this, postingsFreqs, similarity, - reader.norms(field)); + reader.norms(field)); if (s.noDocs) { return null; } else { @@ -232,7 +233,7 @@ } @Override - public Explanation explain(IndexReader reader, int doc) + public Explanation explain(ReaderInfo info, int doc) throws IOException { ComplexExplanation result = new ComplexExplanation(); result.setDescription("weight("+getQuery()+" in "+doc+"), product of:"); @@ -263,7 +264,7 @@ fieldExpl.setDescription("fieldWeight("+getQuery()+" in "+doc+ "), product of:"); - Scorer scorer = scorer(reader, true, false); + Scorer scorer = scorer(info, true, false); if (scorer == null) { return new Explanation(0.0f, "no matching docs"); } @@ -283,7 +284,7 @@ fieldExpl.addDetail(idfExpl); Explanation fieldNormExpl = new Explanation(); - byte[] fieldNorms = reader.norms(field); + byte[] fieldNorms = info.sub.norms(field); float fieldNorm = fieldNorms!=null ? similarity.decodeNormValue(fieldNorms[doc]) : 1.0f; fieldNormExpl.setValue(fieldNorm); Index: lucene/src/java/org/apache/lucene/search/MultiSearcher.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiSearcher.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/MultiSearcher.java (working copy) @@ -126,19 +126,20 @@ } } - private Searchable[] searchables; - private int[] starts; - private int maxDoc = 0; + private final Searchable[] searchables; + private final int[] starts; + private final int maxDoc; /** Creates a searcher which searches searchers. */ public MultiSearcher(Searchable... searchables) throws IOException { this.searchables = searchables; - + int docCount = 0; starts = new int[searchables.length + 1]; // build starts array for (int i = 0; i < searchables.length; i++) { - starts[i] = maxDoc; - maxDoc += searchables[i].maxDoc(); // compute maxDocs + starts[i] = docCount; + docCount += searchables[i].maxDoc(); // compute maxDocs } + maxDoc = docCount; starts[searchables.length] = maxDoc; } Index: lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (working copy) @@ -19,8 +19,8 @@ import java.io.IOException; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.DocsEnum; @@ -105,8 +105,8 @@ * results. */ @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - final Fields fields = MultiFields.getFields(reader); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + final Fields fields = MultiFields.getFields(info.sub); if (fields == null) { // reader has no fields return DocIdSet.EMPTY_DOCIDSET; @@ -122,9 +122,9 @@ assert termsEnum != null; if (termsEnum.next() != null) { // fill into a OpenBitSet - final OpenBitSet bitSet = new OpenBitSet(reader.maxDoc()); + final OpenBitSet bitSet = new OpenBitSet(info.sub.maxDoc()); int termCount = 0; - final Bits delDocs = MultiFields.getDeletedDocs(reader); + final Bits delDocs = MultiFields.getDeletedDocs(info.sub); DocsEnum docsEnum = null; do { termCount++; Index: lucene/src/java/org/apache/lucene/search/PhraseQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/PhraseQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/PhraseQuery.java (working copy) @@ -21,6 +21,7 @@ import java.util.Set; import java.util.ArrayList; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.IndexReader; @@ -174,10 +175,10 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { if (terms.size() == 0) // optimize zero-term case return null; - + final IndexReader reader = info.sub; PostingsAndFreq[] postingsFreqs = new PostingsAndFreq[terms.size()]; final Bits delDocs = reader.getDeletedDocs(); for (int i = 0; i < terms.size(); i++) { @@ -206,7 +207,7 @@ if (slop == 0) { // optimize exact case ExactPhraseScorer s = new ExactPhraseScorer(this, postingsFreqs, similarity, - reader.norms(field)); + reader.norms(field)); if (s.noDocs) { return null; } else { @@ -215,12 +216,12 @@ } else { return new SloppyPhraseScorer(this, postingsFreqs, similarity, slop, - reader.norms(field)); + reader.norms(field)); } } @Override - public Explanation explain(IndexReader reader, int doc) + public Explanation explain(ReaderInfo info, int doc) throws IOException { Explanation result = new Explanation(); @@ -267,7 +268,7 @@ fieldExpl.setDescription("fieldWeight("+field+":"+query+" in "+doc+ "), product of:"); - Scorer scorer = scorer(reader, true, false); + Scorer scorer = scorer(info, true, false); if (scorer == null) { return new Explanation(0.0f, "no matching docs"); } @@ -287,7 +288,7 @@ fieldExpl.addDetail(idfExpl); Explanation fieldNormExpl = new Explanation(); - byte[] fieldNorms = reader.norms(field); + byte[] fieldNorms = info.sub.norms(field); float fieldNorm = fieldNorms!=null ? similarity.decodeNormValue(fieldNorms[doc]) : 1.0f; fieldNormExpl.setValue(fieldNorm); Index: lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java (working copy) @@ -18,9 +18,11 @@ */ import java.io.IOException; - - +import org.apache.lucene.document.Document; +import org.apache.lucene.document.FieldSelector; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; +import org.apache.lucene.index.Term; /** * Constrains search results to only match those which also match a provided @@ -48,12 +50,12 @@ } @Override - public DocIdSet getDocIdSet(final IndexReader reader) throws IOException { - final Weight weight = query.weight(new IndexSearcher(reader)); + public DocIdSet getDocIdSet(final ReaderInfo info) throws IOException { + final Weight weight = query.weight(new WeightOnlyearcher(info.parent.readerInfos(), info.ord)); return new DocIdSet() { @Override public DocIdSetIterator iterator() throws IOException { - return weight.scorer(reader, true, false); + return weight.scorer(info, true, false); } @Override public boolean isCacheable() { return false; } @@ -76,4 +78,94 @@ public int hashCode() { return query.hashCode() ^ 0x923F64B9; } + + /* + * nocommit - This searcher acts like a Searcher build from a sub reader + * in the given ReaderInfos but returns the ReaderInfo array as it would be + * build from the subs parent. This is needed to allow the created Weight to + * hold the ReaderInfo array of the top level IR for caching and assertion + * purposes. + * + * this should work somehow differently - will leave it like that for now + */ + private static final class WeightOnlyearcher extends Searcher { + private final ReaderInfo[] infos; + private final IndexReader sub; + + public WeightOnlyearcher(ReaderInfo[] infos, int ord) { + assert infos.length > ord; + this.infos = infos; + sub = infos[ord].sub; + } + + @Override + public int docFreq(Term term) throws IOException { + return sub.docFreq(term); + } + + @Override + public int[] docFreqs(Term[] terms) throws IOException { + final int[] result = new int[terms.length]; + for (int i = 0; i < terms.length; i++) { + result[i] = docFreq(terms[i]); + } + return result; + } + + @Override + public int maxDoc() { + return sub.maxDoc(); + } + + @Override + public Query rewrite(Query original) throws IOException { + Query query = original; + for (Query rewrittenQuery = query.rewrite(sub); rewrittenQuery != query; + rewrittenQuery = query.rewrite(sub)) { + query = rewrittenQuery; + } + return query; + } + + + @Override + public void close() { + throw new UnsupportedOperationException(); + } + + @Override + public Document doc(int i) { + throw new UnsupportedOperationException(); + } + + @Override + public Document doc(int i, FieldSelector fieldSelector) { + throw new UnsupportedOperationException(); + } + + @Override + public Explanation explain(Weight weight,int doc) { + throw new UnsupportedOperationException(); + } + + @Override + public void search(Weight weight, Filter filter, Collector results) { + throw new UnsupportedOperationException(); + } + + @Override + public TopDocs search(Weight weight,Filter filter,int n) { + throw new UnsupportedOperationException(); + } + + @Override + public TopFieldDocs search(Weight weight,Filter filter,int n,Sort sort) { + throw new UnsupportedOperationException(); + } + + @Override + public ReaderInfo[] readerInfos() { + return infos; + } + } } Index: lucene/src/java/org/apache/lucene/search/Searcher.java =================================================================== --- lucene/src/java/org/apache/lucene/search/Searcher.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/Searcher.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.document.FieldSelector; @@ -168,6 +169,14 @@ } return result; } + + /** + * TODO + * @return + */ + public ReaderInfo[] readerInfos() { + return null; + } abstract public void search(Weight weight, Filter filter, Collector results) throws IOException; abstract public void close() throws IOException; Index: lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java =================================================================== --- lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java (working copy) @@ -17,6 +17,7 @@ import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.Spans; import org.apache.lucene.util.OpenBitSet; @@ -52,8 +53,8 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - SpanFilterResult result = bitSpans(reader); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + SpanFilterResult result = bitSpans(info.sub); return result.getDocIdSet(); } Index: lucene/src/java/org/apache/lucene/search/TermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TermQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/TermQuery.java (working copy) @@ -21,8 +21,9 @@ import java.util.Set; import org.apache.lucene.index.DocsEnum; -import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; +import org.apache.lucene.index.Term; import org.apache.lucene.search.Explanation.IDFExplanation; import org.apache.lucene.util.ToStringUtils; @@ -40,9 +41,11 @@ private float queryNorm; private float queryWeight; private IDFExplanation idfExp; + private final transient ReaderInfo[] readerInfo; // only for assert public TermWeight(Searcher searcher) throws IOException { + readerInfo = searcher.readerInfos(); this.similarity = getSimilarity(searcher); if (docFreq != -1) { idfExp = similarity.idfExplain(term, searcher, docFreq); @@ -75,7 +78,10 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + assert readerInfo == null || this.readerInfo[0].parent == info.parent; + // TODO we should really assert that the ord of the give sub patches with the readerinfos get from the searcher when weight is created + final IndexReader reader = info.sub; DocsEnum docs = reader.termDocsEnum(reader.getDeletedDocs(), term.field(), term.bytes()); @@ -88,8 +94,9 @@ } @Override - public Explanation explain(IndexReader reader, int doc) + public Explanation explain(ReaderInfo info, int doc) throws IOException { + final IndexReader reader = info.sub; ComplexExplanation result = new ComplexExplanation(); result.setDescription("weight("+getQuery()+" in "+doc+"), product of:"); Index: lucene/src/java/org/apache/lucene/search/Weight.java =================================================================== --- lucene/src/java/org/apache/lucene/search/Weight.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/Weight.java (working copy) @@ -21,6 +21,7 @@ import java.io.Serializable; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; /** * Expert: Calculate query weights and build query scorers. @@ -41,7 +42,7 @@ * query. *

  • The query normalization factor is passed to {@link #normalize(float)}. At * this point the weighting is complete. - *
  • A Scorer is constructed by {@link #scorer(IndexReader,boolean,boolean)}. + *
  • A Scorer is constructed by {@link #scorer(ReaderInfo,boolean,boolean)}. * * * @since 2.9 @@ -51,12 +52,12 @@ /** * An explanation of the score computation for the named document. * - * @param reader sub-reader containing the give doc + * @param info reader info that holds the sub-reader containing the give doc * @param doc * @return an Explanation for the score * @throws IOException */ - public abstract Explanation explain(IndexReader reader, int doc) throws IOException; + public abstract Explanation explain(ReaderInfo info, int doc) throws IOException; /** The query that this concerns. */ public abstract Query getQuery(); @@ -79,8 +80,8 @@ * NOTE: null can be returned if no documents will be scored by this * query. * - * @param reader - * the {@link IndexReader} for which to return the {@link Scorer}. + * @param info + * the {@link ReaderInfo} for which to return the {@link Scorer}. * @param scoreDocsInOrder * specifies whether in-order scoring of documents is required. Note * that if set to false (i.e., out-of-order scoring is required), @@ -96,7 +97,7 @@ * @return a {@link Scorer} which scores documents in/out-of order. * @throws IOException */ - public abstract Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, + public abstract Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException; /** The sum of squared weights of contained query clauses. */ @@ -106,7 +107,7 @@ * Returns true iff this implementation scores docs only out of order. This * method is used in conjunction with {@link Collector}'s * {@link Collector#acceptsDocsOutOfOrder() acceptsDocsOutOfOrder} and - * {@link #scorer(org.apache.lucene.index.IndexReader, boolean, boolean)} to + * {@link #scorer(ReaderInfo, boolean, boolean)} to * create a matching {@link Scorer} instance for a given {@link Collector}, or * vice versa. *

    Index: lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java (working copy) @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.search.ComplexExplanation; import org.apache.lucene.search.Explanation; @@ -239,40 +240,40 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { // Pass true for "scoresDocsInOrder", because we // require in-order scoring, even if caller does not, // 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(reader, true, false); + Scorer subQueryScorer = subQueryWeight.scorer(info, true, false); if (subQueryScorer == null) { return null; } Scorer[] valSrcScorers = new Scorer[valSrcWeights.length]; for(int i = 0; i < valSrcScorers.length; i++) { - valSrcScorers[i] = valSrcWeights[i].scorer(reader, true, topScorer); + valSrcScorers[i] = valSrcWeights[i].scorer(info, true, topScorer); } - return new CustomScorer(similarity, reader, this, subQueryScorer, valSrcScorers); + return new CustomScorer(similarity, info.sub, this, subQueryScorer, valSrcScorers); } @Override - public Explanation explain(IndexReader reader, int doc) throws IOException { - Explanation explain = doExplain(reader, doc); + public Explanation explain(ReaderInfo info, int doc) throws IOException { + Explanation explain = doExplain(info, doc); return explain == null ? new Explanation(0.0f, "no matching docs") : explain; } - private Explanation doExplain(IndexReader reader, int doc) throws IOException { - Explanation subQueryExpl = subQueryWeight.explain(reader, doc); + private Explanation doExplain(ReaderInfo info, int doc) throws IOException { + Explanation subQueryExpl = subQueryWeight.explain(info, doc); if (!subQueryExpl.isMatch()) { return subQueryExpl; } // match Explanation[] valSrcExpls = new Explanation[valSrcWeights.length]; for(int i = 0; i < valSrcWeights.length; i++) { - valSrcExpls[i] = valSrcWeights[i].explain(reader, doc); + valSrcExpls[i] = valSrcWeights[i].explain(info, doc); } - Explanation customExp = CustomScoreQuery.this.getCustomScoreProvider(reader).customExplain(doc,subQueryExpl,valSrcExpls); + Explanation customExp = CustomScoreQuery.this.getCustomScoreProvider(info.sub).customExplain(doc,subQueryExpl,valSrcExpls); float sc = getValue() * customExp.getValue(); Explanation res = new ComplexExplanation( true, sc, CustomScoreQuery.this.toString() + ", product of:"); Index: lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.*; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.ToStringUtils; @@ -99,14 +100,14 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new ValueSourceScorer(similarity, reader, this); + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + return new ValueSourceScorer(similarity, info.sub, this); } /*(non-Javadoc) @see org.apache.lucene.search.Weight#explain(org.apache.lucene.index.IndexReader, int) */ @Override - public Explanation explain(IndexReader reader, int doc) throws IOException { - DocValues vals = valSrc.getValues(reader); + public Explanation explain(ReaderInfo info, int doc) throws IOException { + DocValues vals = valSrc.getValues(info.sub); float sc = queryWeight * vals.floatVal(doc); Explanation result = new ComplexExplanation( Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (working copy) @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Searcher; @@ -143,10 +143,10 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new PayloadNearSpanScorer(query.getSpans(reader), this, - similarity, reader.norms(query.getField())); + return new PayloadNearSpanScorer(query.getSpans(info.sub), this, + similarity, info.sub.norms(query.getField())); } } Index: lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (working copy) @@ -17,9 +17,9 @@ * limitations under the License. */ +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsAndPositionsEnum; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; @@ -74,10 +74,10 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new PayloadTermSpanScorer((TermSpans) query.getSpans(reader), - this, similarity, reader.norms(query.getField())); + return new PayloadTermSpanScorer((TermSpans) query.getSpans(info.sub), + this, similarity, info.sub.norms(query.getField())); } protected class PayloadTermSpanScorer extends SpanScorer { Index: lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (revision 1052196) +++ lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java (working copy) @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; import org.apache.lucene.search.Explanation.IDFExplanation; @@ -72,13 +72,13 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - return new SpanScorer(query.getSpans(reader), this, similarity, reader + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { + return new SpanScorer(query.getSpans(info.sub), this, similarity, info.sub .norms(query.getField())); } @Override - public Explanation explain(IndexReader reader, int doc) + public Explanation explain(ReaderInfo info, int doc) throws IOException { ComplexExplanation result = new ComplexExplanation(); @@ -111,12 +111,12 @@ fieldExpl.setDescription("fieldWeight("+field+":"+query.toString(field)+ " in "+doc+"), product of:"); - Explanation tfExpl = ((SpanScorer)scorer(reader, true, false)).explain(doc); + Explanation tfExpl = ((SpanScorer)scorer(info, true, false)).explain(doc); fieldExpl.addDetail(tfExpl); fieldExpl.addDetail(idfExpl); Explanation fieldNormExpl = new Explanation(); - byte[] fieldNorms = reader.norms(field); + byte[] fieldNorms = info.sub.norms(field); float fieldNorm = fieldNorms!=null ? similarity.decodeNormValue(fieldNorms[doc]) : 1.0f; fieldNormExpl.setValue(fieldNorm); Index: lucene/src/test/org/apache/lucene/search/CachingWrapperFilterHelper.java =================================================================== --- lucene/src/test/org/apache/lucene/search/CachingWrapperFilterHelper.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/CachingWrapperFilterHelper.java (working copy) @@ -20,7 +20,8 @@ import java.io.IOException; import junit.framework.Assert; -import org.apache.lucene.index.IndexReader; + +import org.apache.lucene.index.IndexReader.ReaderInfo; /** * A unit test helper class to test when the filter is getting cached and when it is not. @@ -41,10 +42,10 @@ } @Override - public synchronized DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public synchronized DocIdSet getDocIdSet(ReaderInfo info) throws IOException { final int saveMissCount = missCount; - DocIdSet docIdSet = super.getDocIdSet(reader); + DocIdSet docIdSet = super.getDocIdSet(info); if (shouldHaveCache) { Assert.assertEquals("Cache should have data ", saveMissCount, missCount); Index: lucene/src/test/org/apache/lucene/search/JustCompileSearch.java =================================================================== --- lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.document.FieldSelector; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.PriorityQueue; @@ -266,7 +267,7 @@ // still added here in case someone will add abstract methods in the future. @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { return null; } } @@ -395,7 +396,7 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { return null; } } @@ -447,7 +448,7 @@ static final class JustCompileWeight extends Weight { @Override - public Explanation explain(IndexReader reader, int doc) throws IOException { + public Explanation explain(ReaderInfo info, int doc) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } @@ -472,7 +473,7 @@ } @Override - public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) + public Scorer scorer(ReaderInfo info, boolean scoreDocsInOrder, boolean topScorer) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MSG); } Index: lucene/src/test/org/apache/lucene/search/MockFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/MockFilter.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/MockFilter.java (working copy) @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.util.DocIdBitSet; import java.util.BitSet; @@ -25,7 +25,7 @@ private boolean wasCalled; @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { wasCalled = true; return new DocIdBitSet(new BitSet()); } Index: lucene/src/test/org/apache/lucene/search/QueryUtils.java =================================================================== --- lucene/src/test/org/apache/lucene/search/QueryUtils.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/QueryUtils.java (working copy) @@ -12,6 +12,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiReader; @@ -258,7 +259,7 @@ */ public static void checkSkipTo(final Query q, final IndexSearcher s) throws IOException { //System.out.println("Checking "+q); - + final ReaderInfo[] info = s.readerInfos(); if (q.weight(s).scoresDocsOutOfOrder()) return; // in this case order of skipTo() might differ from that of next(). final int skip_op = 0; @@ -288,8 +289,8 @@ s.search(q, new Collector() { private Scorer sc; - private IndexReader reader; private Scorer scorer; + private int infoPtr; @Override public void setScorer(Scorer scorer) throws IOException { @@ -303,7 +304,7 @@ try { if (scorer == null) { Weight w = q.weight(s); - scorer = w.scorer(reader, true, false); + scorer = w.scorer(info[infoPtr], true, false); } int op = order[(opidx[0]++) % order.length]; @@ -347,13 +348,15 @@ if (lastReader[0] != null) { final IndexReader previousReader = lastReader[0]; Weight w = q.weight(new IndexSearcher(previousReader)); - Scorer scorer = w.scorer(previousReader, true, false); + Scorer scorer = w.scorer(new ReaderInfo(previousReader, previousReader, 0), true, false); 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); } + infoPtr++; } - this.reader = lastReader[0] = reader; + lastReader[0] = reader; + assert info[infoPtr].sub == reader; this.scorer = null; lastDoc[0] = -1; } @@ -369,7 +372,7 @@ // previous reader, hits NO_MORE_DOCS final IndexReader previousReader = lastReader[0]; Weight w = q.weight(new IndexSearcher(previousReader)); - Scorer scorer = w.scorer(previousReader, true, false); + Scorer scorer = w.scorer(new ReaderInfo(previousReader, previousReader, 0), true, false); 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); @@ -384,10 +387,10 @@ final float maxDiff = 1e-3f; final int lastDoc[] = {-1}; final IndexReader lastReader[] = {null}; - + final ReaderInfo[] info = s.readerInfos(); s.search(q,new Collector() { private Scorer scorer; - private IndexReader reader; + private int infoPtr; @Override public void setScorer(Scorer scorer) throws IOException { this.scorer = scorer; @@ -399,7 +402,7 @@ long startMS = System.currentTimeMillis(); for (int i=lastDoc[0]+1; i<=doc; i++) { Weight w = q.weight(s); - Scorer scorer = w.scorer(reader, true, false); + Scorer scorer = w.scorer(info[infoPtr], true, false); 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(); @@ -425,14 +428,16 @@ if (lastReader[0] != null) { final IndexReader previousReader = lastReader[0]; Weight w = q.weight(new IndexSearcher(previousReader)); - Scorer scorer = w.scorer(previousReader, true, false); + Scorer scorer = w.scorer(new ReaderInfo(previousReader, previousReader, 0), true, false); 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); } + infoPtr++; } - this.reader = lastReader[0] = reader; + lastReader[0] = reader; + assert info[infoPtr].sub == reader; lastDoc[0] = -1; } @Override @@ -446,7 +451,7 @@ // previous reader, hits NO_MORE_DOCS final IndexReader previousReader = lastReader[0]; Weight w = q.weight(new IndexSearcher(previousReader)); - Scorer scorer = w.scorer(previousReader, true, false); + Scorer scorer = w.scorer(new ReaderInfo(previousReader, previousReader, 0), true, false); 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); Index: lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/SingleDocTestFilter.java (working copy) @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.util.DocIdBitSet; import java.util.BitSet; @@ -31,8 +31,8 @@ } @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - BitSet bits = new BitSet(reader.maxDoc()); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + BitSet bits = new BitSet(info.sub.maxDoc()); bits.set(doc); return new DocIdBitSet(bits); } Index: lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.PrefixQuery; @@ -38,7 +39,7 @@ if (q instanceof BooleanQuery) { return ((BooleanQuery) q).getClauses().length; } else if (q instanceof ConstantScoreQuery) { - DocIdSetIterator iter = ((ConstantScoreQuery) q).getFilter().getDocIdSet(r).iterator(); + DocIdSetIterator iter = ((ConstantScoreQuery) q).getFilter().getDocIdSet(new ReaderInfo(r, r, 0)).iterator(); int count = 0; while(iter.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { count++; Index: lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (working copy) @@ -23,6 +23,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.ReaderInfo; import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; @@ -41,20 +42,20 @@ writer.close(); IndexReader reader = IndexReader.open(dir, true); - + ReaderInfo info = new ReaderInfo(reader, reader, 0); MockFilter filter = new MockFilter(); CachingWrapperFilter cacher = new CachingWrapperFilter(filter); // first time, nested filter is called - cacher.getDocIdSet(reader); + cacher.getDocIdSet(info); assertTrue("first time", filter.wasCalled()); // make sure no exception if cache is holding the wrong docIdSet - cacher.getDocIdSet(reader); + cacher.getDocIdSet(info); // second time, nested filter should not be called filter.clear(); - cacher.getDocIdSet(reader); + cacher.getDocIdSet(info); assertFalse("second time", filter.wasCalled()); reader.close(); @@ -67,17 +68,18 @@ writer.close(); IndexReader reader = IndexReader.open(dir, true); + ReaderInfo info = new ReaderInfo(reader, reader, 0); final Filter filter = new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { return null; } }; CachingWrapperFilter cacher = new CachingWrapperFilter(filter); // the caching filter should return the empty set constant - assertSame(DocIdSet.EMPTY_DOCIDSET, cacher.getDocIdSet(reader)); + assertSame(DocIdSet.EMPTY_DOCIDSET, cacher.getDocIdSet(info)); reader.close(); dir.close(); @@ -89,10 +91,11 @@ writer.close(); IndexReader reader = IndexReader.open(dir, true); + ReaderInfo info = new ReaderInfo(reader, reader, 0); final Filter filter = new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { return new DocIdSet() { @Override public DocIdSetIterator iterator() { @@ -104,16 +107,17 @@ CachingWrapperFilter cacher = new CachingWrapperFilter(filter); // the caching filter should return the empty set constant - assertSame(DocIdSet.EMPTY_DOCIDSET, cacher.getDocIdSet(reader)); + assertSame(DocIdSet.EMPTY_DOCIDSET, cacher.getDocIdSet(info)); reader.close(); dir.close(); } private static void assertDocIdSetCacheable(IndexReader reader, Filter filter, boolean shouldCacheable) throws IOException { + ReaderInfo info = new ReaderInfo(reader, reader, 0); final CachingWrapperFilter cacher = new CachingWrapperFilter(filter); - final DocIdSet originalSet = filter.getDocIdSet(reader); - final DocIdSet cachedSet = cacher.getDocIdSet(reader); + final DocIdSet originalSet = filter.getDocIdSet(info); + final DocIdSet cachedSet = cacher.getDocIdSet(info); assertTrue(cachedSet.isCacheable()); assertEquals(shouldCacheable, originalSet.isCacheable()); //System.out.println("Original: "+originalSet.getClass().getName()+" -- cached: "+cachedSet.getClass().getName()); @@ -141,7 +145,7 @@ // a openbitset filter is always cacheable assertDocIdSetCacheable(reader, new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { return new OpenBitSet(); } }, true); Index: lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (working copy) @@ -25,6 +25,7 @@ import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.store.Directory; import java.text.DecimalFormat; @@ -163,9 +164,9 @@ dq.add(tq("dek", "DOES_NOT_EXIST")); QueryUtils.check(random, dq, s); - + assertEquals(1, s.readerInfos().length); final Weight dw = dq.weight(s); - final Scorer ds = dw.scorer(s.getIndexReader(), true, false); + final Scorer ds = dw.scorer(s.readerInfos()[0], true, false); final boolean skipOk = ds.advance(3) != DocIdSetIterator.NO_MORE_DOCS; if (skipOk) { fail("firsttime skipTo found a match? ... " @@ -177,11 +178,10 @@ final DisjunctionMaxQuery dq = new DisjunctionMaxQuery(0.0f); dq.add(tq("dek", "albino")); dq.add(tq("dek", "DOES_NOT_EXIST")); - + assertEquals(1, s.readerInfos().length); QueryUtils.check(random, dq, s); - final Weight dw = dq.weight(s); - final Scorer ds = dw.scorer(s.getIndexReader(), true, false); + final Scorer ds = dw.scorer(s.readerInfos()[0], true, false); 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/test/org/apache/lucene/search/TestDocIdSet.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (working copy) @@ -29,6 +29,7 @@ import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -115,7 +116,7 @@ // Now search w/ a Filter which returns a null DocIdSet Filter f = new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { return null; } }; Index: lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestFilteredQuery.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.ReaderInfo; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; @@ -87,7 +88,7 @@ private static Filter newStaticFilterB() { return new Filter() { @Override - public DocIdSet getDocIdSet (IndexReader reader) { + public DocIdSet getDocIdSet (ReaderInfo info) { BitSet bitset = new BitSet(5); bitset.set (1); bitset.set (3); @@ -158,7 +159,7 @@ private static Filter newStaticFilterA() { return new Filter() { @Override - public DocIdSet getDocIdSet (IndexReader reader) { + public DocIdSet getDocIdSet (ReaderInfo info) { BitSet bitset = new BitSet(5); bitset.set(0, 5); return new DocIdBitSet(bitset); Index: lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (working copy) @@ -25,6 +25,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexWriterConfig.OpenMode; @@ -59,7 +60,7 @@ directory.close(); } - public void searchFiltered(IndexWriter writer, Directory directory, SimpleDocIdSetFilter filter, boolean optimize) { + public void searchFiltered(IndexWriter writer, Directory directory, Filter filter, boolean optimize) { try { for (int i = 0; i < 60; i++) {//Simple docs Document doc = new Document(); @@ -75,7 +76,6 @@ IndexSearcher indexSearcher = new IndexSearcher(directory, true); - filter.setTopReader(indexSearcher.getIndexReader()); ScoreDoc[] hits = indexSearcher.search(booleanQuery, filter, 1000).scoreDocs; assertEquals("Number of matched documents", 1, hits.length); indexSearcher.close(); @@ -89,20 +89,16 @@ public static final class SimpleDocIdSetFilter extends Filter { private final int[] docs; private int index; - private IndexReader topReader; + public SimpleDocIdSetFilter(int[] docs) { this.docs = docs; } - public void setTopReader(IndexReader r) { - topReader = r; - } - @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { final OpenBitSet set = new OpenBitSet(); - int docBase = topReader.getSubReaderDocBase(reader); - final int limit = docBase+reader.maxDoc(); + int docBase = info.parent.getSubReaderDocBase(info.sub); + final int limit = docBase+info.sub.maxDoc(); for (;index < docs.length; index++) { final int docId = docs[index]; if(docId > limit) Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.RandomIndexWriter; @@ -178,13 +179,13 @@ @Test public void testInverseRange() throws Exception { NumericRangeFilter f = NumericRangeFilter.newIntRange("field8", 8, 1000, -1000, true, true); - assertSame("A inverse range should return the EMPTY_DOCIDSET instance", DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + assertSame("A inverse range should return the EMPTY_DOCIDSET instance", DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); f = NumericRangeFilter.newIntRange("field8", 8, Integer.MAX_VALUE, null, false, false); assertSame("A exclusive range starting with Integer.MAX_VALUE should return the EMPTY_DOCIDSET instance", - DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); f = NumericRangeFilter.newIntRange("field8", 8, null, Integer.MIN_VALUE, false, false); assertSame("A exclusive range ending with Integer.MIN_VALUE should return the EMPTY_DOCIDSET instance", - DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); } @Test Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; @@ -183,13 +184,13 @@ @Test public void testInverseRange() throws Exception { NumericRangeFilter f = NumericRangeFilter.newLongRange("field8", 8, 1000L, -1000L, true, true); - assertSame("A inverse range should return the EMPTY_DOCIDSET instance", DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + assertSame("A inverse range should return the EMPTY_DOCIDSET instance", DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); f = NumericRangeFilter.newLongRange("field8", 8, Long.MAX_VALUE, null, false, false); assertSame("A exclusive range starting with Long.MAX_VALUE should return the EMPTY_DOCIDSET instance", - DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); f = NumericRangeFilter.newLongRange("field8", 8, null, Long.MIN_VALUE, false, false); assertSame("A exclusive range ending with Long.MIN_VALUE should return the EMPTY_DOCIDSET instance", - DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(searcher.getIndexReader())); + DocIdSet.EMPTY_DOCIDSET, f.getDocIdSet(new ReaderInfo(searcher.getIndexReader()))); } @Test Index: lucene/src/test/org/apache/lucene/search/TestScorerPerf.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (working copy) @@ -7,6 +7,7 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexWriterConfig.OpenMode; @@ -141,7 +142,7 @@ final BitSet rnd = sets[random.nextInt(sets.length)]; Query q = new ConstantScoreQuery(new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) { + public DocIdSet getDocIdSet(ReaderInfo info) { return new DocIdBitSet(rnd); } }); Index: lucene/src/test/org/apache/lucene/search/TestSort.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSort.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestSort.java (working copy) @@ -35,6 +35,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LogMergePolicy; @@ -799,9 +800,9 @@ // a filter that only allows through the first hit Filter filt = new Filter() { @Override - public DocIdSet getDocIdSet(IndexReader reader) throws IOException { - BitSet bs = new BitSet(reader.maxDoc()); - bs.set(0, reader.maxDoc()); + public DocIdSet getDocIdSet(ReaderInfo info) throws IOException { + BitSet bs = new BitSet(info.sub.maxDoc()); + bs.set(0, info.sub.maxDoc()); bs.set(docs1.scoreDocs[0].doc); return new DocIdBitSet(bs); } Index: lucene/src/test/org/apache/lucene/search/TestTermScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermScorer.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/TestTermScorer.java (working copy) @@ -28,6 +28,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.SlowMultiReaderWrapper; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.store.Directory; public class TestTermScorer extends LuceneTestCase { @@ -71,7 +72,7 @@ Weight weight = termQuery.weight(indexSearcher); - Scorer ts = weight.scorer(indexSearcher.getIndexReader(), true, true); + Scorer ts = weight.scorer(new ReaderInfo(indexSearcher.getIndexReader()), true, true); // we have 2 documents with the term all in them, one document for all the // other values final List docs = new ArrayList(); @@ -132,7 +133,7 @@ Weight weight = termQuery.weight(indexSearcher); - Scorer ts = weight.scorer(indexSearcher.getIndexReader(), true, true); + Scorer ts = weight.scorer(new ReaderInfo(indexSearcher.getIndexReader()), true, true); assertTrue("next did not return a doc", ts.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertTrue("score is not correct", ts.score() == 1.6931472f); @@ -150,7 +151,7 @@ Weight weight = termQuery.weight(indexSearcher); - Scorer ts = weight.scorer(indexSearcher.getIndexReader(), true, true); + Scorer ts = weight.scorer(new ReaderInfo(indexSearcher.getIndexReader()), true, true); 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/spans/TestNearSpansOrdered.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.Explanation; @@ -168,7 +169,7 @@ public void testSpanNearScorerSkipTo1() throws Exception { SpanNearQuery q = makeQuery(); Weight w = q.weight(searcher); - Scorer s = w.scorer(searcher.getIndexReader(), true, false); + Scorer s = w.scorer(new ReaderInfo(searcher.getIndexReader()), true, false); assertEquals(1, s.advance(1)); } /** @@ -177,7 +178,7 @@ */ public void testSpanNearScorerExplain() throws Exception { SpanNearQuery q = makeQuery(); - Explanation e = q.weight(searcher).explain(searcher.getIndexReader(), 1); + Explanation e = q.weight(searcher).explain(new ReaderInfo(searcher.getIndexReader()), 1); assertTrue("Scorer explanation value for doc#1 isn't positive: " + e.toString(), 0.0f < e.getValue()); Index: lucene/src/test/org/apache/lucene/search/spans/TestSpans.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (revision 1052196) +++ lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (working copy) @@ -30,6 +30,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; @@ -421,7 +422,7 @@ } }; - Scorer spanScorer = snq.weight(searcher).scorer(new SlowMultiReaderWrapper(searcher.getIndexReader()), true, false); + Scorer spanScorer = snq.weight(searcher).scorer(new ReaderInfo(new SlowMultiReaderWrapper(searcher.getIndexReader())), true, false); assertTrue("first doc", spanScorer.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals("first doc number", spanScorer.docID(), 11); Index: solr/src/java/org/apache/solr/handler/component/QueryComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/QueryComponent.java (revision 1052196) +++ solr/src/java/org/apache/solr/handler/component/QueryComponent.java (working copy) @@ -18,6 +18,8 @@ package org.apache.solr.handler.component; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.*; @@ -444,23 +446,22 @@ 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) { + ReaderInfo[] readerInfos = searcher.readerInfos(); + ReaderInfo current; + current = readerInfos[0]; + if (readerInfos.length==1) { // if there is a single segment, use that subReader and avoid looking up each time - subReader = readers[0]; - readers=null; + current = readerInfos[0]; + readerInfos = null; } - int[] offsets = reader.getLeafOffsets(); + int[] offsets = searcher.getReader().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[] = (readerInfos==null) ? null : new FieldComparator[readerInfos.length]; String fieldname = sortField.getField(); FieldType ft = fieldname==null ? null : req.getSchema().getFieldTypeNoEx(fieldname); @@ -474,16 +475,16 @@ while(it.hasNext()) { int doc = it.nextDoc(); - if (readers != null) { + if (readerInfos != null) { idx = SolrIndexReader.readerIndex(doc, offsets); - subReader = readers[idx]; + current = readerInfos[idx]; offset = offsets[idx]; comparator = comparators[idx]; } if (comparator == null) { comparator = sortField.getComparator(1,0); - comparator = comparator.setNextReader(subReader, offset); + comparator = comparator.setNextReader(current.sub, offset); if (comparators != null) comparators[idx] = comparator; } Index: solr/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java =================================================================== --- solr/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (revision 1052196) +++ solr/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (working copy) @@ -1,5 +1,6 @@ package org.apache.solr.request; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; @@ -68,8 +69,7 @@ baseSet = docs.getTopFilter(); SolrIndexReader topReader = searcher.getReader(); - final SolrIndexReader[] leafReaders = topReader.getLeafReaders(); - int[] offsets = topReader.getLeafOffsets(); + final ReaderInfo[] infos = topReader.readerInfos(); // The list of pending tasks that aren't immediately submitted // TODO: Is there a completion service, or a delegating executor that can @@ -78,8 +78,8 @@ int threads = nThreads <= 0 ? Integer.MAX_VALUE : nThreads; - for (int i=0; i task = new Callable() { public SegFacet call() throws Exception { @@ -101,7 +101,7 @@ // now merge the per-segment results PriorityQueue queue = new PriorityQueue() { { - initialize(leafReaders.length); + initialize(infos.length); } @Override protected boolean lessThan(SegFacet a, SegFacet b) { @@ -112,7 +112,7 @@ boolean hasMissingCount=false; int missingCount=0; - for (int i=0; i 10 ); // found something... Index: solr/src/test/org/apache/solr/search/TestDocSet.java =================================================================== --- solr/src/test/org/apache/solr/search/TestDocSet.java (revision 1052196) +++ solr/src/test/org/apache/solr/search/TestDocSet.java (working copy) @@ -26,6 +26,7 @@ import org.apache.lucene.util.OpenBitSetIterator; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.FilterIndexReader; +import org.apache.lucene.index.IndexReader.ReaderInfo; import org.apache.lucene.index.MultiReader; import org.apache.lucene.search.Filter; import org.apache.lucene.search.DocIdSet; @@ -404,6 +405,7 @@ } public void doFilterTest(SolrIndexReader reader) throws IOException { + ReaderInfo info = new ReaderInfo(reader); OpenBitSet bs = getRandomSet(reader.maxDoc(), rand.nextInt(reader.maxDoc()+1)); DocSet a = new BitDocSet(bs); DocSet b = getIntDocSet(bs); @@ -412,23 +414,23 @@ Filter fb = b.getTopFilter(); // test top-level - DocIdSet da = fa.getDocIdSet(reader); - DocIdSet db = fb.getDocIdSet(reader); + DocIdSet da = fa.getDocIdSet(info); + DocIdSet db = fb.getDocIdSet(info); doTestIteratorEqual(da, db); // first test in-sequence sub readers - for (SolrIndexReader sir : reader.getLeafReaders()) { - da = fa.getDocIdSet(sir); - db = fb.getDocIdSet(sir); + for (ReaderInfo readerInfo : reader.readerInfos()) { + da = fa.getDocIdSet(readerInfo); + db = fb.getDocIdSet(readerInfo); doTestIteratorEqual(da, db); } - int nReaders = reader.getLeafReaders().length; + int nReaders = reader.readerInfos().length; // now test out-of-sequence sub readers for (int i=0; i multi - assertEquals(r1.getLeafReaders()[0], r2.getLeafReaders()[0]); + assertEquals(r1.readerInfos()[0].sub, r2.readerInfos()[0].sub); assertU(adoc("id","5", "v_f","3.14159")); assertU(adoc("id","6", "v_f","8983", "v_s","string6")); @@ -77,8 +79,8 @@ SolrIndexReader r3 = sr3.getSearcher().getReader(); // 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(r2.readerInfos()[0].sub, r3.readerInfos()[0].sub); + assertEquals(r2.readerInfos()[1].sub, r3.readerInfos()[1].sub); sr1.close(); sr2.close(); @@ -112,8 +114,8 @@ 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 + assertEquals(1, r6.readerInfos()[0].sub.numDocs()); // only a single doc left in the first segment + assertTrue( !r5.readerInfos()[0].sub.equals(r6.readerInfos()[0].sub) ); // 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 1052196) +++ solr/src/test/org/apache/solr/search/TestSort.java (working copy) @@ -21,6 +21,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.ReaderInfo; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.*; @@ -106,8 +107,8 @@ for (int i=0; i r.numDocs()); // should have deletions - assertTrue(r.getLeafReaders().length > 1); // more than 1 segment + assertTrue(r.readerInfos().length > 1); // more than 1 segment sr.close(); assertU(commit("expungeDeletes","true")); @@ -326,7 +326,7 @@ r = sr.getSearcher().getReader(); assertEquals(r.maxDoc(), r.numDocs()); // no deletions assertEquals(4,r.maxDoc()); // no dups - assertTrue(r.getLeafReaders().length > 1); // still more than 1 segment + assertTrue(r.readerInfos().length > 1); // still more than 1 segment sr.close(); }