QL: Make canonical form take into account children #71266
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
costin
added
>enhancement
:Analytics/SQL
Collaborator
|
Pinging @elastic/es-ql (Team:QL) |
costin
commented
Apr 3, 2021
Member
Author
There was a problem hiding this comment.
Changed the order of hashing to encourage caching / similarities of values that have the same datatype.
There was a problem hiding this comment.
Is there backwards compatibility concerns?
costin
commented
Apr 3, 2021
Member
Author
There was a problem hiding this comment.
Made Negatable accept any kind of expression not just functions. This way Not can be negated without special handling.
costin
commented
Apr 3, 2021
Member
Author
There was a problem hiding this comment.
Canonicalize after negation to avoid recreating the trees twice since canonical already handles normalization and ordering.
Currently the canonical form takes into account only the node itself and not its children. For commutative cases this creates subtle issues in that the children are swapped based on their canonical form but not canonicalize and thus semantic comparison fail. This PR fixes that by taking into account the canonical children and, for commutative expressions, applies semantic ordering. In the process, improve handling of nested negated expressions.
costin
force-pushed
the
ql/fix-canonicalize
branch
from
ed3fbc8 to
45e17c4
Compare
ryucc
reviewed
Apr 5, 2021
| for (Expression exp : exps) { | ||
| canonical.add(exp.canonical()); | ||
| } | ||
| return canonical; |
There was a problem hiding this comment.
Possible to use more Java 8 syntax?
return exps.stream()
.map(Expression::canonical)
.collect(Collectors.toList());
costin
added a commit
to costin/elasticsearch
that referenced
this pull request
Apr 5, 2021
Currently the canonical form takes into account only the node itself and not its children. For commutative cases this creates subtle issues in that the children are swapped based on their canonical form but not canonicalize and thus semantic comparison fail. This PR fixes that by taking into account the canonical children and, for commutative expressions, applies semantic ordering. In the process, improve handling of nested negated expressions.
costin
added a commit
that referenced
this pull request
Apr 5, 2021
…1287) Currently the canonical form takes into account only the node itself and not its children. For commutative cases this creates subtle issues in that the children are swapped based on their canonical form but not canonicalize and thus semantic comparison fail. This PR fixes that by taking into account the canonical children and, for commutative expressions, applies semantic ordering. In the process, improve handling of nested negated expressions.
matriv
reviewed
Apr 6, 2021
| } | ||
| List<Expression> canonicalChildren = Expressions.canonicalize(children()); | ||
| // check if replacement is really needed | ||
| if (children().equals(canonicalChildren)) { |
Contributor
There was a problem hiding this comment.
If it's possible, for the future, maybe we should move this handling inside the replaceChildren()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Currently the canonical form takes into account only the node itself and
not its children.
For commutative cases this creates subtle issues in that the children
are swapped based on their canonical form but not canonicalize and thus
semantic comparison fail.
This PR fixes that by taking into account the canonical children and,
for commutative expressions, applies semantic ordering.
In the process, improve handling of nested negated expressions.