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

tidb-server: set TiDBMemQuotaQuery to the value in configuration file #7729

Merged
merged 3 commits into from
Sep 17, 2018
Merged

tidb-server: set TiDBMemQuotaQuery to the value in configuration file #7729

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca4e4f8
tidb-server: set TiDBMemQuotaQuery to the value in configuration file
XuHuaiyu Sep 17, 2018
3ea54c6
Merge branch 'master' into memquota
zz-jason Sep 17, 2018
b158630
Merge branch 'master' into memquota
coocood Sep 17, 2018
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
6 changes: 3 additions & 3 deletions tidb-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ func setGlobalVars() {
plan.AllowCartesianProduct = cfg.Performance.CrossJoin
privileges.SkipWithGrant = cfg.Security.SkipGrantTable

variable.SysVars[variable.TIDBMemQuotaQuery].Value = strconv.FormatInt(cfg.MemQuotaQuery, 10)
variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)
Copy link
Member

Choose a reason for hiding this comment

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

Why move this ahead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just because that they are both set a value to variable.Sysvar.


plan.SetPreparedPlanCache(cfg.PreparedPlanCache.Enabled)
if plan.PreparedPlanCacheEnabled() {
plan.PreparedPlanCacheCapacity = cfg.PreparedPlanCache.Capacity
Expand All @@ -399,9 +402,6 @@ func setGlobalVars() {
tikv.GrpcKeepAliveTime = time.Duration(cfg.TiKVClient.GrpcKeepAliveTime) * time.Second
tikv.GrpcKeepAliveTimeout = time.Duration(cfg.TiKVClient.GrpcKeepAliveTimeout) * time.Second

// set lower_case_table_names
variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames)

tikv.CommitMaxBackoff = int(parseDuration(cfg.TiKVClient.CommitTimeout).Seconds() * 1000)
}

Expand Down