You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/07/09 01:28:02 UTC
svn commit: r1501014 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
Author: rmuir
Date: Mon Jul 8 23:28:01 2013
New Revision: 1501014
URL: http://svn.apache.org/r1501014
Log:
SOLR-5012: optimize search with filter when filterCache is null
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1501014&r1=1501013&r2=1501014&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jul 8 23:28:01 2013
@@ -264,6 +264,8 @@ Optimizations
* SOLR-5002: optimize numDocs(Query,DocSet) when filterCache is null (Robert Muir)
+* SOLR-5012: optimize search with filter when filterCache is null (Robert Muir)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1501014&r1=1501013&r2=1501014&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Jul 8 23:28:01 2013
@@ -953,6 +953,15 @@ public class SolrIndexSearcher extends I
}
continue;
}
+ }
+
+ if (filterCache == null) {
+ // there is no cache: don't pull bitsets
+ if (notCached == null) notCached = new ArrayList<Query>(sets.length-end);
+ WrappedQuery uncached = new WrappedQuery(q);
+ uncached.setCache(false);
+ notCached.add(uncached);
+ continue;
}
Query posQuery = QueryUtils.getAbs(q);