SQL: fix NPE on ambiguous GROUP BY #59370
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
This reverts commit ae8ea65
…rkhovin/elasticsearch into fix_npe_on_ambiguous_group_by
…ch into fix/fix_npe_on_ambiguous_group_by
- remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting.
- remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting.
Fix copy&paste error in dedicated comparator used for sorting ambiguity location references. Slightly increase its readability.
Collaborator
|
Pinging @elastic/es-ql (:Query Languages/SQL) |
elasticmachine
added
the
Team:QL (Deprecated)
bpintea
commented
Jul 13, 2020
|
|
||
| public static AttributeMap<Expression> aliases(List<? extends NamedExpression> named) { | ||
| Map<Attribute, Expression> aliasMap = new LinkedHashMap<>(); | ||
| public static List<Tuple<Attribute, Expression>> aliases(List<? extends NamedExpression> named) { |
Contributor
Author
There was a problem hiding this comment.
Could you please replace this with a Tuple<Attribute, Expression>?
AttributeAlias replaced with Tuple<Attribute, Expression>?
bpintea
commented
Jul 13, 2020
Comment on lines
+195
to
+196
| // only add the location if the match is univocal; b/c otherwise adding the location will overwrite any preexisting one | ||
| return handleSpecialFields(u, matches.get(0).withLocation(u.source()), allowCompound); |
Contributor
Author
There was a problem hiding this comment.
Why removing it from here and adding it only if matches.size() == 1?
Attribute#withLocation() will "overwrite" any pre-existing location, which is not desirable if the existing locations need to be kept in order to be reported in an error message.
bpintea
commented
Jul 13, 2020
Comment on lines
+200
to
+204
| .sorted((a, b) -> { | ||
| int lineDiff = a.sourceLocation().getLineNumber() - b.sourceLocation().getLineNumber(); | ||
| int colDiff = a.sourceLocation().getColumnNumber() - b.sourceLocation().getColumnNumber(); | ||
| return lineDiff != 0 ? lineDiff : (colDiff != 0 ? colDiff : a.qualifiedName().compareTo(b.qualifiedName())); | ||
| }) |
Contributor
Author
There was a problem hiding this comment.
Please remove the comparison implementation from here and use a custom comparator to sort the ambiguous attributes.
Implementations of Comparable removed.
bpintea
commented
Jul 13, 2020
Comment on lines
+351
to
+356
| grouping = resolvedAliases.stream() | ||
| .filter(t -> t.v1().equals(maybeResolved)) | ||
| // use the matched expression (not its attribute) | ||
| .map(Tuple::v2) | ||
| .findAny() | ||
| .get(); // there should always be exactly one match |
Contributor
Author
There was a problem hiding this comment.
Imho, it would be better to use a for loop to increase readability.
The stream construction seems a bit more compact and readable IMO and inline with other usages (like the current Analyzer#resolveAgainstList()), but I can still change it if desired.
bpintea
added a commit
to bpintea/elasticsearch
that referenced
this pull request
Jul 29, 2020
* fix npe on ambiguous group by * add tests for aggregates and group by, add quotes to error message * add more cases for Group By ambiguity test * change error messages for field ambiguity * change collection aliases approach * add locations of attributes for ambiguous grouping error * Adress review comments - remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting. * Fix c&p error in location ref generation comparator Fix copy&paste error in dedicated comparator used for sorting ambiguity location references. Slightly increase its readability. Co-authored-by: Nikita Verkhovin <[email protected]> (cherry picked from commit 9ba70a3)
bpintea
added a commit
to bpintea/elasticsearch
that referenced
this pull request
Jul 29, 2020
* fix npe on ambiguous group by * add tests for aggregates and group by, add quotes to error message * add more cases for Group By ambiguity test * change error messages for field ambiguity * change collection aliases approach * add locations of attributes for ambiguous grouping error * Adress review comments - remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting. * Fix c&p error in location ref generation comparator Fix copy&paste error in dedicated comparator used for sorting ambiguity location references. Slightly increase its readability. Co-authored-by: Nikita Verkhovin <[email protected]> (cherry picked from commit 9ba70a3)
bpintea
added a commit
that referenced
this pull request
Jul 29, 2020
* fix npe on ambiguous group by * add tests for aggregates and group by, add quotes to error message * add more cases for Group By ambiguity test * change error messages for field ambiguity * change collection aliases approach * add locations of attributes for ambiguous grouping error * Adress review comments - remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting. * Fix c&p error in location ref generation comparator Fix copy&paste error in dedicated comparator used for sorting ambiguity location references. Slightly increase its readability. Co-authored-by: Nikita Verkhovin <[email protected]> (cherry picked from commit 9ba70a3)
bpintea
added a commit
that referenced
this pull request
Jul 29, 2020
* fix npe on ambiguous group by * add tests for aggregates and group by, add quotes to error message * add more cases for Group By ambiguity test * change error messages for field ambiguity * change collection aliases approach * add locations of attributes for ambiguous grouping error * Adress review comments - remove Comparable implementations from Attribute and Location; - add ad-hoc comparator for sorting locations in ambiguity message; - remove added AttributeAlias class with Touple; - add code comment to explain issue with Location overwriting. * Fix c&p error in location ref generation comparator Fix copy&paste error in dedicated comparator used for sorting ambiguity location references. Slightly increase its readability. Co-authored-by: Nikita Verkhovin <[email protected]> (cherry picked from commit 9ba70a3)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This PR fixes a NPE occurring when an ambiguous alias is used for grouping.
Continues #56489.
Fixes #46396.
Co-authored-by: Nikita Verkhovin [email protected]