From 6caadcafc6f433f2602406e70a31319526ddf05c Mon Sep 17 00:00:00 2001 From: Yiding Cui Date: Sun, 14 May 2023 02:19:16 +0800 Subject: [PATCH] planner: fix correctness of the correlated predicate push down for cte (#43759) close pingcap/tidb#43645 --- planner/core/issuetest/BUILD.bazel | 1 + planner/core/issuetest/planner_issue_test.go | 14 ++++++++++++++ planner/core/rule_predicate_push_down.go | 19 ++++++++++++++++--- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/planner/core/issuetest/BUILD.bazel b/planner/core/issuetest/BUILD.bazel index 7b7988cd796ec..23042051e2363 100644 --- a/planner/core/issuetest/BUILD.bazel +++ b/planner/core/issuetest/BUILD.bazel @@ -9,6 +9,7 @@ go_test( ], flaky = True, race = "on", + shard_count = 3, deps = [ "//parser", "//planner", diff --git a/planner/core/issuetest/planner_issue_test.go b/planner/core/issuetest/planner_issue_test.go index 720d80de2435b..1994841e206c8 100644 --- a/planner/core/issuetest/planner_issue_test.go +++ b/planner/core/issuetest/planner_issue_test.go @@ -69,3 +69,17 @@ func TestIssue43461(t *testing.T) { require.NotEqual(t, is.Columns, ts.Columns) } + +func TestIssue43645(t *testing.T) { + store := testkit.CreateMockStore(t) + tk := testkit.NewTestKit(t, store) + + tk.MustExec("use test") + tk.MustExec("CREATE TABLE t1(id int,col1 varchar(10),col2 varchar(10),col3 varchar(10));") + tk.MustExec("CREATE TABLE t2(id int,col1 varchar(10),col2 varchar(10),col3 varchar(10));") + tk.MustExec("INSERT INTO t1 values(1,NULL,NULL,null),(2,NULL,NULL,null),(3,NULL,NULL,null);") + tk.MustExec("INSERT INTO t2 values(1,'a','aa','aaa'),(2,'b','bb','bbb'),(3,'c','cc','ccc');") + + rs := tk.MustQuery("WITH tmp AS (SELECT t2.* FROM t2) select (SELECT tmp.col1 FROM tmp WHERE tmp.id=t1.id ) col1, (SELECT tmp.col2 FROM tmp WHERE tmp.id=t1.id ) col2, (SELECT tmp.col3 FROM tmp WHERE tmp.id=t1.id ) col3 from t1;") + rs.Sort().Check(testkit.Rows("a aa aaa", "b bb bbb", "c cc ccc")) +} diff --git a/planner/core/rule_predicate_push_down.go b/planner/core/rule_predicate_push_down.go index c4d690e44a260..8cbed486b76cc 100644 --- a/planner/core/rule_predicate_push_down.go +++ b/planner/core/rule_predicate_push_down.go @@ -988,13 +988,26 @@ func (p *LogicalCTE) PredicatePushDown(predicates []expression.Expression, _ *lo if !p.isOuterMostCTE { return predicates, p.self } - if len(predicates) == 0 { + pushedPredicates := make([]expression.Expression, len(predicates)) + copy(pushedPredicates, predicates) + // The filter might change the correlated status of the cte. + // We forbid the push down that makes the change for now. + // Will support it later. + if !p.cte.IsInApply { + for i := len(pushedPredicates) - 1; i >= 0; i-- { + if len(expression.ExtractCorColumns(pushedPredicates[i])) == 0 { + continue + } + pushedPredicates = append(pushedPredicates[0:i], pushedPredicates[i+1:]...) + } + } + if len(pushedPredicates) == 0 { p.cte.pushDownPredicates = append(p.cte.pushDownPredicates, expression.NewOne()) return predicates, p.self } newPred := make([]expression.Expression, 0, len(predicates)) - for i := range predicates { - newPred = append(newPred, predicates[i].Clone()) + for i := range pushedPredicates { + newPred = append(newPred, pushedPredicates[i].Clone()) ResolveExprAndReplace(newPred[i], p.cte.ColumnMap) } p.cte.pushDownPredicates = append(p.cte.pushDownPredicates, expression.ComposeCNFCondition(p.ctx, newPred...))