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

SOLR-2429: don't need to check deletions when iterating over filter 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1140786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2011-06-28 18:53:39 +00:00
parent 5b56b5ee98
commit abdb8e0e2f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -656,7 +656,6 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
} }
} else { } else {
for (int docid = -1; (docid = idIter.advance(docid+1)) < max; ) { for (int docid = -1; (docid = idIter.advance(docid+1)) < max; ) {
if (skipDocs != null && skipDocs.get(docid)) continue;
collector.collect(docid); collector.collect(docid);
} }
} }

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

@ -254,7 +254,8 @@ public class TestFiltering extends SolrTestCaseJ4 {
} }
assertU(commit()); assertU(commit());
int totalMatches=0;
int nonZeros=0;
for (int qiter=0; qiter<queryIter; qiter++) { for (int qiter=0; qiter<queryIter; qiter++) {
model.clear(); model.clear();
List<String> params = new ArrayList<String>(); List<String> params = new ArrayList<String>();
@ -295,6 +296,11 @@ public class TestFiltering extends SolrTestCaseJ4 {
long expectedMultiSelect = model.multiSelect.cardinality(); long expectedMultiSelect = model.multiSelect.cardinality();
long expectedFacetQuery = model.facetQuery.cardinality(); long expectedFacetQuery = model.facetQuery.cardinality();
totalMatches += expected;
if (expected > 0) {
nonZeros++;
}
if (iiter==-1 && qiter==-1) { if (iiter==-1 && qiter==-1) {
// set breakpoint here to debug a specific issue // set breakpoint here to debug a specific issue
System.out.println("request="+params); System.out.println("request="+params);
@ -316,6 +322,11 @@ public class TestFiltering extends SolrTestCaseJ4 {
} }
} }
// After making substantial changes to this test, make sure that we still get a
// decent number of queries that match some documents
// System.out.println("totalMatches=" + totalMatches + " nonZeroQueries="+nonZeros);
} }
} }