br: skip update stats cache for br (#47597)

close #47596
pingcap · Oct 13, 2023 · a9e6e82 · a9e6e82
1 parent f770b7f
commit a9e6e82
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/br/pkg/restore/client.go b/br/pkg/restore/client.go
@@ -131,7 +131,7 @@ type Client struct {
 
 	// statHandler and dom are used for analyze table after restore.
 	// it will backup stats with #dump.DumpStatsToJSON
-	// and restore stats with #dump.LoadStatsFromJSON
+	// and restore stats with #dump.LoadStatsFromJSONNoUpdate
 	statsHandler *handle.Handle
 	dom          *domain.Domain
 
@@ -1757,7 +1757,7 @@ func (rc *Client) execChecksum(
 func (rc *Client) GoUpdateMetaAndLoadStats(ctx context.Context, inCh <-chan *CreatedTable, errCh chan<- error) chan *CreatedTable {
 	log.Info("Start to update meta then load stats")
 	outCh := DefaultOutputTableChan()
-	workers := utils.NewWorkerPool(1, "UpdateStats")
+	workers := utils.NewWorkerPool(16, "UpdateStats")
 	go concurrentHandleTablesCh(ctx, inCh, outCh, errCh, workers, func(c context.Context, tbl *CreatedTable) error {
 		oldTable := tbl.OldTable
 		// Not need to return err when failed because of update analysis-meta
@@ -1780,7 +1780,8 @@ func (rc *Client) GoUpdateMetaAndLoadStats(ctx context.Context, inCh <-chan *Cre
 				zap.Int64("new id", tbl.Table.ID),
 			)
 			start := time.Now()
-			if err := rc.statsHandler.LoadStatsFromJSON(ctx, rc.dom.InfoSchema(), oldTable.Stats, 0); err != nil {
+			// NOTICE: skip updating cache after load stats from json
+			if err := rc.statsHandler.LoadStatsFromJSONNoUpdate(ctx, rc.dom.InfoSchema(), oldTable.Stats, 0); err != nil {
 				log.Error("analyze table failed", zap.Any("table", oldTable.Stats), zap.Error(err))
 			}
 			log.Info("restore stat done",

diff --git a/statistics/handle/dump.go b/statistics/handle/dump.go
@@ -207,7 +207,17 @@ func (h *Handle) tableStatsToJSON(dbName string, tableInfo *model.TableInfo, phy
 }
 
 // LoadStatsFromJSON will load statistic from JSONTable, and save it to the storage.
+// In final, it will also udpate the stats cache.
 func (h *Handle) LoadStatsFromJSON(ctx context.Context, is infoschema.InfoSchema,
+	jsonTbl *storage.JSONTable, concurrencyForPartition uint8) error {
+	if err := h.LoadStatsFromJSONNoUpdate(ctx, is, jsonTbl, concurrencyForPartition); err != nil {
+		return errors.Trace(err)
+	}
+	return errors.Trace(h.Update(is))
+}
+
+// LoadStatsFromJSONNoUpdate will load statistic from JSONTable, and save it to the storage.
+func (h *Handle) LoadStatsFromJSONNoUpdate(ctx context.Context, is infoschema.InfoSchema,
 	jsonTbl *storage.JSONTable, concurrencyForPartition uint8) error {
 	nCPU := uint8(runtime.GOMAXPROCS(0))
 	if concurrencyForPartition == 0 {
@@ -282,7 +292,7 @@ func (h *Handle) LoadStatsFromJSON(ctx context.Context, is infoschema.InfoSchema
 			}
 		}
 	}
-	return errors.Trace(h.Update(is))
+	return nil
 }
 
 func (h *Handle) loadStatsFromJSON(tableInfo *model.TableInfo, physicalID int64, jsonTbl *storage.JSONTable) error {