fix: Add check to filter result for logical ops #2573
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
nasdf
approved these changes
May 1, 2024
planner/filter/complex.go
Outdated
| @@ -32,6 +32,7 @@ func isComplex(conditions any, seekRelation bool) bool { | |||
| for k, v := range typedCond { | |||
| if op, ok := k.(*mapper.Operator); ok { | |||
| if (op.Operation == request.FilterOpOr && len(v.([]any)) > 1) || | |||
There was a problem hiding this comment.
suggestion: I think this can be simplified a bit and avoid the potential panic from type casting.
switch op.Operation {
case request.FilterOpOr, request.FilterOpAnd, request.FilterOpNot:
if isComplex(v, true) {
return true
}
continue
}There was a problem hiding this comment.
v can't be anything other than an []any if it's an _or or _and operator and we don't want to classify them as complex if there is only one element in the array.
There was a problem hiding this comment.
I don't think this changes the logic though. It just adds another recursive step.
There was a problem hiding this comment.
made a change in line with what you suggested. Let me know what you think.
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.
Relevant issue(s)
Resolves #2571
Description
This PR adds a check post doc filtering in the fetcher to see if we need to rely on the external conditions instead to ensure a valid filtering operation. This is specially important when filtering with logical operators
_andand_or.Tasks
How has this been tested?
make test
Specify the platform(s) on which this was tested: