From a2933883f06cebdf19c8bb521bd312cb976000c3 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Tue, 26 Jul 2022 20:32:06 +0800 Subject: [PATCH] remove useless code --- br/pkg/backup/client.go | 1 - br/pkg/backup/client_test.go | 3 - br/pkg/gluetidb/glue.go | 125 ----------------------------- br/pkg/restore/db_test.go | 6 +- br/tests/br_incremental_ddl/run.sh | 3 +- 5 files changed, 3 insertions(+), 135 deletions(-) diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go index 62f40edcd3426..abe4ce47df0b7 100644 --- a/br/pkg/backup/client.go +++ b/br/pkg/backup/client.go @@ -23,7 +23,6 @@ import ( "github.com/pingcap/log" "github.com/pingcap/tidb/br/pkg/conn" berrors "github.com/pingcap/tidb/br/pkg/errors" - "github.com/pingcap/tidb/br/pkg/glue" "github.com/pingcap/tidb/br/pkg/logutil" "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/tidb/br/pkg/redact" diff --git a/br/pkg/backup/client_test.go b/br/pkg/backup/client_test.go index cf79e016a4493..fd7b034925e5b 100644 --- a/br/pkg/backup/client_test.go +++ b/br/pkg/backup/client_test.go @@ -15,7 +15,6 @@ import ( "github.com/pingcap/kvproto/pkg/errorpb" "github.com/pingcap/tidb/br/pkg/backup" "github.com/pingcap/tidb/br/pkg/conn" - "github.com/pingcap/tidb/br/pkg/gluetidb" "github.com/pingcap/tidb/br/pkg/metautil" "github.com/pingcap/tidb/br/pkg/mock" "github.com/pingcap/tidb/br/pkg/pdutil" @@ -39,7 +38,6 @@ type testBackup struct { cancel context.CancelFunc mockPDClient pd.Client - mockGlue *gluetidb.MockGlue backupClient *backup.Client cluster *mock.Cluster @@ -50,7 +48,6 @@ func createBackupSuite(t *testing.T) (s *testBackup, clean func()) { tikvClient, _, pdClient, err := testutils.NewMockTiKV("", nil) require.NoError(t, err) s = new(testBackup) - s.mockGlue = &gluetidb.MockGlue{} s.mockPDClient = pdClient s.ctx, s.cancel = context.WithCancel(context.Background()) mockMgr := &conn.Mgr{PdController: &pdutil.PdController{}} diff --git a/br/pkg/gluetidb/glue.go b/br/pkg/gluetidb/glue.go index fabc4a1965bdd..05709049b360a 100644 --- a/br/pkg/gluetidb/glue.go +++ b/br/pkg/gluetidb/glue.go @@ -298,128 +298,3 @@ func (gs *tidbSession) showCreateDatabase(db *model.DBInfo) (string, error) { func (gs *tidbSession) showCreatePlacementPolicy(policy *model.PolicyInfo) string { return executor.ConstructResultOfShowCreatePlacementPolicy(policy) } - -// mockSession is used for test. -type mockSession struct { - se session.Session -} - -// GetSessionCtx implements glue.Glue -func (s *mockSession) GetSessionCtx() sessionctx.Context { - return s.se -} - -// Execute implements glue.Session. -func (s *mockSession) Execute(ctx context.Context, sql string) error { - return s.ExecuteInternal(ctx, sql) -} - -func (s *mockSession) ExecuteInternal(ctx context.Context, sql string, args ...interface{}) error { - ctx = kv.WithInternalSourceType(ctx, kv.InternalTxnBR) - rs, err := s.se.ExecuteInternal(ctx, sql, args...) - if err != nil { - return err - } - // Some of SQLs (like ADMIN RECOVER INDEX) may lazily take effect - // when we polling the result set. - // At least call `next` once for triggering theirs side effect. - // (Maybe we'd better drain all returned rows?) - if rs != nil { - //nolint: errcheck - defer rs.Close() - c := rs.NewChunk(nil) - if err := rs.Next(ctx, c); err != nil { - return nil - } - } - return nil -} - -// CreateDatabase implements glue.Session. -func (s *mockSession) CreateDatabase(ctx context.Context, schema *model.DBInfo) error { - log.Fatal("unimplemented CreateDatabase for mock session") - return nil - -} - -// CreatePlacementPolicy implements glue.Session. -func (s *mockSession) CreatePlacementPolicy(ctx context.Context, policy *model.PolicyInfo) error { - log.Fatal("unimplemented CreateDatabase for mock session") - return nil -} - -// CreateTables implements glue.BatchCreateTableSession. -func (s *mockSession) CreateTables(ctx context.Context, tables map[string][]*model.TableInfo) error { - log.Fatal("unimplemented CreateDatabase for mock session") - return nil -} - -// CreateTable implements glue.Session. -func (s *mockSession) CreateTable(ctx context.Context, dbName model.CIStr, table *model.TableInfo) error { - log.Fatal("unimplemented CreateDatabase for mock session") - return nil -} - -// Close implements glue.Session. -func (s *mockSession) Close() { - s.se.Close() -} - -// GetGlobalVariables implements glue.Session. -func (s *mockSession) GetGlobalVariable(name string) (string, error) { - return "true", nil -} - -// MockGlue only used for test -type MockGlue struct { - se session.Session -} - -func (m *MockGlue) SetSession(se session.Session) { - m.se = se -} - -// GetDomain implements glue.Glue. -func (*MockGlue) GetDomain(store kv.Storage) (*domain.Domain, error) { - return nil, nil -} - -// CreateSession implements glue.Glue. -func (m *MockGlue) CreateSession(store kv.Storage) (glue.Session, error) { - glueSession := &mockSession{ - se: m.se, - } - return glueSession, nil -} - -// Open implements glue.Glue. -func (*MockGlue) Open(path string, option pd.SecurityOption) (kv.Storage, error) { - return nil, nil -} - -// OwnsStorage implements glue.Glue. -func (*MockGlue) OwnsStorage() bool { - return true -} - -// StartProgress implements glue.Glue. -func (*MockGlue) StartProgress(ctx context.Context, cmdName string, total int64, redirectLog bool) glue.Progress { - return nil -} - -// Record implements glue.Glue. -func (*MockGlue) Record(name string, value uint64) { -} - -// GetVersion implements glue.Glue. -func (*MockGlue) GetVersion() string { - return "mock glue" -} - -// UseOneShotSession implements glue.Glue. -func (m *MockGlue) UseOneShotSession(store kv.Storage, closeDomain bool, fn func(glue.Session) error) error { - glueSession := &mockSession{ - se: m.se, - } - return fn(glueSession) -} diff --git a/br/pkg/restore/db_test.go b/br/pkg/restore/db_test.go index a5ac826b7ba28..7c84d53536819 100644 --- a/br/pkg/restore/db_test.go +++ b/br/pkg/restore/db_test.go @@ -29,15 +29,13 @@ import ( ) type testRestoreSchemaSuite struct { - mock *mock.Cluster - mockGlue *gluetidb.MockGlue - storage storage.ExternalStorage + mock *mock.Cluster + storage storage.ExternalStorage } func createRestoreSchemaSuite(t *testing.T) (s *testRestoreSchemaSuite, clean func()) { var err error s = new(testRestoreSchemaSuite) - s.mockGlue = &gluetidb.MockGlue{} s.mock, err = mock.NewCluster() require.NoError(t, err) base := t.TempDir() diff --git a/br/tests/br_incremental_ddl/run.sh b/br/tests/br_incremental_ddl/run.sh index df5a478f6733e..8ea1041b09aea 100755 --- a/br/tests/br_incremental_ddl/run.sh +++ b/br/tests/br_incremental_ddl/run.sh @@ -76,10 +76,9 @@ run_br --pd $PD_ADDR backup db -s "local://$TEST_DIR/$DB/inc" --db $DB --lastbac # so we can check the log count of `one shot domain closed` to be 2. # we will call UseOneShotSession twice # 1. to get the value global variable. -# 2. to get all ddl jobs with session. one_shot_session_count=$(cat $LOG | grep "one shot session closed" | wc -l | xargs) one_shot_domain_count=$(cat $LOG | grep "one shot domain closed" | wc -l | xargs) -if [ "${one_shot_session_count}" -ne "2" ] || [ "$one_shot_domain_count" -ne "2" ];then +if [ "${one_shot_session_count}" -ne "1" ] || [ "$one_shot_domain_count" -ne "1" ];then echo "TEST: [$TEST_NAME] fail on one shot session check during inc backup, $one_shot_session_count, $one_shot_domain_count" exit 1 fi