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: keep tidb_prepared_plan_cache_size compatible (#43393) #43403

Merged
merged 1 commit into from
Apr 25, 2023
Merged

planner: keep tidb_prepared_plan_cache_size compatible (#43393) #43403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions planner/core/plan_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,33 @@ func TestIssue43311(t *testing.T) {
tk.MustQuery(`execute st using @a, @b`).Check(testkit.Rows()) // empty
}

func TestPlanCacheSizeSwitch(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)

// default value = 100
tk.MustQuery(`select @@tidb_prepared_plan_cache_size`).Check(testkit.Rows("100"))
tk.MustQuery(`select @@tidb_session_plan_cache_size`).Check(testkit.Rows("100"))

// keep the same value when updating any one of them
tk.MustExec(`set @@tidb_prepared_plan_cache_size = 200`)
tk.MustQuery(`select @@tidb_prepared_plan_cache_size`).Check(testkit.Rows("200"))
tk.MustQuery(`select @@tidb_session_plan_cache_size`).Check(testkit.Rows("200"))
tk.MustExec(`set @@tidb_session_plan_cache_size = 300`)
tk.MustQuery(`select @@tidb_prepared_plan_cache_size`).Check(testkit.Rows("300"))
tk.MustQuery(`select @@tidb_session_plan_cache_size`).Check(testkit.Rows("300"))

tk.MustExec(`set global tidb_prepared_plan_cache_size = 400`)
tk1 := testkit.NewTestKit(t, store)
tk1.MustQuery(`select @@tidb_prepared_plan_cache_size`).Check(testkit.Rows("400"))
tk1.MustQuery(`select @@tidb_session_plan_cache_size`).Check(testkit.Rows("400"))

tk.MustExec(`set global tidb_session_plan_cache_size = 500`)
tk2 := testkit.NewTestKit(t, store)
tk2.MustQuery(`select @@tidb_prepared_plan_cache_size`).Check(testkit.Rows("500"))
tk2.MustQuery(`select @@tidb_session_plan_cache_size`).Check(testkit.Rows("500"))
}

func TestPlanCacheUnsafeRange(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
Expand Down
4 changes: 2 additions & 2 deletions sessionctx/variable/sysvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ var defaultSysVars = []*SysVar{
s.EnablePreparedPlanCache = TiDBOptOn(val)
return nil
}},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBPrepPlanCacheSize, Value: strconv.FormatUint(uint64(DefTiDBPrepPlanCacheSize), 10), Type: TypeUnsigned, MinValue: 1, MaxValue: 100000, SetSession: func(s *SessionVars, val string) error {
{Scope: ScopeGlobal | ScopeSession, Name: TiDBPrepPlanCacheSize, Aliases: []string{TiDBSessionPlanCacheSize}, Value: strconv.FormatUint(uint64(DefTiDBPrepPlanCacheSize), 10), Type: TypeUnsigned, MinValue: 1, MaxValue: 100000, SetSession: func(s *SessionVars, val string) error {
uVal, err := strconv.ParseUint(val, 10, 64)
if err == nil {
s.PreparedPlanCacheSize = uVal
Expand Down Expand Up @@ -1145,7 +1145,7 @@ var defaultSysVars = []*SysVar{
}
return err
}},
{Scope: ScopeGlobal | ScopeSession, Name: TiDBSessionPlanCacheSize, Value: strconv.FormatUint(uint64(DefTiDBSessionPlanCacheSize), 10), Type: TypeUnsigned, MinValue: 1, MaxValue: 100000, SetSession: func(s *SessionVars, val string) error {
{Scope: ScopeGlobal | ScopeSession, Name: TiDBSessionPlanCacheSize, Aliases: []string{TiDBPrepPlanCacheSize}, Value: strconv.FormatUint(uint64(DefTiDBSessionPlanCacheSize), 10), Type: TypeUnsigned, MinValue: 1, MaxValue: 100000, SetSession: func(s *SessionVars, val string) error {
uVal, err := strconv.ParseUint(val, 10, 64)
if err == nil {
s.SessionPlanCacheSize = uVal
Expand Down