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

expression, cmd: fix ColumnSubstitute and allow some cases to substitute #38826

Merged
merged 18 commits into from
Jan 31, 2023
Merged

expression, cmd: fix ColumnSubstitute and allow some cases to substitute #38826

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1841e8b
init
wjhuang2016 Nov 2, 2022
33215d4
clen
wjhuang2016 Nov 2, 2022
db51040
Merge branch 'master' into ox_coll_substitute
AilinKid Nov 2, 2022
5c80ad7
add explain
wjhuang2016 Nov 2, 2022
dce94b0
Merge branch 'ox_coll_substitute' of github.com:wjhuang2016/tidb into…
wjhuang2016 Nov 2, 2022
2b04bdb
done
wjhuang2016 Nov 2, 2022
24450ce
Merge branch 'master' into ox_coll_substitute
wjhuang2016 Nov 18, 2022
2df07ee
Merge branch 'master' into ox_coll_substitute
wjhuang2016 Jan 30, 2023
d4aaac1
fix
wjhuang2016 Jan 30, 2023
a53fff7
fix
wjhuang2016 Jan 30, 2023
6884ed4
done
wjhuang2016 Jan 30, 2023
28f15f3
fix
wjhuang2016 Jan 30, 2023
c81372c
fix test
wjhuang2016 Jan 30, 2023
5482443
Update expression/util.go
wjhuang2016 Jan 31, 2023
674b0e8
Update planner/core/exhaust_physical_plans.go
wjhuang2016 Jan 31, 2023
369c980
refine
wjhuang2016 Jan 31, 2023
7b757b6
Merge branch 'master' into ox_coll_substitute
AilinKid Jan 31, 2023
74913d0
Merge branch 'master' into ox_coll_substitute
ti-chi-bot Jan 31, 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
15 changes: 15 additions & 0 deletions cmd/explaintest/r/collation_check_use_collation_disabled.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,19 @@ insert into t1 values ('-1');
insert into t2 values (0x2d31, '');
select * from t1, t2 where t1.a in (t2.b, 3);
a b c
drop table if exists t0;
drop table if exists t1;
CREATE TABLE t0(c0 BOOL, c1 INT);
CREATE TABLE t1 LIKE t0;
CREATE VIEW v0(c0) AS SELECT IS_IPV4(t0.c1) FROM t0, t1;
INSERT INTO t0(c0, c1) VALUES (true, 0);
INSERT INTO t1(c0, c1) VALUES (true, 2);
SELECT v0.c0 FROM v0;
c0
0
SELECT (v0.c0)NOT LIKE(BINARY v0.c0) FROM v0;
(v0.c0)NOT LIKE(BINARY v0.c0)
0
SELECT v0.c0 FROM v0 WHERE (v0.c0)NOT LIKE(BINARY v0.c0);
c0
use test
15 changes: 15 additions & 0 deletions cmd/explaintest/r/collation_check_use_collation_enabled.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,19 @@ insert into t1 values ('-1');
insert into t2 values (0x2d31, '');
select * from t1, t2 where t1.a in (t2.b, 3);
a b c
drop table if exists t0;
drop table if exists t1;
CREATE TABLE t0(c0 BOOL, c1 INT);
CREATE TABLE t1 LIKE t0;
CREATE VIEW v0(c0) AS SELECT IS_IPV4(t0.c1) FROM t0, t1;
INSERT INTO t0(c0, c1) VALUES (true, 0);
INSERT INTO t1(c0, c1) VALUES (true, 2);
SELECT v0.c0 FROM v0;
c0
0
SELECT (v0.c0)NOT LIKE(BINARY v0.c0) FROM v0;
(v0.c0)NOT LIKE(BINARY v0.c0)
0
SELECT v0.c0 FROM v0 WHERE (v0.c0)NOT LIKE(BINARY v0.c0);
c0
use test
2 changes: 1 addition & 1 deletion cmd/explaintest/r/explain_complex.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Sort 1.00 root test.org_department.left_value
└─HashAgg 1.00 root group by:test.org_department.id, funcs:firstrow(test.org_department.id)->test.org_department.id, funcs:firstrow(test.org_department.ctx)->test.org_department.ctx, funcs:firstrow(test.org_department.name)->test.org_department.name, funcs:firstrow(test.org_department.left_value)->test.org_department.left_value, funcs:firstrow(test.org_department.right_value)->test.org_department.right_value, funcs:firstrow(test.org_department.depth)->test.org_department.depth, funcs:firstrow(test.org_department.leader_id)->test.org_department.leader_id, funcs:firstrow(test.org_department.status)->test.org_department.status, funcs:firstrow(test.org_department.created_on)->test.org_department.created_on, funcs:firstrow(test.org_department.updated_on)->test.org_department.updated_on
└─Selection 0.01 root or(eq(test.org_employee_position.user_id, 62), or(eq(test.org_department.id, 20), eq(test.org_department.id, 20)))
└─HashJoin 0.02 root left outer join, equal:[eq(test.org_position.id, test.org_employee_position.position_id)]
├─IndexJoin(Build) 0.01 root left outer join, inner:IndexLookUp, outer key:test.org_department.id, inner key:test.org_position.department_id, equal cond:eq(test.org_department.id, test.org_position.department_id)
├─IndexHashJoin(Build) 0.01 root left outer join, inner:IndexLookUp, outer key:test.org_department.id, inner key:test.org_position.department_id, equal cond:eq(test.org_department.id, test.org_position.department_id)
│ ├─IndexLookUp(Build) 0.01 root
│ │ ├─IndexRangeScan(Build) 10.00 cop[tikv] table:d, index:org_department_ctx_index(ctx) range:[1,1], keep order:false, stats:pseudo
│ │ └─Selection(Probe) 0.01 cop[tikv] eq(test.org_department.status, 1000)
Expand Down
10 changes: 4 additions & 6 deletions cmd/explaintest/r/subquery.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,11 @@ insert into exam values(1, 'math', 100);
set names utf8 collate utf8_general_ci;
explain format = 'brief' select * from stu where stu.name not in (select 'guo' from exam where exam.stu_id = stu.id);
id estRows task access object operator info
Apply 10000.00 root CARTESIAN anti semi join, other cond:eq(test.stu.name, Column#8)
HashJoin 8000.00 root anti semi join, equal:[eq(test.stu.id, test.exam.stu_id)], other cond:eq(test.stu.name, "guo")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is correct the NOT IN's key name not in('guo') is put in other cond. And the inner filter exam.stu_id = stu.id is put at the join key.

├─TableReader(Build) 10000.00 root data:TableFullScan
│ └─TableFullScan 10000.00 cop[tikv] table:stu keep order:false, stats:pseudo
└─Projection(Probe) 100000.00 root guo->Column#8
└─TableReader 100000.00 root data:Selection
└─Selection 100000.00 cop[tikv] eq(test.exam.stu_id, test.stu.id)
└─TableFullScan 100000000.00 cop[tikv] table:exam keep order:false, stats:pseudo
│ └─TableFullScan 10000.00 cop[tikv] table:exam keep order:false, stats:pseudo
└─TableReader(Probe) 10000.00 root data:TableFullScan
└─TableFullScan 10000.00 cop[tikv] table:stu keep order:false, stats:pseudo
select * from stu where stu.name not in (select 'guo' from exam where exam.stu_id = stu.id);
id name
set names utf8mb4;
Expand Down
13 changes: 13 additions & 0 deletions cmd/explaintest/t/collation_check_use_collation.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,18 @@ insert into t1 values ('-1');
insert into t2 values (0x2d31, '');
select * from t1, t2 where t1.a in (t2.b, 3);

# issue 38736
drop table if exists t0;
drop table if exists t1;
CREATE TABLE t0(c0 BOOL, c1 INT);
CREATE TABLE t1 LIKE t0;
CREATE VIEW v0(c0) AS SELECT IS_IPV4(t0.c1) FROM t0, t1;
INSERT INTO t0(c0, c1) VALUES (true, 0);
INSERT INTO t1(c0, c1) VALUES (true, 2);

SELECT v0.c0 FROM v0;
SELECT (v0.c0)NOT LIKE(BINARY v0.c0) FROM v0;
SELECT v0.c0 FROM v0 WHERE (v0.c0)NOT LIKE(BINARY v0.c0);

# cleanup environment
use test
8 changes: 6 additions & 2 deletions expression/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@ func ColumnSubstituteImpl(expr Expression, schema *Schema, newExprs []Expression
if v.InOperand {
newExpr = SetExprColumnInOperand(newExpr)
}
newExpr.SetCoercibility(v.Coercibility())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove this, rest is ok for me

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may not be substituted in L424. If keep it, a test in constant propagation will fail.

return true, false, newExpr
case *ScalarFunction:
substituted := false
Expand Down Expand Up @@ -463,7 +462,12 @@ func ColumnSubstituteImpl(expr Expression, schema *Schema, newExprs []Expression
_ = append(append(append(tmpArgs, refExprArr.Result()[0:idx]...), refExprArr.Result()[idx+1:]...), newFuncExpr)
_, newColl := DeriveCollationFromExprs(v.GetCtx(), append(v.GetArgs(), newFuncExpr)...)
if coll == newColl {
changed = checkCollationStrictness(coll, newFuncExpr.GetType().GetCollate())
if newFuncExpr.GetType().GetCollate() == arg.GetType().GetCollate() && newFuncExpr.Coercibility() == arg.Coercibility() {
// It's safe to use the new expression, otherwise some cases in projection push-down will be wrong.
changed = true
} else {
changed = checkCollationStrictness(coll, newFuncExpr.GetType().GetCollate())
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why must make the substitute happen, I thought it was just an optimization, at least it should not get the wrong result if the optimization does not take effect. /cc @winoros

}
}
}
Expand Down