executor: avoid displaying progress when to merge global stats (#48601)

hawkingrei · web-flow · commit 6144dddcab7b · 2023-11-15T14:20:16.000Z
close #48602
diff --git a/pkg/executor/infoschema_reader.go b/pkg/executor/infoschema_reader.go
@@ -2051,7 +2051,7 @@ func dataForAnalyzeStatusHelper(ctx context.Context, sctx sessionctx.Context) (r
 		}
 
 		var remainDurationStr, progressDouble, estimatedRowCntStr interface{}
-		if state == statistics.AnalyzeRunning {
+		if state == statistics.AnalyzeRunning && !strings.HasPrefix(jobInfo, "merge global stats") {
 			startTime, ok := startTime.(types.Time)
 			if !ok {
 				return nil, errors.New("invalid start time")

Original file line number	Diff line number	Diff line change
`@@ -2051,7 +2051,7 @@ func dataForAnalyzeStatusHelper(ctx context.Context, sctx sessionctx.Context) (r`
`2051`	`2051`	`}`
`2052`	`2052`
`2053`	`2053`	`var remainDurationStr, progressDouble, estimatedRowCntStr interface{}`
`2054`		`- if state == statistics.AnalyzeRunning {`
	`2054`	`+ if state == statistics.AnalyzeRunning && !strings.HasPrefix(jobInfo, "merge global stats") {`
`2055`	`2055`	`startTime, ok := startTime.(types.Time)`
`2056`	`2056`	`if !ok {`
`2057`	`2057`	`return nil, errors.New("invalid start time")`