EQL: Introduce case insensitive variant in~ #68176
Merged
Conversation
This file contains hidden or 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
Complement to in, in~ does case-insensitive matching without any
pattern matching - : should be used instead.
process where name in~ ("ExPLorEr.eXe")
will match name against explorer.exe regardless of case.
Fix elastic#68172
elasticmachine
added
the
Team:QL (Deprecated)
|
Pinging @elastic/es-ql (Team:QL) |
matriv
reviewed
Jan 29, 2021
| @@ -167,8 +168,13 @@ public Expression visitOperatorExpressionDefault(EqlBaseParser.OperatorExpressio | |||
| switch (predicate.kind.getType()) { | |||
| case EqlBaseParser.SEQ: | |||
| return Predicates.combineOr(expressions(predicate.constant()).stream() | |||
| .map(c -> new InsensitiveWildcardEquals(source, expr, c, zoneId)) | |||
There was a problem hiding this comment.
Is this correct? shouldn't this be for the IN_INSESITIVE and for SEQ the InsensitiveEquals?
There was a problem hiding this comment.
No. See the tests - : or SEQ supports wildcards while in~ does not, hence why it is only insensitive.
There was a problem hiding this comment.
Oops, sorry, I confused myself.
matriv
approved these changes
Jan 29, 2021
| import org.antlr.v4.runtime.CharStream; | ||
| import org.antlr.v4.runtime.Token; | ||
| import org.antlr.v4.runtime.TokenStream; | ||
| import org.antlr.v4.runtime.*; |
There was a problem hiding this comment.
Please revert star imports.
There was a problem hiding this comment.
That looks like a side-effect on ANTLR generation.
bpintea
approved these changes
Jan 29, 2021
| String wildString = null; | ||
| if (cmp instanceof InsensitiveWildcardEquals || cmp instanceof InsensitiveWildcardNotEquals) { | ||
| // expr : "wildcard*phrase?" || expr !: "wildcard*phrase?" | ||
| Expression result = cmp; |
There was a problem hiding this comment.
Seems like if you move this outside the branch you could remove the inner return.
|
/cc @jrodewig |
costin
added a commit
that referenced
this pull request
Jan 29, 2021
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.
Complement to in, in~ does case-insensitive matching without any
pattern matching - : should be used instead.
process where name in~ ("ExPLorEr.eXe")
will match name against explorer.exe regardless of case.
Fix #68172