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 wrong range calculation for Nulleq function on Enum values #32440

Merged
merged 6 commits into from
Feb 21, 2022
Merged

planner: fix wrong range calculation for Nulleq function on Enum values #32440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c60339c
fixup
qw4990 Feb 17, 2022
411ce3d
fixup
qw4990 Feb 17, 2022
e0bb285
Merge branch 'master' into fix-32428
qw4990 Feb 18, 2022
9d01548
Merge branch 'master' into fix-32428
ti-chi-bot Feb 21, 2022
d17a79e
Merge branch 'master' into fix-32428
ti-chi-bot Feb 21, 2022
509e838
Merge branch 'master' into fix-32428
ti-chi-bot Feb 21, 2022
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
22 changes: 22 additions & 0 deletions planner/core/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3628,6 +3628,28 @@ func (s *testIntegrationSuite) TestIssue26719(c *C) {
tk.MustExec(`rollback`)
}

func (s *testIntegrationSuite) TestIssue32428(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("create table `t1` (`a` enum('aa') DEFAULT NULL, KEY `k` (`a`))")
tk.MustExec("insert into t1 values('aa')")
tk.MustExec("insert into t1 values(null)")
tk.MustQuery("select a from t1 where a<=>'aa'").Check(testkit.Rows("aa"))
tk.MustQuery("select a from t1 where a<=>null").Check(testkit.Rows("<nil>"))

tk.MustExec(`CREATE TABLE IDT_MULTI15860STROBJSTROBJ (
COL1 enum('aa') DEFAULT NULL,
COL2 int(41) DEFAULT NULL,
COL3 year(4) DEFAULT NULL,
KEY U_M_COL4 (COL1,COL2),
KEY U_M_COL5 (COL3,COL2))`)
tk.MustExec(`insert into IDT_MULTI15860STROBJSTROBJ values("aa", 1013610488, 1982)`)
tk.MustQuery(`SELECT * FROM IDT_MULTI15860STROBJSTROBJ t1 RIGHT JOIN IDT_MULTI15860STROBJSTROBJ t2 ON t1.col1 <=> t2.col1 where t1.col1 is null and t2.col1 = "aa"`).Check(testkit.Rows()) // empty result
tk.MustExec(`prepare stmt from "SELECT * FROM IDT_MULTI15860STROBJSTROBJ t1 RIGHT JOIN IDT_MULTI15860STROBJSTROBJ t2 ON t1.col1 <=> t2.col1 where t1.col1 is null and t2.col1 = ?"`)
tk.MustExec(`set @a="aa"`)
tk.MustQuery(`execute stmt using @a`).Check(testkit.Rows()) // empty result
}

func (s *testIntegrationSerialSuite) TestPushDownProjectionForTiFlash(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
3 changes: 1 addition & 2 deletions planner/core/prepare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2110,8 +2110,7 @@ func TestIssue30100(t *testing.T) {
tk.MustExec("set @a=0;")
tk.MustQuery("execute stmt using @a").Check(testkit.Rows())
tk.MustQuery("execute stmt using @a").Check(testkit.Rows())
// If the plan contains the tableDual, it can not be cached.
tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("0"))
Comment on lines -2113 to -2114
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The TableDual no longer exists after this PR.

tk.MustQuery("select @@last_plan_from_cache").Check(testkit.Rows("1"))
}

func TestPartitionTable(t *testing.T) {
Expand Down
6 changes: 5 additions & 1 deletion util/ranger/points.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@ func handleEnumFromBinOp(sc *stmtctx.StatementContext, ft *types.FieldType, val
res = append(res, &point{value: d, excl: false, start: false})
}

if op == ast.NullEQ && val.IsNull() {
res = append(res, &point{start: true}, &point{}) // null point
}

tmpEnum := types.Enum{}
for i := 0; i <= len(ft.Elems); i++ {
if i == 0 {
Expand Down Expand Up @@ -486,7 +490,7 @@ func handleEnumFromBinOp(sc *stmtctx.StatementContext, ft *types.FieldType, val
if v >= 0 {
appendPointFunc(d)
}
case ast.EQ:
case ast.EQ, ast.NullEQ:
if v == 0 {
appendPointFunc(d)
}
Expand Down