refractor default config

pingcap · Dec 9, 2019 · 0a164dd · 0a164dd
1 parent 3fc7df2
commit 0a164dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tidb-server/main.go b/tidb-server/main.go
@@ -55,7 +55,6 @@ import (
 	"github.com/pingcap/tidb/util/memory"
 	"github.com/pingcap/tidb/util/printer"
 	"github.com/pingcap/tidb/util/signal"
-	"github.com/pingcap/tidb/util/stmtsummary"
 	"github.com/pingcap/tidb/util/storeutil"
 	"github.com/pingcap/tidb/util/sys/linux"
 	"github.com/pingcap/tidb/util/systimemon"
@@ -544,11 +543,6 @@ func setGlobalVars() {
 	privileges.SkipWithGrant = cfg.Security.SkipGrantTable
 	kv.TxnTotalSizeLimit = cfg.Performance.TxnTotalSizeLimit
 
-	// This configurations can be overwritten by global variables, so it's equivalent to setting in global scope.
-	stmtsummary.StmtSummaryByDigestMap.SetEnabled(variable.BoolToIntStr(cfg.StmtSummary.Enable), false)
-	stmtsummary.StmtSummaryByDigestMap.SetRefreshInterval(strconv.Itoa(cfg.StmtSummary.RefreshInterval), false)
-	stmtsummary.StmtSummaryByDigestMap.SetHistorySize(strconv.Itoa(cfg.StmtSummary.HistorySize), false)
-
 	priority := mysql.Str2Priority(cfg.Performance.ForcePriority)
 	variable.ForcePriority = int32(priority)
 	variable.SysVars[variable.TiDBForcePriority].Value = mysql.Priority2Str[priority]

diff --git a/util/stmtsummary/statement_summary.go b/util/stmtsummary/statement_summary.go
@@ -199,6 +199,13 @@ func newStmtSummaryByDigestMap() *stmtSummaryByDigestMap {
 	ssMap := &stmtSummaryByDigestMap{
 		summaryMap: kvcache.NewSimpleLRUCache(maxStmtCount, 0, 0),
 	}
+	// Initialize these configurations by values in the config file.
+	// They may be overwritten by system variables later.
+	if config.GetGlobalConfig().StmtSummary.Enable {
+		ssMap.sysVars.globalEnabled = "1"
+	}
+	ssMap.sysVars.refreshInterval = int64(config.GetGlobalConfig().StmtSummary.RefreshInterval)
+	ssMap.sysVars.historySize = int32(config.GetGlobalConfig().StmtSummary.HistorySize)
 	return ssMap
 }