ESQL: Fix bug when combining projections #107131
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
Recursive aliases (eval x = 1, x1 = x) were not taken into account when combining projections causing the target field to be lost (and only the immediate intermediate named expression to be used instead which became invalid). Fix elastic#107083
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
|
Hi @costin, I've created a changelog YAML for you. |
alex-spies
approved these changes
Apr 5, 2024
| @@ -1550,3 +1550,37 @@ s2point1:d | s_mv:i | languages:i | |||
| 2.1 | 3 | 5 | |||
| 2.1 | 3 | null | |||
| ; | |||
|
|
|||
| evalOverridingKey | |||
There was a problem hiding this comment.
Doesn't this also need a skip for pre 8.14?
| assertThat(Expressions.names(keep.projections()), contains("last_name", "f2", "f4")); | ||
| var eval = as(keep.child(), Eval.class); | ||
| assertThat(Expressions.names(eval.fields()), contains("f4")); | ||
| var add = as(Alias.unwrap(eval.fields().get(0)), Add.class); |
There was a problem hiding this comment.
I think we should assert that the summands are language and 3.
Comment on lines
+418
to
+419
| * \_Aggregate[[last_name{f}#23, first_name{f}#20, k{r}#4],[SUM(salary{f}#24) AS s, last_name{f}#23, first_name{f}#20, first_n | ||
| * ame{f}#20 AS k]] |
There was a problem hiding this comment.
Potentially out of scope, but: couldn't/shouldn't we prune k from the groupings, since it's an alias for first_name? k doesn't seem to be used in the aggregates, either.
Comment on lines
+429
to
+432
| // collect named expressions declaration in the lower list | ||
| AttributeMap<NamedExpression> namedExpressions = new AttributeMap<>(); | ||
| // while also collecting the alias map for resolving the source (f1 = 1, f2 = f1, etc..) | ||
| AttributeMap<Expression> aliases = new AttributeMap<>(); |
There was a problem hiding this comment.
nit: comments/var names here are a bit hard to follow.
costin
added
the
auto-backport-and-merge
💔 Backport failed
You can use sqren/backport to manually backport by running |
costin
added a commit
to costin/elasticsearch
that referenced
this pull request
Apr 5, 2024
Recursive aliases (eval x = 1, x1 = x) were not taken into account when combining projections causing the target field to be lost (and only the immediate intermediate named expression to be used instead which became invalid). Fix elastic#107083 (cherry picked from commit a9388e1)
|
Raised #107167 for backport |
This was referenced Apr 18, 2024
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.
Recursive aliases (eval x = 1, x1 = x) were not taken into account when
combining projections causing the target field to be lost (and only the
immediate intermediate named expression to be used instead which became
invalid).
Fix #107083