add skip create sqls

pkg/restore/client.go

@@ -64,6 +64,7 @@ type Client struct {
 	db              *DB
 	rateLimit       uint64
 	isOnline        bool
+	isSkipCreateSQL bool
 	hasSpeedLimited bool
 
 	restoreStores []uint64
@@ -305,6 +306,10 @@ func (rc *Client) GetTableSchema(
 
 // CreateDatabase creates a database.
 func (rc *Client) CreateDatabase(db *model.DBInfo) error {
+	if rc.IsSkipCreateSQL() {
+		log.Info("skip create database", zap.Stringer("database", db.Name))
+		return nil
+	}
 	return rc.db.CreateDatabase(rc.ctx, db)
 }
 
@@ -320,9 +325,13 @@ func (rc *Client) CreateTables(
 	}
 	newTables := make([]*model.TableInfo, 0, len(tables))
 	for _, table := range tables {
-		err := rc.db.CreateTable(rc.ctx, table)
-		if err != nil {
-			return nil, nil, err
+		if rc.IsSkipCreateSQL() {
+			log.Info("skip create table and alter autoIncID", zap.Stringer("table", table.Info.Name))
+		} else {
+			err := rc.db.CreateTable(rc.ctx, table)
+			if err != nil {
+				return nil, nil, err
+			}
 		}
 		newTableInfo, err := rc.GetTableSchema(dom, table.Db.Name, table.Info.Name)
 		if err != nil {
@@ -847,3 +856,13 @@ func (rc *Client) IsIncremental() bool {
 	return !(rc.backupMeta.StartVersion == rc.backupMeta.EndVersion ||
 		rc.backupMeta.StartVersion == 0)
 }
+
+// EnableSkipCreateSQL sets switch of skip create schema and tables
+func (rc *Client) EnableSkipCreateSQL() {
+	rc.isSkipCreateSQL = true
+}
+
+// IsSkipCreateSQL returns whether we need skip create schema and tables in restore
+func (rc *Client) IsSkipCreateSQL() bool {
+	return rc.isSkipCreateSQL
+}

pkg/task/restore.go

@@ -23,7 +23,8 @@ import (
 )
 
 const (
-	flagOnline = "online"
+	flagOnline        = "online"
+	flagSkipCreateSQL = "skip-create-sql"
 )
 
 var schedulers = map[string]struct{}{
@@ -45,13 +46,18 @@ const (
 type RestoreConfig struct {
 	Config
 
-	Online bool `json:"online" toml:"online"`
+	Online        bool `json:"online" toml:"online"`
+	SkipCreateSQL bool `json:"skip-create-sql" toml:"skip-create-sql"`
 }
 
 // DefineRestoreFlags defines common flags for the restore command.
 func DefineRestoreFlags(flags *pflag.FlagSet) {
 	// TODO remove experimental tag if it's stable
-	flags.Bool("online", false, "(experimental) Whether online when restore")
+	flags.Bool(flagOnline, false, "(experimental) Whether online when restore")
+	flags.Bool(flagSkipCreateSQL, false, "Only allow when restore cluster has already use br create all schema and tables before")
+
+	// Do not expose this flag
+	flags.MarkHidden(flagSkipCreateSQL)
 }
 
 // ParseFromFlags parses the restore-related flags from the flag set.
@@ -61,6 +67,10 @@ func (cfg *RestoreConfig) ParseFromFlags(flags *pflag.FlagSet) error {
 	if err != nil {
 		return errors.Trace(err)
 	}
+	cfg.SkipCreateSQL, err = flags.GetBool(flagSkipCreateSQL)
+	if err != nil {
+		return errors.Trace(err)
+	}
 	err = cfg.Config.ParseFromFlags(flags)
 	if err != nil {
 		return errors.Trace(err)
@@ -101,6 +111,9 @@ func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConf
 	if cfg.Online {
 		client.EnableOnline()
 	}
+	if cfg.SkipCreateSQL {
+		client.EnableSkipCreateSQL()
+	}
 	err = client.LoadRestoreStores(ctx)
 	if err != nil {
 		return err