This is an automated cherry-pick of pingcap#63420

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: Leavrth

br/pkg/metautil/metafile.go

@@ -146,6 +146,7 @@ func walkLeafMetaFile(
 
 // Table wraps the schema and files of a table.
 type Table struct {
+<<<<<<< HEAD
 	DB              *model.DBInfo
 	Info            *model.TableInfo
 	Crc64Xor        uint64
@@ -154,6 +155,18 @@ type Table struct {
 	Files           []*backuppb.File
 	TiFlashReplicas int
 	Stats           *util.JSONTable
+=======
+	DB               *model.DBInfo
+	Info             *model.TableInfo
+	Crc64Xor         uint64
+	TotalKvs         uint64
+	TotalBytes       uint64
+	Files            []*backuppb.File
+	TotalKvsMap      map[int64]uint64
+	TiFlashReplicas  int
+	Stats            *util.JSONTable
+	StatsFileIndexes []*backuppb.StatsFileIndex
+>>>>>>> e589efdb9a8 (br: fix stats meta count is zero if no checksum 8.5 (#63420))
 }
 
 // MetaReader wraps a reader to read both old and new version of backupmeta.
@@ -241,6 +254,14 @@ func (stats ChecksumStats) ChecksumExists() bool {
 	return true
 }
 
+func CalculateTotalKvsOnFiles(files []*backuppb.File) uint64 {
+	totalKvs := uint64(0)
+	for _, file := range files {
+		totalKvs += file.TotalKvs
+	}
+	return totalKvs
+}
+
 // CalculateChecksumStatsOnFiles returns the ChecksumStats for the given files
 func CalculateChecksumStatsOnFiles(files []*backuppb.File) ChecksumStats {
 	var stats ChecksumStats
@@ -382,13 +403,19 @@ func (reader *MetaReader) ReadSchemasFiles(ctx context.Context, output chan<- *T
 			}
 			if tableInfo != nil {
 				if fileMap != nil {
+<<<<<<< HEAD
 					if files, ok := fileMap[tableInfo.ID]; ok {
+=======
+					if files, ok := fileMap[table.Info.ID]; ok {
+						table.TotalKvsMap[table.Info.ID] = CalculateTotalKvsOnFiles(files)
+>>>>>>> e589efdb9a8 (br: fix stats meta count is zero if no checksum 8.5 (#63420))
 						table.Files = append(table.Files, files...)
 					}
 					if tableInfo.Partition != nil {
 						// Partition table can have many table IDs (partition IDs).
 						for _, p := range tableInfo.Partition.Definitions {
 							if files, ok := fileMap[p.ID]; ok {
+								table.TotalKvsMap[p.ID] = CalculateTotalKvsOnFiles(files)
 								table.Files = append(table.Files, files...)
 							}
 						}
@@ -414,6 +441,47 @@ func (reader *MetaReader) ReadSchemasFiles(ctx context.Context, output chan<- *T
 	}
 }
 
+<<<<<<< HEAD
+=======
+func parseSchemaFile(s *backuppb.Schema) (*Table, error) {
+	dbInfo := &model.DBInfo{}
+	if err := json.Unmarshal(s.Db, dbInfo); err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	var tableInfo *model.TableInfo
+	if s.Table != nil {
+		tableInfo = &model.TableInfo{}
+		if err := json.Unmarshal(s.Table, tableInfo); err != nil {
+			return nil, errors.Trace(err)
+		}
+	}
+	var stats *util.JSONTable
+	if s.Stats != nil {
+		stats = &util.JSONTable{}
+		if err := json.Unmarshal(s.Stats, stats); err != nil {
+			return nil, errors.Trace(err)
+		}
+	}
+	var statsFileIndexes []*backuppb.StatsFileIndex
+	if len(s.StatsIndex) > 0 {
+		statsFileIndexes = s.StatsIndex
+	}
+
+	return &Table{
+		DB:               dbInfo,
+		Info:             tableInfo,
+		Crc64Xor:         s.Crc64Xor,
+		TotalKvs:         s.TotalKvs,
+		TotalBytes:       s.TotalBytes,
+		TotalKvsMap:      make(map[int64]uint64),
+		TiFlashReplicas:  int(s.TiflashReplicas),
+		Stats:            stats,
+		StatsFileIndexes: statsFileIndexes,
+	}, nil
+}
+
+>>>>>>> e589efdb9a8 (br: fix stats meta count is zero if no checksum 8.5 (#63420))
 func receiveBatch(
 	ctx context.Context, errCh chan error, ch <-chan interface{}, maxBatchSize int,
 	collectItem func(interface{}) error,