ESQL: Fix columns ordering when pruning an INLINE STATS#136827
Merged
elasticsearchmachine merged 10 commits intoelastic:mainfrom Oct 23, 2025
Merged
ESQL: Fix columns ordering when pruning an INLINE STATS#136827elasticsearchmachine merged 10 commits intoelastic:mainfrom
elasticsearchmachine merged 10 commits intoelastic:mainfrom
Conversation
This fixes the incorrect ordering of the columns that can occur when INLINE STATS is pruned entirely, due to its calculated value being discarded (dropped or overshadowned)
bpintea
added
auto-backport
elasticsearchmachine
added
the
Team:Analytics
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
Collaborator
|
Hi @bpintea, I've created a changelog YAML for you. |
astefan
approved these changes
Oct 22, 2025
Contributor
astefan
left a comment
astefan
left a comment
There was a problem hiding this comment.
LGTM. Left some minor comments, except the one with projection.
Also, I would add some variations to stats computations keepers and droppers:
ROW a = null, b = 0, c = "x", d = 1
| INLINE STATS a = MAX(c), d = MIN(c), e = AVG(b) by b
| EVAL a = c, d = 2
ROW a = null, b = 0, c = "x", d = 1
| INLINE STATS a = MAX(c), d = MIN(c), e = AVG(b), a = MIN(b) by b
| EVAL a = c, d = 2
ROW a = null, b = 0, c = "x", d = 1
| INLINE STATS a = MAX(c), d = MIN(c), e = AVG(b), a = MIN(b), f = MAX(b) by b
| EVAL a = c, d = 2
| /** | ||
| * Fix pruning of columns when shadowed in INLINE STATS | ||
| */ | ||
| INLINE_STATS_PRUNE_COLUMN_FIX(INLINESTATS_V11.enabled), |
Contributor
There was a problem hiding this comment.
Suggested change
| INLINE_STATS_PRUNE_COLUMN_FIX(INLINESTATS_V11.enabled), | |
| INLINE_STATS_PRUNE_COLUMN_FIX(INLINE_STATS.enabled), |
| List<Attribute> newOutput = new ArrayList<>(ij.output()); | ||
| AttributeSet leftOutputSet = ij.left().outputSet(); | ||
| newOutput.removeIf(attr -> leftOutputSet.contains(attr) == false); | ||
| p = new EsqlProject(ij.source(), ij.left(), newOutput); |
Contributor
There was a problem hiding this comment.
Suggested change
| p = new EsqlProject(ij.source(), ij.left(), newOutput); | |
| p = new Project(ij.source(), ij.left(), newOutput); |
| var right = pruneColumns(ij.right(), used, true); | ||
| if (right.output().isEmpty() || isLocalEmptyRelation(right)) { | ||
| p = ij.left(); | ||
| // InlineJoin updates the order of the output, so even if the computation is dropped, the groups need to be pulled to the end |
Contributor
There was a problem hiding this comment.
I think this comment is putting an emphasis on re-ordering of the output elements, but in reality it's filtering the output based on the elements which are not needed anymore. The ordering is the same, only that some elements are filtered out.
Contributor
Author
There was a problem hiding this comment.
I've supplemented the comment.
Contributor
Author
|
Thanks, Andrei.
I've added them, though with small completions, since all the computed values need to be overwritten -- only then does the bug show. |
bpintea
added
the
auto-merge-without-approval
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
fzowl
pushed a commit
to voyage-ai/elasticsearch
that referenced
this pull request
Nov 3, 2025
This fixes the incorrect ordering of the columns that can occur when INLINE STATS is pruned entirely, due to its calculated value being discarded (overshadowed). Fixes elastic#136797
bpintea
added a commit
to bpintea/elasticsearch
that referenced
this pull request
Dec 11, 2025
This fixes the incorrect ordering of the columns that can occur when INLINE STATS is pruned entirely, due to its calculated value being discarded (overshadowed). Fixes elastic#136797 (cherry picked from commit ffbf05c)
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 11, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 fixes the incorrect ordering of the columns that can occur when INLINE STATS is pruned entirely, due to its calculated value being discarded (overshadowed).
Fixes #136797