Skip to content

Commit

Permalink
planner: just pop cte's handleHelper map out since it shouldn't be co…
Browse files Browse the repository at this point in the history 
…nsidered (#35854) (#36572)

close #35758
  • Loading branch information
@ti-srebot
ti-srebot authored Oct 11, 2022
1 parent 56fd9ea commit 5f8fc3f
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 0 deletions.
74 changes: 74 additions & 0 deletions cmd/explaintest/r/explain_cte.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,3 +498,77 @@ CTE_1 10000.00 root Non-Recursive CTE
CTE_0 10000.00 root Non-Recursive CTE
└─TableReader_22(Seed Part) 10000.00 root data:TableFullScan_21
└─TableFullScan_21 10000.00 cop[tikv] table:tbl keep order:false, stats:pseudo
drop table if exists t1, t2, t3;
create table t1 (a int, b int);
create table t2 (c int, d int);
create table t3 (e int, f int);
insert into t1 values(1,1);
insert into t2 values(1,1);
insert into t3 values(1,1234);
explain update t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c set t1.b = 4321;
id estRows task access object operator info
Update_14 N/A root N/A
└─HashJoin_25 12.49 root inner join, equal:[eq(test.t1.a, test.t2.c)]
├─HashJoin_33(Build) 9.99 root inner join, equal:[eq(test.t3.e, test.t2.d)]
│ ├─Selection_35(Build) 7.99 root not(isnull(test.t3.e))
│ │ └─CTEFullScan_36 9.99 root CTE:temp data:CTE_0
│ └─TableReader_39(Probe) 9980.01 root data:Selection_38
│ └─Selection_38 9980.01 cop[tikv] not(isnull(test.t2.c)), not(isnull(test.t2.d))
│ └─TableFullScan_37 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo
└─TableReader_29(Probe) 9990.00 root data:Selection_28
└─Selection_28 9990.00 cop[tikv] not(isnull(test.t1.a))
└─TableFullScan_27 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo
CTE_0 9.99 root Non-Recursive CTE
└─Projection_17(Seed Part) 9.99 root test.t3.e
└─TableReader_20 9.99 root data:Selection_19
└─Selection_19 9.99 cop[tikv] eq(test.t3.f, 1234), not(isnull(test.t3.e))
└─TableFullScan_18 10000.00 cop[tikv] table:t3 keep order:false, stats:pseudo
update t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c set t1.b = 4321;
select * from t1;
a b
1 4321
explain insert into t1 select t1.a, t1.b from t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
id estRows task access object operator info
Insert_1 N/A root N/A
└─HashJoin_28 12.49 root inner join, equal:[eq(test.t2.c, test.t1.a)]
├─HashJoin_30(Build) 9.99 root inner join, equal:[eq(test.t3.e, test.t2.d)]
│ ├─Selection_31(Build) 7.99 root not(isnull(test.t3.e))
│ │ └─CTEFullScan_32 9.99 root CTE:temp data:CTE_0
│ └─TableReader_35(Probe) 9980.01 root data:Selection_34
│ └─Selection_34 9980.01 cop[tikv] not(isnull(test.t2.c)), not(isnull(test.t2.d))
│ └─TableFullScan_33 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo
└─TableReader_38(Probe) 9990.00 root data:Selection_37
└─Selection_37 9990.00 cop[tikv] not(isnull(test.t1.a))
└─TableFullScan_36 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo
CTE_0 9.99 root Non-Recursive CTE
└─Projection_18(Seed Part) 9.99 root test.t3.e
└─TableReader_21 9.99 root data:Selection_20
└─Selection_20 9.99 cop[tikv] eq(test.t3.f, 1234), not(isnull(test.t3.e))
└─TableFullScan_19 10000.00 cop[tikv] table:t3 keep order:false, stats:pseudo
insert into t1 select t1.a, t1.b from t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
select * from t1;
a b
1 4321
1 4321
explain delete from t1 using t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
id estRows task access object operator info
Delete_14 N/A root N/A
└─Projection_25 12.49 root test.t1.a, test.t1.b, test.t1._tidb_rowid, test.t2.c
└─HashJoin_27 12.49 root inner join, equal:[eq(test.t2.c, test.t1.a)]
├─HashJoin_29(Build) 9.99 root inner join, equal:[eq(test.t3.e, test.t2.d)]
│ ├─Selection_30(Build) 7.99 root not(isnull(test.t3.e))
│ │ └─CTEFullScan_31 9.99 root CTE:temp data:CTE_0
│ └─TableReader_34(Probe) 9980.01 root data:Selection_33
│ └─Selection_33 9980.01 cop[tikv] not(isnull(test.t2.c)), not(isnull(test.t2.d))
│ └─TableFullScan_32 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo
└─TableReader_37(Probe) 9990.00 root data:Selection_36
└─Selection_36 9990.00 cop[tikv] not(isnull(test.t1.a))
└─TableFullScan_35 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo
CTE_0 9.99 root Non-Recursive CTE
└─Projection_17(Seed Part) 9.99 root test.t3.e
└─TableReader_20 9.99 root data:Selection_19
└─Selection_19 9.99 cop[tikv] eq(test.t3.f, 1234), not(isnull(test.t3.e))
└─TableFullScan_18 10000.00 cop[tikv] table:t3 keep order:false, stats:pseudo
delete from t1 using t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
select * from t1;
a b
18 changes: 18 additions & 0 deletions cmd/explaintest/t/explain_cte.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,21 @@ where v1.bench_type =v2.bench_type;
drop table if exists tbl;
create table tbl (id int);
explain with t1 as (select id from tbl), t2 as (select a.id from t1 a join t1 b on a.id = b.id) select * from t2 where id in (select id from t2);

# issue 35758
drop table if exists t1, t2, t3;
create table t1 (a int, b int);
create table t2 (c int, d int);
create table t3 (e int, f int);
insert into t1 values(1,1);
insert into t2 values(1,1);
insert into t3 values(1,1234);
explain update t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c set t1.b = 4321;
update t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c set t1.b = 4321;
select * from t1;
explain insert into t1 select t1.a, t1.b from t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
insert into t1 select t1.a, t1.b from t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
select * from t1;
explain delete from t1 using t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
delete from t1 using t1 inner join (select t2.c from t2 inner join (with temp as (select e from t3 where t3.f = 1234) select e from temp) tt on t2.d = tt.e) t on t1.a = t.c;
select * from t1;
2 changes: 2 additions & 0 deletions planner/core/logical_plan_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6903,6 +6903,8 @@ func (b *PlanBuilder) buildWith(ctx context.Context, w *ast.WithClause) error {
b.outerCTEs[len(b.outerCTEs)-1].optFlag = b.optFlag
b.outerCTEs[len(b.outerCTEs)-1].isBuilding = false
b.optFlag = saveFlag
// each cte (select statement) will generate a handle map, pop it out here.
b.handleHelper.popMap()
}
return nil
}
Expand Down

0 comments on commit 5f8fc3f

Please sign in to comment.