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: fix wrong collation when rewrite in condition #30492

Merged
merged 13 commits into from
Dec 21, 2021
Merged

planner: fix wrong collation when rewrite in condition #30492

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bebb3da
done
wjhuang2016 Dec 7, 2021
b3740d2
fix
wjhuang2016 Dec 7, 2021
2df3924
fix
wjhuang2016 Dec 7, 2021
7c69603
Merge branch 'master' into fix_in_collate
xhebox Dec 8, 2021
7c443f3
try fix
wjhuang2016 Dec 8, 2021
ce25480
Merge branch 'fix_in_collate' of github.com:wjhuang2016/tidb into fix…
wjhuang2016 Dec 8, 2021
a43ef03
save
wjhuang2016 Dec 8, 2021
2cccc76
merge
wjhuang2016 Dec 21, 2021
9829562
refine
wjhuang2016 Dec 21, 2021
a6ce5df
fix
wjhuang2016 Dec 21, 2021
c1feda6
fix
wjhuang2016 Dec 21, 2021
1d86a9c
fix grammar
wjhuang2016 Dec 21, 2021
31f8719
Merge branch 'master' into fix_in_collate
ti-chi-bot Dec 21, 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
5 changes: 5 additions & 0 deletions expression/integration_serial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ func TestCollationBasic(t *testing.T) {
tk.MustQuery("select * from t1 where col1 >= 0xc484 and col1 <= 0xc3b3;").Check(testkit.Rows("Ȇ"))

tk.MustQuery("select collation(IF('a' < 'B' collate utf8mb4_general_ci, 'smaller', 'greater' collate utf8mb4_unicode_ci));").Check(testkit.Rows("utf8mb4_unicode_ci"))

tk.MustExec("drop table if exists t")
tk.MustExec("create table t(a char(10))")
tk.MustExec("insert into t values ('a')")
tk.MustQuery("select * from t where a in ('b' collate utf8mb4_general_ci, 'A', 3)").Check(testkit.Rows("a"))
}

func TestWeightString(t *testing.T) {
Expand Down
11 changes: 11 additions & 0 deletions planner/core/expression_rewriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,8 +1481,19 @@ func (er *expressionRewriter) inToExpression(lLen int, not bool, tp *types.Field
if allSameType && l == 1 && lLen > 1 {
function = er.notToExpression(not, ast.In, tp, er.ctxStack[stkLen-lLen-1:]...)
} else {
coll, err := expression.CheckAndDeriveCollationFromExprs(er.sctx, "IN", types.ETInt, args...)
er.err = err
if er.err != nil {
return
}
eqFunctions := make([]expression.Expression, 0, lLen)
for i := stkLen - lLen; i < stkLen; i++ {
if er.ctxStack[i].GetType().EvalType() == types.ETString {
tp := er.ctxStack[i].GetType().Clone()
tp.Charset, tp.Collate = coll.Charset, coll.Collation
er.ctxStack[i] = expression.BuildCastFunction(er.sctx, er.ctxStack[i], tp)
er.ctxStack[i].SetCoercibility(expression.CoercibilityExplicit)
}
expr, err := er.constructBinaryOpFunction(args[0], er.ctxStack[i], ast.EQ)
if err != nil {
er.err = err
Expand Down