*: avoid using Tables field of model.DBInfo, use API instead

br/pkg/metautil/load_test.go

@@ -55,9 +55,9 @@ func TestLoadBackupMeta(t *testing.T) {
 	mockDB := model.DBInfo{
 		ID:   1,
 		Name: dbName,
-		Tables: []*model.TableInfo{
-			mockTbl,
-		},
+	}
+	mockDB.Deprecated.Tables = []*model.TableInfo{
+		mockTbl,
 	}
 	dbBytes, err := json.Marshal(mockDB)
 	require.NoError(t, err)
@@ -140,9 +140,9 @@ func TestLoadBackupMetaPartionTable(t *testing.T) {
 	mockDB := model.DBInfo{
 		ID:   1,
 		Name: dbName,
-		Tables: []*model.TableInfo{
-			mockTbl,
-		},
+	}
+	mockDB.Deprecated.Tables = []*model.TableInfo{
+		mockTbl,
 	}
 	dbBytes, err := json.Marshal(mockDB)
 	require.NoError(t, err)
@@ -249,9 +249,9 @@ func buildBenchmarkBackupmeta(b *testing.B, dbName string, tableCount, fileCount
 		mockDB := model.DBInfo{
 			ID:   1,
 			Name: model.NewCIStr(dbName),
-			Tables: []*model.TableInfo{
-				mockTbl,
-			},
+		}
+		mockDB.Deprecated.Tables = []*model.TableInfo{
+			mockTbl,
 		}
 		dbBytes, err := json.Marshal(mockDB)
 		require.NoError(b, err)

br/pkg/restore/ingestrec/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/br/pkg/restore/ingestrec",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/infoschema/context",
         "//pkg/parser/model",
         "//pkg/types",
         "@com_github_pingcap_errors//:errors",
@@ -20,6 +21,7 @@ go_test(
     shard_count = 3,
     deps = [
         ":ingestrec",
+        "//pkg/infoschema/context",
         "//pkg/parser/model",
         "@com_github_pingcap_errors//:errors",
         "@com_github_stretchr_testify//require",

br/pkg/restore/ingestrec/ingest_recorder.go

@@ -15,10 +15,12 @@
 package ingestrec
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	"github.com/pingcap/errors"
+	infoschema "github.com/pingcap/tidb/pkg/infoschema/context"
 	"github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/types"
 )
@@ -136,9 +138,10 @@ func (i *IngestRecorder) RewriteTableID(rewriteFunc func(tableID int64) (int64,
 }
 
 // UpdateIndexInfo uses the newest schemas to update the ingest index's information
-func (i *IngestRecorder) UpdateIndexInfo(dbInfos []*model.DBInfo) {
-	for _, dbInfo := range dbInfos {
-		for _, tblInfo := range dbInfo.Tables {
+func (i *IngestRecorder) UpdateIndexInfo(is infoschema.SchemaAndTable) {
+	for _, dbInfo := range is.AllSchemas() {
+		tblInfos, _ := is.SchemaTableInfos(context.Background(), dbInfo.Name)
+		for _, tblInfo := range tblInfos {
 			tableindexes, tblexists := i.items[tblInfo.ID]
 			if !tblexists {
 				continue