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

optimize boolean filter to use bits driven by result bitset

This commit is contained in:
Shay Banon 2012-12-12 20:12:51 -08:00
parent 4778d5c2eb
commit 32bf7607c7
1 changed files with 139 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
View File

@ -67,55 +67,153 @@ public class XBooleanFilter extends Filter implements Iterable<FilterClause> {
} }
} }
// SHOULD or MUST, just return the set... // SHOULD or MUST, just return the set...
if (DocIdSets.isEmpty(set)) {
return null;
}
return set; return set;
} }
// first, go over and see if we can shortcut the execution
// and gather Bits if we need to
List<ResultClause> results = new ArrayList<ResultClause>(clauses.size());
boolean hasShouldClauses = false; boolean hasShouldClauses = false;
for (final FilterClause fc : clauses) { boolean hasNonEmptyShouldClause = false;
if (fc.getOccur() == Occur.SHOULD) { for (int i = 0; i < clauses.size(); i++) {
FilterClause clause = clauses.get(i);
DocIdSet set = clause.getFilter().getDocIdSet(context, acceptDocs);
if (clause.getOccur() == Occur.MUST) {
if (DocIdSets.isEmpty(set)) {
return null;
}
} else if (clause.getOccur() == Occur.SHOULD) {
hasShouldClauses = true; hasShouldClauses = true;
final DocIdSetIterator disi = getDISI(fc.getFilter(), context, acceptDocs); if (DocIdSets.isEmpty(set)) {
if (disi == null) continue; continue;
}
hasNonEmptyShouldClause = true;
} else if (clause.getOccur() == Occur.MUST_NOT) {
if (DocIdSets.isEmpty(set)) {
// we mark empty ones as null for must_not, handle it in the next run...
results.add(new ResultClause(null, null, clause));
continue;
}
}
Bits bits = null;
if (!DocIdSets.isFastIterator(set)) {
bits = set.bits();
}
results.add(new ResultClause(set, bits, clause));
}
if (hasShouldClauses && !hasNonEmptyShouldClause) {
return null;
}
// now, go over the clauses and apply the "fast" ones...
boolean hasBits = false;
for (int i = 0; i < results.size(); i++) {
ResultClause clause = results.get(i);
// we apply bits in based ones (slow) in the second run
if (clause.bits != null) {
hasBits = true;
continue;
}
if (clause.clause.getOccur() == Occur.SHOULD) {
DocIdSetIterator it = clause.docIdSet.iterator();
if (it == null) {
continue;
}
if (res == null) { if (res == null) {
res = new FixedBitSet(reader.maxDoc()); res = new FixedBitSet(reader.maxDoc());
} }
res.or(disi); res.or(it);
} } else if (clause.clause.getOccur() == Occur.MUST) {
} DocIdSetIterator it = clause.docIdSet.iterator();
if (hasShouldClauses && res == null) if (it == null) {
return null; return null;
}
for (final FilterClause fc : clauses) { if (res == null) {
if (fc.getOccur() == Occur.MUST_NOT) { res = new FixedBitSet(reader.maxDoc());
res.or(it);
} else {
res.and(it);
}
} else if (clause.clause.getOccur() == Occur.MUST_NOT) {
if (res == null) { if (res == null) {
assert !hasShouldClauses;
res = new FixedBitSet(reader.maxDoc()); res = new FixedBitSet(reader.maxDoc());
res.set(0, reader.maxDoc()); // NOTE: may set bits on deleted docs res.set(0, reader.maxDoc()); // NOTE: may set bits on deleted docs
} }
final DocIdSetIterator disi = getDISI(fc.getFilter(), context, acceptDocs); if (clause.docIdSet != null) {
if (disi != null) { DocIdSetIterator it = clause.docIdSet.iterator();
res.andNot(disi); if (it != null) {
res.andNot(it);
}
} }
} }
} }
for (final FilterClause fc : clauses) { if (!hasBits) {
if (fc.getOccur() == Occur.MUST) { return res;
final DocIdSetIterator disi = getDISI(fc.getFilter(), context, acceptDocs); }
if (disi == null) {
return null; // we have some clauses with bits, apply them...
// we let the "res" drive the computation, and check Bits for that
for (int i = 0; i < results.size(); i++) {
ResultClause clause = results.get(i);
// we apply bits in based ones (slow) in the second run
if (clause.bits == null) {
continue;
}
if (clause.clause.getOccur() == Occur.SHOULD) {
// TODO: we should let res drive it, and check on all unset bits on it with Bits
DocIdSetIterator it = clause.docIdSet.iterator();
if (it == null) {
continue;
} }
if (res == null) { if (res == null) {
res = new FixedBitSet(reader.maxDoc()); res = new FixedBitSet(reader.maxDoc());
res.or(disi); }
res.or(it);
} else if (clause.clause.getOccur() == Occur.MUST) {
if (res == null) {
// nothing we can do, just or it...
res = new FixedBitSet(reader.maxDoc());
DocIdSetIterator it = clause.docIdSet.iterator();
if (it == null) {
return null;
}
res.or(it);
} else { } else {
res.and(disi); Bits bits = clause.bits;
// use the "res" to drive the iteration
DocIdSetIterator it = res.iterator();
for (int doc = it.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = it.nextDoc()) {
if (!bits.get(doc)) {
res.clear(doc);
}
}
}
} else if (clause.clause.getOccur() == Occur.MUST_NOT) {
if (res == null) {
res = new FixedBitSet(reader.maxDoc());
res.set(0, reader.maxDoc()); // NOTE: may set bits on deleted docs
DocIdSetIterator it = clause.docIdSet.iterator();
if (it != null) {
res.andNot(it);
}
} else {
Bits bits = clause.bits;
// let res drive the iteration
DocIdSetIterator it = res.iterator();
for (int doc = it.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = it.nextDoc()) {
if (bits.get(doc)) {
res.clear(doc);
}
}
} }
} }
} }
// don't wrap, based on our own strategy of doing the wrapping on the filtered query level
//return res != null ? BitsFilteredDocIdSet.wrap(res, acceptDocs) : DocIdSet.EMPTY_DOCIDSET;
return res; return res;
} }
@ -188,4 +286,16 @@ public class XBooleanFilter extends Filter implements Iterable<FilterClause> {
} }
return buffer.append(')').toString(); return buffer.append(')').toString();
} }
static class ResultClause {
public final DocIdSet docIdSet;
public final Bits bits;
public final FilterClause clause;
ResultClause(DocIdSet docIdSet, Bits bits, FilterClause clause) {
this.docIdSet = docIdSet;
this.bits = bits;
this.clause = clause;
}
}
} }