You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/04/11 02:12:29 UTC
svn commit: r1090913 -
/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
Author: yonik
Date: Mon Apr 11 00:12:29 2011
New Revision: 1090913
URL: http://svn.apache.org/viewvc?rev=1090913&view=rev
Log:
SOLR-2432: fix useFilterForSortedQuery which was broken by LUCENE-2831
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1090913&r1=1090912&r2=1090913&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Apr 11 00:12:29 2011
@@ -1593,14 +1593,12 @@ public class SolrIndexSearcher extends I
DocIterator iter = set.iterator();
int base=0;
int end=0;
- int readerIndex = -1;
-
- AtomicReaderContext leaf = null;
+ int readerIndex = 0;
- for (int i = 0; i < leafContexts.length; i++) {
+ while (iter.hasNext()) {
int doc = iter.nextDoc();
while (doc>=end) {
- leaf = leafContexts[i++];
+ AtomicReaderContext leaf = leafContexts[readerIndex++];
base = leaf.docBase;
end = base + leaf.reader.maxDoc();
topCollector.setNextReader(leaf);