ES|QL: Support LOOKUP JOIN with FORK #128839
Merged
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.
related: #121950
This removes a TODO for fixing
ProjectAwayColumns
for FORK, which also fixes support for using LOOKUP JOIN and FORK.It was reported that when we using LOOKUP JOIN in combination with FORK, this results in an error:
Example:
results in
org.elasticsearch.xpack.esql.plan.physical.ProjectExec cannot be cast to class org.elasticsearch.xpack.esql.plan.physical.EsQueryExec
This is raised here in
LocalExecutionPlanner#L702
:elasticsearch/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java
Lines 694 to 702 in d3d2d9b
Normally, the right child of
LookUpJoinExec
is aFragmentExec
that wraps aEsRelation
.Then this
FragmentExec
gets mapped to aEsQueryExec
.However, when using
FORK
, when we split the plan into sub plans, we add aProject
node inside eachFragmentExec
which causes issues when usingLOOKUP JOIN
in combination withFORK
.Notice the TODO:
elasticsearch/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java
Lines 83 to 92 in d3d2d9b
We have done this because we needed to fix
ProjectAwayColumns
, where we simply skipMergeExec
(the physical plan for FORK):elasticsearch/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/ProjectAwayColumns.java
Lines 47 to 51 in d3d2d9b
The fix was therefore to remove the hack from
PlannerUtils.breakPlanIntoSubPlansAndMainPlan
and to make sure thatProjectAwayColumns
works correctly whenFORK
is used.