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

planner: fix agg push down rule mistake order by item inside agg function (#50002) #50016

Merged
merged 7 commits into from
Jan 25, 2024
Merged

planner: fix agg push down rule mistake order by item inside agg function (#50002) #50016

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dc7773
This is an automated cherry-pick of #50002
AilinKid Jan 3, 2024
81de3b5
.
AilinKid Jan 23, 2024
d0809ee
Delete tests/integrationtest/t/expression/issues.test
AilinKid Jan 23, 2024
e7ad327
Delete tests/integrationtest/r/expression/issues.result
AilinKid Jan 23, 2024
3573de7
Update integration_test.go
AilinKid Jan 24, 2024
1bfa062
.
AilinKid Jan 25, 2024
f15b0c3
.
AilinKid Jan 25, 2024
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
2 changes: 1 addition & 1 deletion planner/core/rule_aggregation_push_down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ func (a *aggregationPushDownSolver) aggPushDown(p LogicalPlan, opt *logicalOptim
break
}
}
for j, item := range newAggOrderItems {
for j, item := range newAggOrderItems[i] {
if item == nil {
continue
}
Expand Down
22 changes: 22 additions & 0 deletions statistics/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,3 +787,25 @@ func TestIssue44369(t *testing.T) {
tk.MustExec("alter table t rename column b to bb;")
tk.MustExec("select * from t where a = 10 and bb > 20;")
}

func TestIssue49986(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")

tk.MustExec("drop table if exists test.t;")
tk.MustExec("create table if not exists test.ast (i varchar(20));")
tk.MustExec("create table if not exists test.acc (j varchar(20), k varchar(20), l varchar(20), m varchar(20));")
tk.MustQuery("explain format='brief' with t as(select i, (case when b.j = '20001' then b.l else b.k end) an from test.ast a inner join test.acc b on (a.i = b.m) and a.i = 'astp2019121731703151'), t1 as (select i, group_concat(an order by an separator '; ') an from t group by i) select * from t1;").Check(
testkit.Rows("Projection 8.00 root test.ast.i, Column#32",
"└─HashAgg 8.00 root group by:Column#37, funcs:group_concat(Column#34 order by Column#35 separator \"; \")->Column#32, funcs:firstrow(Column#36)->test.ast.i",
" └─Projection 100.00 root case(eq(test.acc.j, 20001), test.acc.l, test.acc.k)->Column#34, case(eq(test.acc.j, 20001), test.acc.l, test.acc.k)->Column#35, test.ast.i, test.ast.i",
" └─HashJoin 100.00 root CARTESIAN inner join",
" ├─TableReader(Build) 10.00 root data:Selection",
" │ └─Selection 10.00 cop[tikv] eq(test.ast.i, \"astp2019121731703151\")",
" │ └─TableFullScan 10000.00 cop[tikv] table:a keep order:false, stats:pseudo",
" └─TableReader(Probe) 10.00 root data:Selection",
" └─Selection 10.00 cop[tikv] eq(\"astp2019121731703151\", test.acc.m)",
" └─TableFullScan 10000.00 cop[tikv] table:b keep order:false, stats:pseudo"))

}
Loading