Skip to content

Commit 6f6ad72

Browse files
committed
Query DSL: Bool filter does not take should clauses properly into account, closes elastic#1511.
1 parent ba1b77f commit 6f6ad72

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
8989

9090
if (notFilters != null) {
9191
for (int i = 0; i < notFilters.size(); i++) {
92-
if (res == null) {
93-
res = new FixedBitSet(reader.maxDoc());
94-
res.set(0, reader.maxDoc()); // NOTE: may set bits on deleted docs
95-
}
9692
final DocIdSet disi = getDISI(notFilters, i, reader);
9793
if (disi != null) {
9894
DocSets.andNot(res, disi);
@@ -106,12 +102,7 @@ public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
106102
if (disi == null) {
107103
return null;
108104
}
109-
if (res == null) {
110-
res = new FixedBitSet(reader.maxDoc());
111-
DocSets.or(res, disi);
112-
} else {
113-
DocSets.and(res, disi);
114-
}
105+
DocSets.and(res, disi);
115106
}
116107
}
117108

0 commit comments

Comments
 (0)