Ensure Parameters are in proper order for queries having WITH clause #1529
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
Praveen2112
force-pushed
the
parameter_changes
branch
from
0af4123 to
b18148a
Compare
martint
reviewed
Sep 16, 2019
| @Override | ||
| public Map<NodeRef<Expression>, Integer> visitParameter(Parameter parameter, Void context) | ||
| { | ||
| return ImmutableMap.of(NodeRef.of(parameter), position++); |
There was a problem hiding this comment.
This will produce an ordering based on traversal order. We need to:
- Collect all the Parameter nodes
- Sort them based on their lexical order (
Parameter.getLocation())
Praveen2112
force-pushed
the
parameter_changes
branch
from
b18148a to
6fc3b0a
Compare
martint
reviewed
Sep 17, 2019
| checkArgument(left.getLocation().isPresent(), "NodeLocation must be present"); | ||
| checkArgument(right.getLocation().isPresent(), "NodeLocation must be present"); | ||
|
|
||
| return Long.compare( |
There was a problem hiding this comment.
Instead of assembling these into a long, compare based on line first and then based on column number.
| { | ||
| List<Expression> parameters = ImmutableList.sortedCopyOf(new ExpressionComparator(), new AstVisitor<List<Expression>, Void>() | ||
| { | ||
| @Override |
There was a problem hiding this comment.
There's already a class that does this: ParameterExtractor.
This could all be replaced with:
List<Parameter> parameters = getParameters(...).stream()
.sorted(Comparator.comparing(
parameter -> parameter.getLocation().get(),
Comparator.comparing(NodeLocation::getLineNumber)
.thenComparing(NodeLocation::getColumnNumber)))
.collect(Collectors.toList());| { | ||
| private ParameterUtils() {} | ||
|
|
||
| public static Map<NodeRef<Expression>, Integer> parameterExtractor(Node node) |
There was a problem hiding this comment.
The type of this should be Map<NodeRef<Parameter>, Integer>
| @@ -81,6 +82,7 @@ | |||
| @Nullable | |||
| private final Statement root; | |||
| private final List<Expression> parameters; | |||
| private final Map<NodeRef<Expression>, Integer> parameterPositionMap; | |||
There was a problem hiding this comment.
Make this a Map<NodeRef<Parameter>, Integer> and rename the variable to parameterOrdinals
|
Can you add an end-to-end test that involves WITH to make sure parameters are being interpreted correctly? |
Praveen2112
force-pushed
the
parameter_changes
branch
from
6fc3b0a to
d2b5a01
Compare
Praveen2112
force-pushed
the
parameter_changes
branch
2 times, most recently
from
92f1af5 to
79f9e7d
Compare
Praveen2112
force-pushed
the
parameter_changes
branch
from
79f9e7d to
8efe78c
Compare
martint
force-pushed
the
parameter_changes
branch
from
99325d3 to
8efe78c
Compare
v-jizhang
added a commit
to v-jizhang/presto
that referenced
this pull request
Feb 24, 2022
Cherry-pick of trinodb/trino#1529 Fixes prestodb#17012 Co-authored-by: praveenkrishna <praveenkrishna@tutanota.com>
zhenxiao
pushed a commit
to prestodb/presto
that referenced
this pull request
Mar 1, 2022
Cherry-pick of trinodb/trino#1529 Fixes #17012 Co-authored-by: praveenkrishna <praveenkrishna@tutanota.com>
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.
Fixes #1191