ESQL: Allow using the same index in FROM and LOOKUP #118768
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
ivancea
added
>non-issue
Team:Analytics
Contributor
There was a problem hiding this comment.
Copilot reviewed 4 out of 5 changed files in this pull request and generated 1 comment.
Files not reviewed (1)
- x-pack/plugin/esql/qa/testFixtures/src/main/resources/lookup-join.csv-spec: Language not supported
Comments suppressed due to low confidence (2)
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java:114
- Ensure that the children() method is correctly defined and used elsewhere in the codebase to avoid potential issues with the new forEachUp method.
}, node -> node instanceof LookupJoinExec join ? List.of(join.left()) : node.children());
x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java:91
- Potential NullPointerException if childrenGetter.apply((T) this) returns null. Consider adding a null check.
childrenGetter.apply((T) this).forEach(c -> c.forEachUp(action, childrenGetter));
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeService.java
Show resolved
Hide resolved
ivancea
commented
Dec 16, 2024
x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java
Outdated
Show resolved
Hide resolved
ivancea
commented
Dec 16, 2024
Contributor
Author
There was a problem hiding this comment.
Most of the changes here are just reverting to the original logic
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
craigtaverner
approved these changes
Dec 16, 2024
Contributor
craigtaverner
left a comment
craigtaverner
left a comment
There was a problem hiding this comment.
LGTM, This is certainly a simpler solution than what I originally coded, so I'm not surprised you reverted that. I think it's likely we will want to get the lookup indexes back into the ComputeService later when we support SearchStats for lookups, but for now this simpler code seems like the best approach.
costin
requested changes
Dec 17, 2024
x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java
Outdated
Show resolved
Hide resolved
# Conflicts: # x-pack/plugin/esql/qa/testFixtures/src/main/resources/lookup-join.csv-spec
Collaborator
💚 Backport successful
|
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
Dec 18, 2024
Changed the logic so that, instead of getting all the indices of the plan and then subtracting the lookup ones, it will now directly ignore the lookup part in the initial calculation.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 18, 2024
This was referenced Dec 18, 2024
rjernst
pushed a commit
to rjernst/elasticsearch
that referenced
this pull request
Dec 18, 2024
Changed the logic so that, instead of getting all the indices of the plan and then subtracting the lookup ones, it will now directly ignore the lookup part in the initial calculation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Changed the logic so that, instead of getting all the indices of the plan and then subtracting the lookup ones, it will now directly ignore the lookup part in the initial calculation.