[to #67] remove unused code related to restore

Signed-off-by: Jian Zhang <zjsariel@gmail.com>

br/cmd/br/debug.go

@@ -376,7 +376,7 @@ func setPDConfigCommand() *cobra.Command {
 				return errors.Trace(err)
 			}
 
-			mgr, err := task.NewMgr(ctx, tidbGlue, cfg.PD, cfg.TLS, task.GetKeepalive(&cfg), cfg.CheckRequirements, false)
+			mgr, err := task.NewMgr(ctx, tidbGlue, cfg.PD, cfg.TLS, task.GetKeepalive(&cfg), cfg.CheckRequirements)
 			if err != nil {
 				return errors.Trace(err)
 			}

br/pkg/conn/conn.go

@@ -16,7 +16,6 @@ import (
 	backuppb "github.com/pingcap/kvproto/pkg/brpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/txnkv/txnlock"
@@ -104,7 +103,6 @@ func NewConnPool(cap int, newConn func(ctx context.Context) (*grpc.ClientConn, e
 type Mgr struct {
 	*pdutil.PdController
 	tlsConf   *tls.Config
-	dom       *domain.Domain
 	storage   kv.Storage   // Used to access SQL related interfaces.
 	tikvStore tikv.Storage // Used to access TiKV specific interfaces.
 	grpcClis  struct {
@@ -222,7 +220,6 @@ func checkStoresAlive(ctx context.Context,
 
 // NewMgr creates a new Mgr.
 //
-// Domain is optional for Backup, set `needDomain` to false to disable
 // initializing Domain.
 func NewMgr(
 	ctx context.Context,
@@ -233,7 +230,6 @@ func NewMgr(
 	keepalive keepalive.ClientParameters,
 	storeBehavior StoreBehavior,
 	checkRequirements bool,
-	needDomain bool,
 ) (*Mgr, error) {
 	if span := opentracing.SpanFromContext(ctx); span != nil && span.Tracer() != nil {
 		span1 := span.Tracer().StartSpan("conn.NewMgr", opentracing.ChildOf(span.Context()))
@@ -272,19 +268,10 @@ func NewMgr(
 		return nil, berrors.ErrKVNotTiKV
 	}
 
-	var dom *domain.Domain
-	if needDomain {
-		dom, err = g.GetDomain(storage)
-		if err != nil {
-			return nil, errors.Trace(err)
-		}
-	}
-
 	mgr := &Mgr{
 		PdController: controller,
 		storage:      storage,
 		tikvStore:    tikvStorage,
-		dom:          dom,
 		tlsConf:      tlsConf,
 		ownsStorage:  g.OwnsStorage(),
 		grpcClis: struct {
@@ -418,11 +405,6 @@ func (mgr *Mgr) GetLockResolver() *txnlock.LockResolver {
 	return mgr.tikvStore.GetLockResolver()
 }
 
-// GetDomain returns a tikv storage.
-func (mgr *Mgr) GetDomain() *domain.Domain {
-	return mgr.dom
-}
-
 // Close closes all client in Mgr.
 func (mgr *Mgr) Close() {
 	mgr.grpcClis.mu.Lock()
@@ -437,9 +419,6 @@ func (mgr *Mgr) Close() {
 	// Gracefully shutdown domain so it does not affect other TiDB DDL.
 	// Must close domain before closing storage, otherwise it gets stuck forever.
 	if mgr.ownsStorage {
-		if mgr.dom != nil {
-			mgr.dom.Close()
-		}
 		tikv.StoreShuttingDown(1)
 		mgr.storage.Close()
 	}

br/pkg/glue/glue.go

@@ -5,16 +5,12 @@ package glue
 import (
 	"context"
 
-	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/parser/model"
 	pd "github.com/tikv/pd/client"
 )
 
 // Glue is an abstraction of TiDB function calls used in BR.
 type Glue interface {
-	GetDomain(store kv.Storage) (*domain.Domain, error)
-	CreateSession(store kv.Storage) (Session, error)
 	Open(path string, option pd.SecurityOption) (kv.Storage, error)
 
 	// OwnsStorage returns whether the storage returned by Open() is owned
@@ -32,10 +28,6 @@ type Glue interface {
 
 // Session is an abstraction of the session.Session 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,16 @@
 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")
@@ -43,40 +27,6 @@ type Glue struct {
 	tikvGlue gluetikv.Glue
 }
 
-type tidbSession struct {
-	se session.Session
-}
-
-// GetDomain implements glue.Glue.
-func (Glue) GetDomain(store kv.Storage) (*domain.Domain, error) {
-	se, err := session.CreateSession(store)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	dom, err := session.GetDomain(store)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	// create stats handler for backup and restore.
-	err = dom.UpdateTableStatsLoop(se)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	return dom, nil
-}
-
-// CreateSession implements glue.Glue.
-func (Glue) CreateSession(store kv.Storage) (glue.Session, error) {
-	se, err := session.CreateSession(store)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	tiSession := &tidbSession{
-		se: se,
-	}
-	return tiSession, nil
-}
-
 // Open implements glue.Glue.
 func (g Glue) Open(path string, option pd.SecurityOption) (kv.Storage, error) {
 	return g.tikvGlue.Open(path, option)
@@ -101,76 +51,3 @@ func (g Glue) Record(name string, value uint64) {
 func (g Glue) GetVersion() string {
 	return g.tikvGlue.GetVersion()
 }
-
-// Execute implements glue.Session.
-func (gs *tidbSession) Execute(ctx context.Context, sql string) error {
-	_, err := gs.se.ExecuteInternal(ctx, sql)
-	return errors.Trace(err)
-}
-
-func (gs *tidbSession) ExecuteInternal(ctx context.Context, sql string, args ...interface{}) error {
-	_, err := gs.se.ExecuteInternal(ctx, sql, 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/gluetikv/glue.go

@@ -6,7 +6,6 @@ import (
 	"context"
 
 	"github.com/pingcap/tidb/config"
-	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/store/driver"
 	"github.com/tikv/migration/br/pkg/glue"
@@ -19,16 +18,6 @@ import (
 // Glue is an implementation of glue.Glue that accesses only TiKV without TiDB.
 type Glue struct{}
 
-// GetDomain implements glue.Glue.
-func (Glue) GetDomain(store kv.Storage) (*domain.Domain, error) {
-	return nil, nil
-}
-
-// CreateSession implements glue.Glue.
-func (Glue) CreateSession(store kv.Storage) (glue.Session, error) {
-	return nil, nil
-}
-
 // Open implements glue.Glue.
 func (Glue) Open(path string, option pd.SecurityOption) (kv.Storage, error) {
 	if option.CAPath != "" {

br/pkg/restore/client.go

@@ -19,10 +19,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/import_sstpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/log"
-	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/parser/model"
-	"github.com/pingcap/tidb/statistics/handle"
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/util/codec"
 	"github.com/tikv/client-go/v2/oracle"
@@ -58,16 +56,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
@@ -79,12 +68,6 @@ type Client struct {
 	backend            *backuppb.StorageBackend
 	switchModeInterval time.Duration
 	switchCh           chan struct{}
-
-	// statHandler and dom are used for analyze table after restore.
-	// it will backup stats with #dump.DumpStatsToJSON
-	// and restore stats with #dump.LoadStatsFromJSON
-	statsHandler *handle.Handle
-	dom          *domain.Domain
 }
 
 // NewRestoreClient returns a new RestoreClient.
@@ -95,30 +78,12 @@ 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)
-	}
-
-	var statsHandle *handle.Handle
-	// tikv.Glue will return nil, tidb.Glue will return available domain
-	if dom != nil {
-		statsHandle = dom.StatsHandle()
-	}
-
 	return &Client{
 		pdClient:      pdClient,
 		toolClient:    NewSplitClient(pdClient, tlsConf),
-		db:            db,
 		tlsConf:       tlsConf,
 		keepaliveConf: keepaliveConf,
 		switchCh:      make(chan struct{}),
-		dom:           dom,
-		statsHandler:  statsHandle,
 	}, nil
 }
 
@@ -159,10 +124,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")
 }