[to tikv#67] remove unused code related to restore

Signed-off-by: Jian Zhang <[email protected]>

br/pkg/glue/glue.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/parser/model"
 	pd "github.com/tikv/pd/client"
 )
 
@@ -34,8 +33,6 @@ type Glue interface {
 type Session interface {
 	Execute(ctx context.Context, sql string) error
 	ExecuteInternal(ctx context.Context, sql string, args ...interface{}) error
-	CreateDatabase(ctx context.Context, schema *model.DBInfo) error
-	CreateTable(ctx context.Context, dbName model.CIStr, table *model.TableInfo) error
 	Close()
 }
 

br/pkg/gluetidb/glue.go

@@ -3,32 +3,19 @@
 package gluetidb
 
 import (
-	"bytes"
 	"context"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb/config"
-	"github.com/pingcap/tidb/ddl"
 	"github.com/pingcap/tidb/domain"
-	"github.com/pingcap/tidb/executor"
 	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/meta/autoid"
-	"github.com/pingcap/tidb/parser/model"
-	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/session"
-	"github.com/pingcap/tidb/sessionctx"
 	"github.com/tikv/migration/br/pkg/glue"
 	"github.com/tikv/migration/br/pkg/gluetikv"
 	pd "github.com/tikv/pd/client"
 )
 
-const (
-	defaultCapOfCreateTable    = 512
-	defaultCapOfCreateDatabase = 64
-	brComment                  = `/*from(br)*/`
-)
-
 // New makes a new tidb glue.
 func New() Glue {
 	log.Debug("enabling no register config")
@@ -113,64 +100,7 @@ func (gs *tidbSession) ExecuteInternal(ctx context.Context, sql string, args ...
 	return errors.Trace(err)
 }
 
-// CreateDatabase implements glue.Session.
-func (gs *tidbSession) CreateDatabase(ctx context.Context, schema *model.DBInfo) error {
-	d := domain.GetDomain(gs.se).DDL()
-	query, err := gs.showCreateDatabase(schema)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	gs.se.SetValue(sessionctx.QueryString, query)
-	schema = schema.Clone()
-	if len(schema.Charset) == 0 {
-		schema.Charset = mysql.DefaultCharset
-	}
-	return d.CreateSchemaWithInfo(gs.se, schema, ddl.OnExistIgnore, true)
-}
-
-// CreateTable implements glue.Session.
-func (gs *tidbSession) CreateTable(ctx context.Context, dbName model.CIStr, table *model.TableInfo) error {
-	d := domain.GetDomain(gs.se).DDL()
-	query, err := gs.showCreateTable(table)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	gs.se.SetValue(sessionctx.QueryString, query)
-	// Clone() does not clone partitions yet :(
-	table = table.Clone()
-	if table.Partition != nil {
-		newPartition := *table.Partition
-		newPartition.Definitions = append([]model.PartitionDefinition{}, table.Partition.Definitions...)
-		table.Partition = &newPartition
-	}
-	return d.CreateTableWithInfo(gs.se, dbName, table, ddl.OnExistIgnore, true)
-}
-
 // Close implements glue.Session.
 func (gs *tidbSession) Close() {
 	gs.se.Close()
 }
-
-// showCreateTable shows the result of SHOW CREATE TABLE from a TableInfo.
-func (gs *tidbSession) showCreateTable(tbl *model.TableInfo) (string, error) {
-	table := tbl.Clone()
-	table.AutoIncID = 0
-	result := bytes.NewBuffer(make([]byte, 0, defaultCapOfCreateTable))
-	// this can never fail.
-	_, _ = result.WriteString(brComment)
-	if err := executor.ConstructResultOfShowCreateTable(gs.se, tbl, autoid.Allocators{}, result); err != nil {
-		return "", errors.Trace(err)
-	}
-	return result.String(), nil
-}
-
-// showCreateDatabase shows the result of SHOW CREATE DATABASE from a dbInfo.
-func (gs *tidbSession) showCreateDatabase(db *model.DBInfo) (string, error) {
-	result := bytes.NewBuffer(make([]byte, 0, defaultCapOfCreateDatabase))
-	// this can never fail.
-	_, _ = result.WriteString(brComment)
-	if err := executor.ConstructResultOfShowCreateDatabase(gs.se, db, true, result); err != nil {
-		return "", errors.Trace(err)
-	}
-	return result.String(), nil
-}

br/pkg/restore/client.go

@@ -58,16 +58,7 @@ type Client struct {
 	databases  map[string]*utils.Database
 	ddlJobs    []*model.Job
 	backupMeta *backuppb.BackupMeta
-	// TODO Remove this field or replace it with a []*DB,
-	// since https://github.com/pingcap/br/pull/377 needs more DBs to speed up DDL execution.
-	// And for now, we must inject a pool of DBs to `Client.GoCreateTables`, otherwise there would be a race condition.
-	// This is dirty: why we need DBs from different sources?
-	// By replace it with a []*DB, we can remove the dirty parameter of `Client.GoCreateTable`,
-	// along with them in some private functions.
-	// Before you do it, you can firstly read discussions at
-	// https://github.com/pingcap/br/pull/377#discussion_r446594501,
-	// this probably isn't as easy as it seems like (however, not hard, too :D)
-	db              *DB
+
 	rateLimit       uint64
 	isOnline        bool
 	hasSpeedLimited bool
@@ -95,10 +86,6 @@ func NewRestoreClient(
 	tlsConf *tls.Config,
 	keepaliveConf keepalive.ClientParameters,
 ) (*Client, error) {
-	db, err := NewDB(g, store)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
 	dom, err := g.GetDomain(store)
 	if err != nil {
 		return nil, errors.Trace(err)
@@ -113,7 +100,6 @@ func NewRestoreClient(
 	return &Client{
 		pdClient:      pdClient,
 		toolClient:    NewSplitClient(pdClient, tlsConf),
-		db:            db,
 		tlsConf:       tlsConf,
 		keepaliveConf: keepaliveConf,
 		switchCh:      make(chan struct{}),
@@ -159,10 +145,6 @@ func (rc *Client) SetSwitchModeInterval(interval time.Duration) {
 
 // Close a client.
 func (rc *Client) Close() {
-	// rc.db can be nil in raw kv mode.
-	if rc.db != nil {
-		rc.db.Close()
-	}
 	log.Info("Restore client closed")
 }