fix(query) Regex equals .* must ignore the label and match series even without the label #1639
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
…n without the label
yu-shipit
previously approved these changes
Jul 25, 2023
…n without the label
alextheimer
previously approved these changes
Jul 26, 2023
| private def leafFilter(column: String, filter: Filter): Query = { | ||
| filter match { | ||
| case EqualsRegex(value) => | ||
| val regex = removeRegexAnchors(value.toString) | ||
| if (regex.nonEmpty) new RegexpQuery(new Term(column, regex), RegExp.NONE) | ||
| else leafFilter(column, NotEqualsRegex(".+")) // value="" means the label is absent or has an empty value. | ||
| if(regex.r.unapplySeq("").isDefined) { |
There was a problem hiding this comment.
Nitpick: does matches work here?
There was a problem hiding this comment.
That's exactly what I was looking for, but its available in Scala 2.13
There was a problem hiding this comment.
On second thought, I can do this regex.r.pattern.matcher("").matches() since regex does not provide the matches method
| // Check if the given regex matches the empty string, if yes, then do not consider this label | ||
| val booleanQuery = new BooleanQuery.Builder | ||
| val allDocs = new MatchAllDocsQuery | ||
| booleanQuery.add(allDocs, Occur.FILTER).build() |
There was a problem hiding this comment.
I think we can just return a MatchAllDocsQuery directly (it implements Query, at least.)
There was a problem hiding this comment.
Good catch, done
…n without the label
alextheimer
previously approved these changes
Jul 27, 2023
…n without the label
…n without the label
vishramachandran
approved these changes
Jul 28, 2023
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.
Pull Request checklist
Current behavior :
Queries like
foo{dummy=~".*"}are expected to match all timeseries with metric name foo even without the label dummy, in short, the filter should have same behavior as not having the filter. However, currently the matches are only made for series with the label presentNew behavior :
The above behavior is fixed and now the label is not considered in matching if it matches an empty string
""