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: correct constant propagation for collation (#22666) #22923

Merged
merged 6 commits into from
May 12, 2021
Merged

expression: correct constant propagation for collation (#22666) #22923

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c812b77
cherry pick #22666 to release-4.0
wjhuang2016 Feb 24, 2021
31b13ee
Merge branch 'release-4.0' into release-4.0-eea52f5f2091
wjhuang2016 May 11, 2021
f712546
Merge branch 'release-4.0' into release-4.0-eea52f5f2091
ti-chi-bot May 12, 2021
4473f95
Merge branch 'release-4.0' into release-4.0-eea52f5f2091
ti-chi-bot May 12, 2021
945bec7
Merge branch 'release-4.0' into release-4.0-eea52f5f2091
ti-chi-bot May 12, 2021
0d4d694
Merge branch 'release-4.0' into release-4.0-eea52f5f2091
ti-chi-bot May 12, 2021
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
3 changes: 1 addition & 2 deletions expression/constant_propagation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/collate"
"github.com/pingcap/tidb/util/disjointset"
"github.com/pingcap/tidb/util/logutil"
"go.uber.org/zap"
Expand Down Expand Up @@ -88,7 +87,7 @@ func validEqualCondHelper(ctx sessionctx.Context, eq *ScalarFunction, colIsLeft
if ContainMutableConst(ctx, []Expression{con}) {
return nil, nil
}
if !collate.CompatibleCollate(col.GetType().Collate, con.GetType().Collate) {
if col.GetType().Collate != con.GetType().Collate {
return nil, nil
}
return col, con
Expand Down
7 changes: 7 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6271,6 +6271,13 @@ func (s *testIntegrationSerialSuite) TestCollateConstantPropagation(c *C) {
tk.MustExec("insert into t1 values ('ß', 's');")
tk.MustExec("insert into t2 values ('s', 's')")
tk.MustQuery("select * from t1 left join t2 on t1.a = t2.a collate utf8mb4_unicode_ci where t1.a = 's';").Check(testkit.Rows("ß s <nil> <nil>"))
tk.MustExec("drop table if exists t1, t2;")
tk.MustExec("create table t1(a char(10) collate utf8mb4_general_ci, index (a));")
tk.MustExec("create table t2(a char(10) collate utf8_bin, index (a));")
tk.MustExec("insert into t1 values ('a');")
tk.MustExec("insert into t2 values ('A');")
tk.MustExec("set names utf8 collate utf8_general_ci;")
tk.MustQuery("select * from t1, t2 where t1.a=t2.a and t1.a= 'a';").Check(testkit.Rows("a A"))
}

func (s *testIntegrationSerialSuite) TestMixCollation(c *C) {
Expand Down