Wildcard field regex query fix #78839
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
markharwood
added
:Search/Search
|
Pinging @elastic/es-search (Team:Search) |
jimczi
approved these changes
Oct 11, 2021
There was a problem hiding this comment.
The change looks like a great simplification to me. Thanks for iterating on this @markharwood !
...ugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java
Outdated
Show resolved
Hide resolved
...ugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java
Outdated
Show resolved
Hide resolved
markharwood
force-pushed
the
fix/78391v2
branch
from
fb12a59 to
33d106e
Compare
…l for regexes like .* Closes elastic#78391
markharwood
force-pushed
the
fix/78391v2
branch
from
33d106e to
bffecad
Compare
markharwood
added a commit
to markharwood/elasticsearch
that referenced
this pull request
Oct 11, 2021
Fix for wildcard field query optimisation that rewrites to a match all for regexes like .* A bug was found in this complex rewrite logic so we have simplified the detection of .* type regexes by examining the Automaton for the regex rather than our parsed form of it which is expressed as a Lucene BooleanQuery. The old logic relied on a recursive "simplify" function on the BooleanQuery which has now been removed. We now rely on Lucene's query rewrite logic to simplify expressions at query time and consequently some of the tests had to change to do some of this rewriting before running test comparisons. Closes elastic#78391
markharwood
added a commit
that referenced
this pull request
Oct 11, 2021
Fix for wildcard field query optimisation that rewrites to a match all for regexes like .* A bug was found in this complex rewrite logic so we have simplified the detection of .* type regexes by examining the Automaton for the regex rather than our parsed form of it which is expressed as a Lucene BooleanQuery. The old logic relied on a recursive "simplify" function on the BooleanQuery which has now been removed. We now rely on Lucene's query rewrite logic to simplify expressions at query time and consequently some of the tests had to change to do some of this rewriting before running test comparisons. Closes #78391
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.
Reverting to a match_all is an important optimisation e.g. if users type .* - we don't want to decompress all docs and run a regex on the contents when we can know this is literally a match all expression.
A bug was found in this complex rewrite logic so we have simplified the detection of
.*type regexes by examining the Automaton for the regex rather than our parsed form of it which is expressed as a Lucene BooleanQuery. The old logic relied on a recursive "simplify" function on the BooleanQuery which has now been removed. We now rely on Lucene's query rewrite logic to simplify expressions at query time and consequently some of the tests had to change to do some of this rewriting before running test comparisons.Closes #78391