Skip to content

[8.16] Bool query early termination should also consider must_not clauses (#115031) #115067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 21, 2024
Merged

[8.16] Bool query early termination should also consider must_not clauses (#115031) #115067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a04f62
Bool query early termination should also consider must_not clauses (#…
piergm Oct 18, 2024
6f2c995
Merge branch '8.16' into backport/8.16/pr-115031
elasticmachine Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/115031.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115031
summary: Bool query early termination should also consider `must_not` clauses
area: Search
type: enhancement
issues: []
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws
if (mustClauses.size() == 0
&& filterClauses.size() == 0
&& shouldClauses.size() > 0
&& mustNotClauses.size() == 0
&& newBuilder.shouldClauses.stream().allMatch(b -> b instanceof MatchNoneQueryBuilder)) {
return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
}
Expand Down
6 changes: 6 additions & 0 deletions server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,12 @@ public void testRewriteWithMatchNone() throws IOException {
rewritten = Rewriteable.rewrite(boolQueryBuilder, createSearchExecutionContext());
assertNotEquals(new MatchNoneQueryBuilder(), rewritten);

boolQueryBuilder = new BoolQueryBuilder();
boolQueryBuilder.should(new WrapperQueryBuilder(new MatchNoneQueryBuilder().toString()));
boolQueryBuilder.mustNot(new TermQueryBuilder(TEXT_FIELD_NAME, "bar"));
rewritten = Rewriteable.rewrite(boolQueryBuilder, createSearchExecutionContext());
assertNotEquals(new MatchNoneQueryBuilder(), rewritten);

boolQueryBuilder = new BoolQueryBuilder();
boolQueryBuilder.filter(new TermQueryBuilder(TEXT_FIELD_NAME, "bar"));
boolQueryBuilder.mustNot(new WrapperQueryBuilder(new WrapperQueryBuilder(new MatchAllQueryBuilder().toString()).toString()));
Expand Down