Add a limit for graph phrase query expansion #34031
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Today query parsers throw TooManyClauses exception when a query creates too many clauses. However graph phrase queries do not respect this limit. This change adds a protection against crazy expansions that can happen when building a graph phrase query. This is a temporary copy of the fix available in https://issues.apache.org/jira/browse/LUCENE-8479 but not merged yet. This logic will be removed when we integrate the Lucene patch in a future release.
jimczi
added
>enhancement
:Search/Search
|
Pinging @elastic/es-search-aggs |
cbuescher
reviewed
Sep 25, 2018
| Term[] terms = graph.getTerms(field, start); | ||
| assert terms.length > 0; | ||
| if (terms.length >= BooleanQuery.getMaxClauseCount()) { | ||
| throw new BooleanQuery.TooManyClauses(); |
There was a problem hiding this comment.
It seems the former check is triggered by the test, but this code path isn't. I haven't checked all the test setup logic, but would it be difficult to include a case that also triggers this code path?
There was a problem hiding this comment.
I pushed 5bc8a40 to test both paths
cbuescher
approved these changes
Sep 25, 2018
| TokenStream ts = it.next(); | ||
| SpanQuery q = createSpanQuery(ts, field); | ||
| if (q != null) { | ||
| if (queries.size() >= BooleanQuery.getMaxClauseCount()) { |
There was a problem hiding this comment.
Just for my own education, and it is certainly super minor: when reading this part I was wondering if it would make sense to get the maxClauseCount limit once at the beginning of this method since its unlikely to change to avoid method calls in each iteration). Maybe Java does some clever optimizations to avoid this though and the effect most likely negligible.
jimczi
added a commit
that referenced
this pull request
Sep 25, 2018
Today query parsers throw TooManyClauses exception when a query creates too many clauses. However graph phrase queries do not respect this limit. This change adds a protection against crazy expansions that can happen when building a graph phrase query. This is a temporary copy of the fix available in https://issues.apache.org/jira/browse/LUCENE-8479 but not merged yet. This logic will be removed when we integrate the Lucene patch in a future release.
jimczi
added a commit
that referenced
this pull request
Sep 25, 2018
Today query parsers throw TooManyClauses exception when a query creates too many clauses. However graph phrase queries do not respect this limit. This change adds a protection against crazy expansions that can happen when building a graph phrase query. This is a temporary copy of the fix available in https://issues.apache.org/jira/browse/LUCENE-8479 but not merged yet. This logic will be removed when we integrate the Lucene patch in a future release.
jimczi
added a commit
to jimczi/elasticsearch
that referenced
this pull request
Sep 25, 2018
Backport of elastic#34031 for 5.6.
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
Today query parsers throw TooManyClauses exception when a query creates too many clauses. However graph phrase queries do not respect this limit. This change adds a protection against crazy expansions that can happen when building a graph phrase query. This is a temporary copy of the fix available in https://issues.apache.org/jira/browse/LUCENE-8479 but not merged yet. This logic will be removed when we integrate the Lucene patch in a future release.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Today query parsers throw TooManyClauses exception when a query creates
too many clauses. However graph phrase queries do not respect this limit.
This change adds a protection against crazy expansions that can happen when
building a graph phrase query. This is a temporary copy of the fix available
in https://issues.apache.org/jira/browse/LUCENE-8479 but not merged yet.
This logic will be removed when we integrate the Lucene patch in a future
release.