dtmsvr use config db

conf.sample.yml

@@ -11,6 +11,7 @@
 #   User: 'root'
 #   Password: ''
 #   Port: 3306
+#   Db: 'dtm'
 
 #   Driver: 'boltdb' # default store engine
 
@@ -30,8 +31,6 @@
 #   MaxOpenConns: 500
 #   MaxIdleConns: 500
 #   ConnMaxLifeTime: 5 # default value is 5 (minutes)
-#   TransGlobalTable: 'dtm.trans_global'
-#   TransBranchOpTable: 'dtm.trans_branch_op'
 
 ### flollowing config is only for some Driver
 #   DataExpire: 604800 # Trans data will expire in 7 days. only for redis/boltdb.

dtmsvr/config/config.go

@@ -53,14 +53,13 @@ type Store struct {
 	Port               int64  `yaml:"Port"`
 	User               string `yaml:"User"`
 	Password           string `yaml:"Password"`
+	Db                 string `yaml:"Db" default:"dtm"`
 	MaxOpenConns       int64  `yaml:"MaxOpenConns" default:"500"`
 	MaxIdleConns       int64  `yaml:"MaxIdleConns" default:"500"`
 	ConnMaxLifeTime    int64  `yaml:"ConnMaxLifeTime" default:"5"`
 	DataExpire         int64  `yaml:"DataExpire" default:"604800"`        // Trans data will expire in 7 days. only for redis/boltdb.
 	FinishedDataExpire int64  `yaml:"FinishedDataExpire" default:"86400"` // finished Trans data will expire in 1 days. only for redis.
 	RedisPrefix        string `yaml:"RedisPrefix" default:"{a}"`          // Redis storage prefix. store data to only one slot in cluster
-	TransGlobalTable   string `yaml:"TransGlobalTable" default:"dtm.trans_global"`
-	TransBranchOpTable string `yaml:"TransBranchOpTable" default:"dtm.trans_branch_op"`
 }
 
 // IsDB checks config driver is mysql or postgres
@@ -76,6 +75,7 @@ func (s *Store) GetDBConf() dtmcli.DBConf {
 		Port:     s.Port,
 		User:     s.User,
 		Password: s.Password,
+		Db:       s.Db,
 	}
 }
 

dtmsvr/storage/trans.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/dtm-labs/dtm/dtmcli"
 	"github.com/dtm-labs/dtm/dtmcli/dtmimp"
-	"github.com/dtm-labs/dtm/dtmsvr/config"
 	"github.com/dtm-labs/dtm/dtmutil"
 )
 
@@ -45,7 +44,7 @@ type TransGlobalStore struct {
 
 // TableName TableName
 func (g *TransGlobalStore) TableName() string {
-	return config.Config.Store.TransGlobalTable
+	return "trans_global"
 }
 
 func (g *TransGlobalStore) String() string {
@@ -67,7 +66,7 @@ type TransBranchStore struct {
 
 // TableName TableName
 func (b *TransBranchStore) TableName() string {
-	return config.Config.Store.TransBranchOpTable
+	return "trans_branch_op"
 }
 
 func (b *TransBranchStore) String() string {

test/main_test.go

@@ -30,7 +30,6 @@ func exitIf(code int) {
 func TestMain(m *testing.M) {
 	config.MustLoadConfig("")
 	logger.InitLog("debug")
-	dtmcli.SetCurrentDBType(busi.BusiConf.Driver)
 	dtmsvr.TransProcessedTestChan = make(chan string, 1)
 	dtmsvr.NowForwardDuration = 0 * time.Second
 	dtmsvr.CronForwardDuration = 180 * time.Second
@@ -59,6 +58,7 @@ func TestMain(m *testing.M) {
 	registry.WaitStoreUp()
 
 	dtmsvr.PopulateDB(false)
+	conf.Store.Db = "dtm" // after populateDB, set current db to dtm
 	go dtmsvr.StartSvr()
 
 	busi.PopulateDB(false)