br: cherry pick to hot fix release 8.5 20250114 v8.5.0 second batch | tidb-test=release-8.5.1

br/cmd/br/debug.go

@@ -92,33 +92,35 @@ func newCheckSumCommand() *cobra.Command {
 					var calCRC64 uint64
 					var totalKVs uint64
 					var totalBytes uint64
-					for _, file := range tbl.Files {
-						calCRC64 ^= file.Crc64Xor
-						totalKVs += file.GetTotalKvs()
-						totalBytes += file.GetTotalBytes()
-						log.Info("file info", zap.Stringer("table", tbl.Info.Name),
-							zap.String("file", file.GetName()),
-							zap.Uint64("crc64xor", file.GetCrc64Xor()),
-							zap.Uint64("totalKvs", file.GetTotalKvs()),
-							zap.Uint64("totalBytes", file.GetTotalBytes()),
-							zap.Uint64("startVersion", file.GetStartVersion()),
-							zap.Uint64("endVersion", file.GetEndVersion()),
-							logutil.Key("startKey", file.GetStartKey()),
-							logutil.Key("endKey", file.GetEndKey()),
-						)
-
-						var data []byte
-						data, err = s.ReadFile(ctx, file.Name)
-						if err != nil {
-							return errors.Trace(err)
-						}
-						s := sha256.Sum256(data)
-						if !bytes.Equal(s[:], file.Sha256) {
-							return errors.Annotatef(berrors.ErrBackupChecksumMismatch, `
+					for _, files := range tbl.FilesOfPhysicals {
+						for _, file := range files {
+							calCRC64 ^= file.Crc64Xor
+							totalKVs += file.GetTotalKvs()
+							totalBytes += file.GetTotalBytes()
+							log.Info("file info", zap.Stringer("table", tbl.Info.Name),
+								zap.String("file", file.GetName()),
+								zap.Uint64("crc64xor", file.GetCrc64Xor()),
+								zap.Uint64("totalKvs", file.GetTotalKvs()),
+								zap.Uint64("totalBytes", file.GetTotalBytes()),
+								zap.Uint64("startVersion", file.GetStartVersion()),
+								zap.Uint64("endVersion", file.GetEndVersion()),
+								logutil.Key("startKey", file.GetStartKey()),
+								logutil.Key("endKey", file.GetEndKey()),
+							)
+
+							var data []byte
+							data, err = s.ReadFile(ctx, file.Name)
+							if err != nil {
+								return errors.Trace(err)
+							}
+							s := sha256.Sum256(data)
+							if !bytes.Equal(s[:], file.Sha256) {
+								return errors.Annotatef(berrors.ErrBackupChecksumMismatch, `
 backup data checksum failed: %s may be changed
 calculated sha256 is %s,
 origin sha256 is %s`,
-								file.Name, hex.EncodeToString(s[:]), hex.EncodeToString(file.Sha256))
+									file.Name, hex.EncodeToString(s[:]), hex.EncodeToString(file.Sha256))
+							}
 						}
 					}
 					if tbl.Info == nil {
@@ -184,16 +186,20 @@ func newBackupMetaValidateCommand() *cobra.Command {
 			tables := make([]*metautil.Table, 0)
 			for _, db := range dbs {
 				for _, table := range db.Tables {
-					files = append(files, table.Files...)
+					for _, fs := range table.FilesOfPhysicals {
+						files = append(files, fs...)
+					}
 				}
 				tables = append(tables, db.Tables...)
 			}
 			// Check if the ranges of files overlapped
 			rangeTree := rtree.NewRangeTree()
 			for _, file := range files {
 				if out := rangeTree.InsertRange(rtree.Range{
-					StartKey: file.GetStartKey(),
-					EndKey:   file.GetEndKey(),
+					KeyRange: rtree.KeyRange{
+						StartKey: file.GetStartKey(),
+						EndKey:   file.GetEndKey(),
+					},
 				}); out != nil {
 					log.Error(
 						"file ranges overlapped",

br/pkg/backup/BUILD.bazel

@@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "backup",
     srcs = [
-        "check.go",
         "client.go",
         "metrics.go",
         "schema.go",
@@ -33,6 +32,7 @@ go_library(
         "//pkg/meta/model",
         "//pkg/statistics/handle",
         "//pkg/statistics/handle/util",
+        "//pkg/tablecodec",
         "//pkg/util",
         "//pkg/util/table-filter",
         "@com_github_google_btree//:btree",