eorm: 微调读写分离相关命名

ecodeclub · Feb 14, 2023 · 08fc73f · 08fc73f
1 parent 84d805f
commit 08fc73f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/internal/integration/base_test.go b/internal/integration/base_test.go
@@ -76,8 +76,8 @@ func (s *MasterSlaveSuite) initDb() (*eorm.MasterSlavesDB, error) {
 		}
 		slaves = append(slaves, slave)
 	}
-	s.slaveNamegeter = newSlaveNameGet(roundrobin.NewRoundrobin(slaves...))
-	return eorm.OpenMasterSlaveDB(s.driver, master, eorm.MasterSlaveWithSlaveGeter(s.slaveNamegeter))
+	s.slaveNamegeter = newSlaveNameGet(roundrobin.NewSlaves(slaves...))
+	return eorm.OpenMasterSlaveDB(s.driver, master, eorm.MasterSlaveWithSlaves(s.slaveNamegeter))
 
 }
 

diff --git a/internal/integration/select_masterslave_test.go b/internal/integration/select_masterslave_test.go
@@ -66,7 +66,7 @@ func (s *MasterSlaveSelectTestSuite) TestMasterSlave() {
 			wantRes: s.data,
 			ctx: func() context.Context {
 				c := context.Background()
-				c = eorm.UserMaster(c)
+				c = eorm.UseMaster(c)
 				return c
 			},
 		},

diff --git a/internal/slaves/roundrobin/roundrobin.go b/internal/slaves/roundrobin/roundrobin.go
@@ -24,12 +24,12 @@ import (
 	"github.com/gotomicro/eorm/internal/slaves"
 )
 
-type Roundrobin struct {
+type Slaves struct {
 	slaves []slaves.Slave
 	cnt    uint32
 }
 
-func (r *Roundrobin) Next(ctx context.Context) (slaves.Slave, error) {
+func (r *Slaves) Next(ctx context.Context) (slaves.Slave, error) {
 	if ctx.Err() != nil {
 		return slaves.Slave{}, ctx.Err()
 	}
@@ -41,8 +41,8 @@ func (r *Roundrobin) Next(ctx context.Context) (slaves.Slave, error) {
 	return r.slaves[index], nil
 }
 
-func NewRoundrobin(slavedbs ...*sql.DB) *Roundrobin {
-	r := &Roundrobin{}
+func NewSlaves(slavedbs ...*sql.DB) *Slaves {
+	r := &Slaves{}
 	r.slaves = make([]slaves.Slave, 0, len(slavedbs))
 	for idx, slavedb := range slavedbs {
 		s := slaves.Slave{

diff --git a/masterslavedb.go b/masterslavedb.go
@@ -27,7 +27,7 @@ import (
 
 type MasterSlavesDB struct {
 	master *sql.DB
-	slaves.Slaves
+	slaves slaves.Slaves
 	core
 }
 
@@ -46,7 +46,7 @@ func (m *MasterSlavesDB) queryContext(ctx context.Context, query string, args ..
 	if ok {
 		return m.master.QueryContext(ctx, query, args...)
 	}
-	slave, err := m.Slaves.Next(ctx)
+	slave, err := m.slaves.Next(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -93,13 +93,12 @@ func OpenMasterSlaveDB(driver string, master *sql.DB, opts ...MasterSlaveDBOptio
 
 type MasterSlaveDBOption func(db *MasterSlavesDB)
 
-func MasterSlaveWithSlaveGeter(geter slaves.Slaves) MasterSlaveDBOption {
+func MasterSlaveWithSlaves(s slaves.Slaves) MasterSlaveDBOption {
 	return func(db *MasterSlavesDB) {
-		db.Slaves = geter
+		db.slaves = s
 	}
 }
 
-func UserMaster(ctx context.Context) context.Context {
-	mctx := context.WithValue(ctx, master, true)
-	return mctx
+func UseMaster(ctx context.Context) context.Context {
+	return context.WithValue(ctx, master, true)
 }