Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2662: fix 'start' handling when a query isn't cached 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2011-07-22 22:03:54 +00:00
parent 2ff9fa27e7
commit f8dd8a6ce3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/CHANGES.txt
View File

@ -369,6 +369,12 @@ Bug Fixes
prior to the float value. prior to the float value.
(Markus Jelsma, hossman) (Markus Jelsma, hossman)
* SOLR-2662: When Solr is configured to have no queryResultCache, the
"start" parameter was not honored and the documents returned were
0 through start+offset. (Markus Jelsma, yonik)
Other Changes Other Changes
---------------------- ----------------------

7
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -1151,10 +1151,9 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
getDocListNC(qr,cmd); getDocListNC(qr,cmd);
//Parameters: cmd.getQuery(),theFilt,cmd.getSort(),0,supersetMaxDoc,cmd.getFlags(),cmd.getTimeAllowed(),responseHeader); //Parameters: cmd.getQuery(),theFilt,cmd.getSort(),0,supersetMaxDoc,cmd.getFlags(),cmd.getTimeAllowed(),responseHeader);
} }
if (key != null) {
superset = out.docList; superset = out.docList;
out.docList = superset.subset(cmd.getOffset(),cmd.getLen()); out.docList = superset.subset(cmd.getOffset(),cmd.getLen());
}
} }
// lastly, put the superset in the cache if the size is less than or equal // lastly, put the superset in the cache if the size is less than or equal

4
solr/core/src/test/org/apache/solr/search/TestFiltering.java
View File

@ -101,6 +101,10 @@ public class TestFiltering extends SolrTestCaseJ4 {
); );
assertEquals(0, DelegatingCollector.setLastDelegateCount - prevCount); assertEquals(0, DelegatingCollector.setLastDelegateCount - prevCount);
// test that offset works when not caching main query
assertJQ(req("q","{!cache=false}*:*", "start","2", "rows","1", "sort","val_i asc", "fl","val_i")
,"/response/docs==[{'val_i':3}]"
);
} }