Skip to content

Commit

Permalink
planner: outer join elimination doesn't consider the ORDER BY items f…
Browse files Browse the repository at this point in the history
…rom the agg func (#38380)

close #18216
  • Loading branch information
winoros authored Oct 10, 2022
1 parent e0eaefc commit 519373e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
14 changes: 14 additions & 0 deletions planner/core/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7675,3 +7675,17 @@ func TestIssue38295(t *testing.T) {
tk.MustGetErrCode("SELECT t0.c1, t0.c2 FROM t0 GROUP BY MOD(t0.c0, DEFAULT(t0.c2));", errno.ErrFieldNotInGroupBy)
tk.MustExec("UPDATE t0 SET c2=1413;")
}

func TestOuterJoinEliminationForIssue18216(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t1, t2;")
tk.MustExec("create table t1 (a int, c int);")
tk.MustExec("insert into t1 values (1, 1), (1, 2), (2, 3), (2, 4);")
tk.MustExec("create table t2 (a int, c int);")
tk.MustExec("insert into t2 values (1, 1), (1, 2), (2, 3), (2, 4);")
// The output might be unstable.
tk.MustExec("select group_concat(c order by (select group_concat(c order by a) from t2 where a=t1.a)) from t1; ")
tk.MustQuery("select group_concat(c order by (select group_concat(c order by c) from t2 where a=t1.a), c desc) from t1;").Check(testkit.Rows("2,1,4,3"))
}
3 changes: 3 additions & 0 deletions planner/core/rule_join_elimination.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ func (o *outerJoinEliminator) doOptimize(p LogicalPlan, aggCols []*expression.Co
for _, expr := range aggDesc.Args {
parentCols = append(parentCols, expression.ExtractColumns(expr)...)
}
for _, byItem := range aggDesc.OrderByItems {
parentCols = append(parentCols, expression.ExtractColumns(byItem.Expr)...)
}
}
default:
parentCols = append(parentCols[:0], p.Schema().Columns...)
Expand Down

0 comments on commit 519373e

Please sign in to comment.