This is an automated cherry-pick of pingcap#55596

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Sep 23, 2024 · f3e360c · f3e360c
1 parent 4b69818
commit f3e360c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/pkg/executor/analyze.go b/pkg/executor/analyze.go
@@ -452,6 +452,7 @@ func (e *AnalyzeExec) handleResultsError(
 	return err
 }
 
+<<<<<<< HEAD
 func (e *AnalyzeExec) handleResultsErrorWithConcurrency(ctx context.Context, statsConcurrency int, needGlobalStats bool,
 	subSctxs []sessionctx.Context,
 	globalStatsMap globalStatsMap, resultsCh <-chan *statistics.AnalyzeResults) error {
@@ -465,6 +466,25 @@ func (e *AnalyzeExec) handleResultsErrorWithConcurrency(ctx context.Context, sta
 		ctx1 := kv.WithInternalSourceType(context.Background(), kv.InternalTxnStats)
 		wg.Run(func() {
 			worker.run(ctx1, e.Ctx().GetSessionVars().EnableAnalyzeSnapshot)
+=======
+func (e *AnalyzeExec) handleResultsErrorWithConcurrency(
+	buildStatsConcurrency int,
+	saveStatsConcurrency int,
+	needGlobalStats bool,
+	globalStatsMap globalStatsMap,
+	resultsCh <-chan *statistics.AnalyzeResults,
+) error {
+	statsHandle := domain.GetDomain(e.Ctx()).StatsHandle()
+	wg := util.NewWaitGroupPool(e.gp)
+	saveResultsCh := make(chan *statistics.AnalyzeResults, saveStatsConcurrency)
+	errCh := make(chan error, saveStatsConcurrency)
+	enableAnalyzeSnapshot := e.Ctx().GetSessionVars().EnableAnalyzeSnapshot
+	for i := 0; i < saveStatsConcurrency; i++ {
+		worker := newAnalyzeSaveStatsWorker(saveResultsCh, errCh, &e.Ctx().GetSessionVars().SQLKiller)
+		ctx1 := kv.WithInternalSourceType(context.Background(), kv.InternalTxnStats)
+		wg.Run(func() {
+			worker.run(ctx1, statsHandle, enableAnalyzeSnapshot)
+>>>>>>> b02581a7a47 (*: fix data race in the EnableAnalyzeSnapshot (#55596))
 		})
 	}
 	tableIDs := map[int64]struct{}{}

diff --git a/pkg/executor/test/analyzetest/BUILD.bazel b/pkg/executor/test/analyzetest/BUILD.bazel
@@ -9,7 +9,12 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+<<<<<<< HEAD
     shard_count = 50,
+=======
+    race = "on",
+    shard_count = 49,
+>>>>>>> b02581a7a47 (*: fix data race in the EnableAnalyzeSnapshot (#55596))
     deps = [
         "//pkg/config",
         "//pkg/domain",

diff --git a/pkg/executor/test/analyzetest/memorycontrol/BUILD.bazel b/pkg/executor/test/analyzetest/memorycontrol/BUILD.bazel
@@ -8,6 +8,7 @@ go_test(
         "memory_control_test.go",
     ],
     flaky = True,
+    race = "on",
     shard_count = 5,
     deps = [
         "//pkg/config",