honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Query DSL: Bool filter does not take should clauses properly into account, closes #1511.

Browse Source
This commit is contained in:
Shay Banon 2011-11-29 22:38:25 +02:00
parent 76307a5e73
commit a21c0829c7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,15 +79,20 @@ public class XBooleanFilter extends Filter {
}
DocSets.or(res, disi);
}
// if no should clauses match, return null (act as min_should_match set to 1)
if (res == null && !shouldFilters.isEmpty()) {
return null;
}
}
// if no should clauses match, return null (act as min_should_match set to 1)
if (res == null) {
return null;
}
if (notFilters != null) {
for (int i = 0; i < notFilters.size(); i++) {
if (res == null) {
res = new FixedBitSet(reader.maxDoc());
res.set(0, reader.maxDoc()); // NOTE: may set bits on deleted docs
}
final DocIdSet disi = getDISI(notFilters, i, reader);
if (disi != null) {
DocSets.andNot(res, disi);
@ -101,7 +106,12 @@ public class XBooleanFilter extends Filter {
if (disi == null) {
return null;
}
DocSets.and(res, disi);
if (res == null) {
res = new FixedBitSet(reader.maxDoc());
DocSets.or(res, disi);
} else {
DocSets.and(res, disi);
}
}
}