ESQL: Dependency check for binary plans #118326
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
alex-spies
added
>non-issue
auto-backport
|
Documentation preview: |
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
alex-spies
commented
Dec 10, 2024
There was a problem hiding this comment.
Unrelated, but the regenerated docs for this were not committed, yet.
alex-spies
commented
Dec 10, 2024
Comment on lines
-40
to
-49
| var exclude = Expressions.references(agg.ordinalAttributes()); | ||
| DEPENDENCY_CHECK.checkPlan(p, exclude, depFailures); |
There was a problem hiding this comment.
Simplified by excluding the ordinal attributes already in AggregateExec.references(), which should be more correct, as these attributes are not required for the AggregateExec to be executed.
bpintea
approved these changes
Dec 12, 2024
| return mode.isInputPartial() ? new AttributeSet(intermediateAttributes) : Aggregate.computeReferences(aggregates, groupings); | ||
| return mode.isInputPartial() | ||
| ? new AttributeSet(intermediateAttributes) | ||
| : Aggregate.computeReferences(aggregates, groupings).subtract(new AttributeSet(ordinalAttributes())); |
Comment on lines
31
to
49
| if (p instanceof BinaryPlan binaryPlan) { | ||
| checkMissing(p, binaryPlan.leftReferences(), binaryPlan.left().outputSet(), "missing references from left hand side", failures); | ||
| checkMissing( | ||
| p, | ||
| binaryPlan.rightReferences(), | ||
| binaryPlan.right().outputSet(), | ||
| "missing references from right hand side", | ||
| failures | ||
| ); | ||
| } else if (p instanceof BinaryExec binaryExec) { | ||
| checkMissing(p, binaryExec.leftReferences(), binaryExec.left().outputSet(), "missing references from left hand side", failures); | ||
| checkMissing( | ||
| p, | ||
| binaryExec.rightReferences(), | ||
| binaryExec.right().outputSet(), | ||
| "missing references from right hand side", | ||
| failures | ||
| ); | ||
| } else { |
There was a problem hiding this comment.
Nit: it'd be nice if we could deduplicate a bit here, maybe with a checkBinary(P, AttributeSet, AttributeSet, String, Failures)? But can stay as is too.
alex-spies
added a commit
to alex-spies/elasticsearch
that referenced
this pull request
Dec 13, 2024
Make the dependency checker for query plans take into account binary plans and make sure that fields required from the left hand side are actually obtained from there (and analogously for the right).
💚 Backport successful
|
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 13, 2024
maxhniebergall
pushed a commit
to maxhniebergall/elasticsearch
that referenced
this pull request
Dec 16, 2024
maxhniebergall
pushed a commit
to maxhniebergall/elasticsearch
that referenced
this pull request
Dec 16, 2024
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.
The dependency checker for query plans should take into account binary plans and make sure that fields required from the left hand side are actually obtained from there (and analogously for the right).