Prevent OR’ing of filters containing nested paths. #799
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
A filter with nested paths will result in several matches chained together. Those matches are nessary to have the nodes holding the properties we want to filter on. While at first it may seem trivial to think that adding a nested filter with its own match by an OR just doing an OPTIONAL MATCH, this is wrong, as the first part of the OR would need to be marked as OPTIONAL as well. In the end trying to do so, would create very brittle Cypher statements. Instead of, this commit improves the current checks into a single place and adds a couple of tests for it. A query is not created when any of the filters in the chain is nested AND any other is to be chained with OR (when there is actually more than 1 filter).
Codecov Report
@@ Coverage Diff @@
## master #799 +/- ##
============================================
+ Coverage 80.33% 80.41% +0.07%
- Complexity 3030 3039 +9
============================================
Files 277 277
Lines 9246 9253 +7
Branches 1381 1381
============================================
+ Hits 7428 7441 +13
+ Misses 1307 1303 -4
+ Partials 511 509 -2
Continue to review full report at Codecov.
|
vmetl-xor
reviewed
Jun 4, 2020
Comment on lines
+49
to
+57
| boolean orIsPresent = StreamSupport.stream(filters.spliterator(), false) | ||
| .anyMatch(f -> BooleanOperator.OR == f.getBooleanOperator()); | ||
| boolean nestedOrDeepNestedFilterPresent = StreamSupport.stream(filters.spliterator(), false) | ||
| .anyMatch(f -> f.isNested() || f.isDeepNested()); | ||
|
|
||
| if (orIsPresent && nestedOrDeepNestedFilterPresent) { | ||
| throw new UnsupportedOperationException( | ||
| "Filters containing nested paths cannot be combined via the logical OR operator."); | ||
| } |
There was a problem hiding this comment.
Am I correct that this will forbid cases which are still can be supported?
michael-simons
added a commit
that referenced
this pull request
Jun 4, 2020
A filter with nested paths will result in several matches chained together. Those matches are nessary to have the nodes holding the properties we want to filter on. While at first it may seem trivial to think that adding a nested filter with its own match by an OR just doing an OPTIONAL MATCH, this is wrong, as the first part of the OR would need to be marked as OPTIONAL as well. In the end trying to do so, would create very brittle Cypher statements. Instead of, this commit improves the current checks into a single place and adds a couple of tests for it.
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.
A filter with nested paths will result in several matches chained together. Those matches are nessary to have the nodes holding the properties we want to filter on.
While at first it may seem trivial to think that adding a nested filter with its own match by an OR just doing an OPTIONAL MATCH, this is wrong, as the first part of the OR would need to be marked as OPTIONAL as well.
In the end trying to do so, would create very brittle Cypher statements.
Instead of, this commit improves the current checks into a single place and adds a couple of tests for it.
A query is not created when any of the filters in the chain is nested AND any other is to be chained with OR (when there is actually more than 1 filter).
This closes #796.