honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optimize term and terms filter that do no match any documents

This commit is contained in:
kimchy 2011-05-25 00:16:53 +03:00
parent 1bf30a9d57
commit becf4baaa2
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/elasticsearch/src/main/java/org/apache/lucene/search/PublicTermsFilter.java
View File

@ -64,7 +64,7 @@ public class PublicTermsFilter extends Filter {
@Override
public int hashCode() {
int hash = 9;
for (Iterator<Term> iter = terms.iterator(); iter.hasNext();) {
for (Iterator<Term> iter = terms.iterator(); iter.hasNext(); ) {
Term term = iter.next();
hash = 31 * hash + term.hashCode();
}
@ -73,13 +73,19 @@ public class PublicTermsFilter extends Filter {
@Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
OpenBitSet result = new OpenBitSet(reader.maxDoc());
OpenBitSet result = null;
TermDocs td = reader.termDocs();
try {
for (Term term : terms) {
td.seek(term);
while (td.next()) {
if (td.next()) {
if (result == null) {
result = new OpenBitSet(reader.maxDoc());
}
result.fastSet(td.doc());
while (td.next()) {
result.fastSet(td.doc());
}
}
}
} finally {

11
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/TermFilter.java
View File

@ -46,15 +46,18 @@ public class TermFilter extends Filter {
}
@Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
OpenBitSet result = new OpenBitSet(reader.maxDoc());
OpenBitSet result = null;
TermDocs td = reader.termDocs();
try {
td.seek(term);
while (td.next()) {
if (td.next()) {
result = new OpenBitSet(reader.maxDoc());
result.fastSet(td.doc());
while (td.next()) {
result.fastSet(td.doc());
}
}
}
finally {
} finally {
td.close();
}
return result;