*: support pyroscope

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
pingcap · Mar 27, 2024 · 00099f1 · 00099f1
1 parent 4c89996
commit 00099f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -750,8 +750,8 @@ type Performance struct {
 	// of init stats the optimizer may make bad decisions due to pseudo stats.
 	ForceInitStats bool `toml:"force-init-stats" json:"force-init-stats"`
 
-	// ConcurrencyInitStats indicates whether to use concurrency to init stats.
-	ConcurrencyInitStats bool `toml:"concurrency-init-stats" json:"concurrency-init-stats"`
+	// ConcurrentlyInitStats indicates whether to use concurrency to init stats.
+	ConcurrentlyInitStats bool `toml:"concurrently-init-stats" json:"concurrently-init-stats"`
 }
 
 // PlanCache is the PlanCache section of the config.
@@ -1019,7 +1019,7 @@ var defaultConf = Config{
 		EnableLoadFMSketch:                false,
 		LiteInitStats:                     true,
 		ForceInitStats:                    true,
-		ConcurrencyInitStats:              true,
+		ConcurrentlyInitStats:             true,
 	},
 	ProxyProtocol: ProxyProtocol{
 		Networks:      "",

diff --git a/pkg/statistics/handle/bootstrap.go b/pkg/statistics/handle/bootstrap.go
@@ -78,7 +78,7 @@ func (h *Handle) initStatsMeta(is infoschema.InfoSchema) (statstypes.StatsCache,
 	if err != nil {
 		return nil, err
 	}
-	if config.GetGlobalConfig().Performance.ConcurrencyInitStats {
+	if config.GetGlobalConfig().Performance.ConcurrentlyInitStats {
 		ls := initstats.NewWorker(rc.Next, h.initStatsMeta4Chunk)
 		ls.LoadStats(is, tables, rc)
 		ls.Wait()
@@ -242,7 +242,7 @@ func (h *Handle) initStatsHistogramsLite(is infoschema.InfoSchema, cache statsty
 		return errors.Trace(err)
 	}
 	defer terror.Call(rc.Close)
-	if config.GetGlobalConfig().Performance.ConcurrencyInitStats {
+	if config.GetGlobalConfig().Performance.ConcurrentlyInitStats {
 		ls := initstats.NewWorker(rc.Next, h.initStatsHistograms4ChunkLite)
 		ls.LoadStats(is, cache, rc)
 		ls.Wait()
@@ -271,7 +271,7 @@ func (h *Handle) initStatsHistograms(is infoschema.InfoSchema, cache statstypes.
 		return errors.Trace(err)
 	}
 	defer terror.Call(rc.Close)
-	if config.GetGlobalConfig().Performance.ConcurrencyInitStats {
+	if config.GetGlobalConfig().Performance.ConcurrentlyInitStats {
 		ls := initstats.NewWorker(rc.Next, h.initStatsHistograms4Chunk)
 		ls.LoadStats(is, cache, rc)
 		ls.Wait()
@@ -326,7 +326,7 @@ func (h *Handle) initStatsTopN(cache statstypes.StatsCache) error {
 		return errors.Trace(err)
 	}
 	defer terror.Call(rc.Close)
-	if config.GetGlobalConfig().Performance.ConcurrencyInitStats {
+	if config.GetGlobalConfig().Performance.ConcurrentlyInitStats {
 		ls := initstats.NewWorker(rc.Next, func(_ infoschema.InfoSchema, cache statstypes.StatsCache, iter *chunk.Iterator4Chunk) {
 			h.initStatsTopN4Chunk(cache, iter)
 		})
@@ -458,7 +458,7 @@ func (h *Handle) initStatsBuckets(cache statstypes.StatsCache) error {
 		return errors.Trace(err)
 	}
 	defer terror.Call(rc.Close)
-	if config.GetGlobalConfig().Performance.ConcurrencyInitStats {
+	if config.GetGlobalConfig().Performance.ConcurrentlyInitStats {
 		ls := initstats.NewWorker(rc.Next, func(_ infoschema.InfoSchema, cache statstypes.StatsCache, iter *chunk.Iterator4Chunk) {
 			h.initStatsBuckets4Chunk(cache, iter)
 		})

diff --git a/pkg/statistics/handle/handletest/statstest/stats_test.go b/pkg/statistics/handle/handletest/statstest/stats_test.go
@@ -190,7 +190,7 @@ func TestInitStatsMemTraceWithLite(t *testing.T) {
 	restore := config.RestoreFunc()
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
-		conf.Performance.ConcurrencyInitStats = false
+		conf.Performance.ConcurrentlyInitStats = false
 	})
 	testInitStatsMemTraceFunc(t, true)
 }
@@ -199,7 +199,7 @@ func TestInitStatsMemTraceWithoutLite(t *testing.T) {
 	restore := config.RestoreFunc()
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
-		conf.Performance.ConcurrencyInitStats = false
+		conf.Performance.ConcurrentlyInitStats = false
 	})
 	testInitStatsMemTraceFunc(t, false)
 }
@@ -208,7 +208,7 @@ func TestInitStatsMemTraceWithConcurrrencyLite(t *testing.T) {
 	restore := config.RestoreFunc()
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
-		conf.Performance.ConcurrencyInitStats = true
+		conf.Performance.ConcurrentlyInitStats = true
 	})
 	testInitStatsMemTraceFunc(t, true)
 }
@@ -217,7 +217,7 @@ func TestInitStatsMemTraceWithoutConcurrrencyLite(t *testing.T) {
 	restore := config.RestoreFunc()
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
-		conf.Performance.ConcurrencyInitStats = true
+		conf.Performance.ConcurrentlyInitStats = true
 	})
 	testInitStatsMemTraceFunc(t, false)
 }
@@ -315,7 +315,7 @@ func TestInitStatsVer2(t *testing.T) {
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
 		config.GetGlobalConfig().Performance.LiteInitStats = false
-		config.GetGlobalConfig().Performance.ConcurrencyInitStats = false
+		config.GetGlobalConfig().Performance.ConcurrentlyInitStats = false
 	})
 	initStatsVer2(t)
 }
@@ -325,7 +325,7 @@ func TestInitStatsVer2Concurrency(t *testing.T) {
 	defer restore()
 	config.UpdateGlobal(func(conf *config.Config) {
 		config.GetGlobalConfig().Performance.LiteInitStats = false
-		config.GetGlobalConfig().Performance.ConcurrencyInitStats = true
+		config.GetGlobalConfig().Performance.ConcurrentlyInitStats = true
 	})
 	initStatsVer2(t)
 }