Skip to content
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

Jump to bottom

planner: when pushing topN down below proj, check whether topN.ByItems contains a column(with ID=0) generated by proj #40593

Merged
merged 13 commits into from
Feb 8, 2023
Merged

planner: when pushing topN down below proj, check whether topN.ByItems contains a column(with ID=0) generated by proj #40593

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b15b9ba
the proj below sort will prevent optimizer from pushing the proj down…
Dousir9 Jan 14, 2023
7bca494
add unit test
Dousir9 Jan 14, 2023
0c43e9a
fix-typo
Dousir9 Jan 14, 2023
7e9ba52
put the test case into the existing file.
Dousir9 Jan 16, 2023
a87d5ab
check whether proj can be eliminated or contains a column in topN.ByI…
Dousir9 Jan 17, 2023
5edf750
remove unnecessary check
Dousir9 Jan 17, 2023
3114b6b
change the code of LogicalProjection.pushDownTopN instead of the Logi…
Dousir9 Jan 19, 2023
07d5225
fix: with Column.ID = 0
Dousir9 Jan 30, 2023
882dea3
Merge branch 'master' into fix-40535
Dousir9 Jan 30, 2023
dd9ac2d
check whether the column is generated by projection
Dousir9 Jan 30, 2023
1a3ce1b
update comment
Dousir9 Jan 30, 2023
29893ff
Merge branch 'master' into fix-40535
qw4990 Feb 6, 2023
5d568ab
Merge branch 'master' into fix-40535
ti-chi-bot Feb 7, 2023
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
13 changes: 13 additions & 0 deletions planner/core/plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/expression/aggregation"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/parser/ast"
"github.com/pingcap/tidb/parser/model"
"github.com/pingcap/tidb/parser/mysql"
Expand Down Expand Up @@ -1142,3 +1143,15 @@ func TestJSONPlanInExplain(t *testing.T) {
}
}
}

func TestIssue40535(t *testing.T) {
store := testkit.CreateMockStore(t)
var cfg kv.InjectionConfig
tk := testkit.NewTestKit(t, kv.NewInjectedStore(store, &cfg))
tk.MustExec("use test;")
tk.MustExec("drop table if exists t1; drop table if exists t2;")
tk.MustExec("CREATE TABLE `t1`(`c1` bigint(20) NOT NULL DEFAULT '-2312745469307452950', `c2` datetime DEFAULT '5316-02-03 06:54:49', `c3` tinyblob DEFAULT NULL, PRIMARY KEY (`c1`) /*T![clustered_index] CLUSTERED */) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;")
tk.MustExec("CREATE TABLE `t2`(`c1` set('kn8pu','7et','vekx6','v3','liwrh','q14','1met','nnd5i','5o0','8cz','l') DEFAULT '7et,vekx6,liwrh,q14,1met', `c2` float DEFAULT '1.683167', KEY `k1` (`c2`,`c1`), KEY `k2` (`c2`)) ENGINE=InnoDB DEFAULT CHARSET=gbk COLLATE=gbk_chinese_ci;")
tk.MustExec("(select /*+ agg_to_cop()*/ locate(t1.c3, t1.c3) as r0, t1.c3 as r1 from t1 where not( IsNull(t1.c1)) order by r0,r1) union all (select concat_ws(',', t2.c2, t2.c1) as r0, t2.c1 as r1 from t2 order by r0, r1) order by 1 limit 273;")
require.Empty(t, tk.Session().LastMessage())
}
14 changes: 14 additions & 0 deletions planner/core/rule_topn_push_down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@ func (p *LogicalProjection) pushDownTopN(topN *LogicalTopN, opt *logicalOptimize
topN.ByItems = append(topN.ByItems[:i], topN.ByItems[i+1:]...)
}
}

// if topN.ByItems contains a column(with ID=0) generated by projection, projection will prevent the optimizer from pushing topN down.
for _, by := range topN.ByItems {
cols := expression.ExtractColumns(by.Expr)
for _, col := range cols {
if col.ID == 0 && p.Schema().Contains(col) {
// check whether the column is generated by projection
if !p.children[0].Schema().Contains(col) {
p.children[0] = p.children[0].pushDownTopN(nil, opt)
return topN.setChild(p, opt)
}
}
}
}
}
p.children[0] = p.children[0].pushDownTopN(topN, opt)
return p
Expand Down