Skip to content

[fix](Nereids) join order is not right after sql parsing (#28721) #29194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
Dec 28, 2023
Merged

[fix](Nereids) join order is not right after sql parsing (#28721) #29194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1805,7 +1805,7 @@ private LogicalPlan withRelations(LogicalPlan inputPlan, List<RelationContext> r
LogicalPlan left = inputPlan;
for (RelationContext relation : relations) {
// build left deep join tree
LogicalPlan right = visitRelation(relation);
LogicalPlan right = withJoinRelations(visitRelation(relation), relation);
left = (left == null) ? right :
new LogicalJoin<>(
JoinType.CROSS_JOIN,
Expand All @@ -1815,7 +1815,6 @@ private LogicalPlan withRelations(LogicalPlan inputPlan, List<RelationContext> r
Optional.empty(),
left,
right);
left = withJoinRelations(left, relation);
// TODO: pivot and lateral view
}
return left;
Expand Down
25 changes: 14 additions & 11 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/DeleteCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected void runBeforeAll() throws Exception {
public void testFromClauseDelete() throws AnalysisException {
String sql = "delete from t1 a using src join t2 on src.k1 = t2.k1 where t2.k1 = a.k1";
LogicalPlan parsed = new NereidsParser().parseSingle(sql);
Assertions.assertTrue(parsed instanceof DeleteCommand);
Assertions.assertInstanceOf(DeleteCommand.class, parsed);
DeleteCommand command = ((DeleteCommand) parsed);
LogicalPlan plan = command.completeQueryPlan(connectContext, command.getLogicalQuery());
PlanChecker.from(connectContext, plan)
Expand All @@ -83,19 +83,22 @@ public void testFromClauseDelete() throws AnalysisException {
logicalOlapTableSink(
logicalProject(
logicalJoin(
logicalJoin(
logicalProject(
logicalFilter(
logicalOlapScan()
logicalProject(
logicalJoin(
logicalProject(
logicalFilter(
logicalOlapScan()
)
),
logicalProject(
logicalFilter(
logicalOlapScan()
)
)
),
logicalProject(
logicalOlapScan())
)
),
logicalProject(
logicalFilter(
logicalOlapScan()
)
logicalOlapScan()
)
)
)
Expand Down
30 changes: 12 additions & 18 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/UpdateCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void runBeforeAll() throws Exception {
public void testSimpleUpdate() throws AnalysisException {
String sql = "update t1 set v1 = v1 + 2, v2 = v1 * 2 where k1 = 3";
LogicalPlan parsed = new NereidsParser().parseSingle(sql);
Assertions.assertTrue(parsed instanceof UpdateCommand);
Assertions.assertInstanceOf(UpdateCommand.class, parsed);
UpdateCommand command = ((UpdateCommand) parsed);
LogicalPlan plan = command.completeQueryPlan(connectContext, command.getLogicalQuery());
PlanChecker.from(connectContext, plan)
Expand All @@ -94,29 +94,23 @@ public void testFromClauseUpdate() throws AnalysisException {
String sql = "update t1 a set v1 = t2.v1 + 2, v2 = a.v1 * 2 "
+ "from src join t2 on src.k1 = t2.k1 where t2.k1 = a.k1";
LogicalPlan parsed = new NereidsParser().parseSingle(sql);
Assertions.assertTrue(parsed instanceof UpdateCommand);
Assertions.assertInstanceOf(UpdateCommand.class, parsed);
UpdateCommand command = ((UpdateCommand) parsed);
LogicalPlan plan = command.completeQueryPlan(connectContext, command.getLogicalQuery());
PlanChecker.from(connectContext, plan)
.analyze(plan)
.rewrite()
.matches(
logicalOlapTableSink(
logicalProject(
logicalFilter(
logicalJoin(
logicalSubQueryAlias(
logicalFilter(
logicalOlapScan()
)
),
logicalJoin(
logicalJoin(
logicalProject(
logicalFilter(
logicalOlapScan()
)
),
logicalProject(
logicalOlapScan())
),
logicalProject(
logicalFilter(
logicalOlapScan()
)
logicalOlapScan(),
logicalFilter(
logicalOlapScan()
)
)
)
Expand Down
Loading