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 prepare explain index out of range bug (#40568) #40602

Merged
merged 5 commits into from
Jan 17, 2023
Merged

planner: fix prepare explain index out of range bug (#40568) #40602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16a249e
This is an automated cherry-pick of #40568
fzzf678 Jan 16, 2023
d6fdc6c
fix ut
fzzf678 Jan 16, 2023
c3e6008
Merge branch 'release-6.1' into cherry-pick-40568-to-release-6.1
fzzf678 Jan 16, 2023
289674c
Merge branch 'release-6.1' into cherry-pick-40568-to-release-6.1
Ivy-YinSu Jan 17, 2023
8cd3802
Merge branch 'release-6.1' into cherry-pick-40568-to-release-6.1
Ivy-YinSu Jan 17, 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
18 changes: 18 additions & 0 deletions executor/seqtest/prepared_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,3 +937,21 @@ func TestPreparedIssue17419(t *testing.T) {
// _, ok := tk1.Session().ShowProcess().Plan.(*plannercore.Execute)
// require.True(t, ok)
}

func TestIssue38323(t *testing.T) {
store, _, clean := testkit.CreateMockStoreAndDomain(t)
defer clean()
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t(id int, k int);")

tk.MustExec("prepare stmt from 'explain select * from t where id = ? and k = ? group by id, k';")
tk.MustExec("set @a = 1;")
tk.MustExec("execute stmt using @a, @a")
tk.MustQuery("execute stmt using @a, @a").Check(tk.MustQuery("explain select * from t where id = 1 and k = 1 group by id, k").Rows())

tk.MustExec("prepare stmt from 'explain select * from t where ? = id and ? = k group by id, k';")
tk.MustExec("set @a = 1;")
tk.MustQuery("execute stmt using @a, @a").Check(tk.MustQuery("explain select * from t where 1 = id and 1 = k group by id, k").Rows())
}
4 changes: 2 additions & 2 deletions planner/core/point_get_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ func getNameValuePairs(ctx sessionctx.Context, tbl *model.TableInfo, tblName mod
case *driver.ValueExpr:
d = x.Datum
case *driver.ParamMarkerExpr:
con, err = expression.ParamMarkerExpression(ctx, x, true)
con, err = expression.ParamMarkerExpression(ctx, x, false)
if err != nil {
return nil, false
}
Expand All @@ -1221,7 +1221,7 @@ func getNameValuePairs(ctx sessionctx.Context, tbl *model.TableInfo, tblName mod
case *driver.ValueExpr:
d = x.Datum
case *driver.ParamMarkerExpr:
con, err = expression.ParamMarkerExpression(ctx, x, true)
con, err = expression.ParamMarkerExpression(ctx, x, false)
if err != nil {
return nil, false
}
Expand Down