HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify Slave function and add LeastConnPolicy

This commit is contained in:
WhiteBatman 2017-09-26 12:32:21 +08:00
parent 52a84b29b7
commit d894762619
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine_group.go
View File

@ -91,6 +91,9 @@ func (eg *EngineGroup) Slave() *Engine {
if eg.count == 1 { if eg.count == 1 {
return eg.master return eg.master
} }
if eg.s_count == 1 {
return eg.slaves[0]
}
return eg.policy.Slave(eg) return eg.policy.Slave(eg)
} }

30
engine_group_policy.go
View File

@ -25,9 +25,6 @@ func NewRandomPolicy() *RandomPolicy {
} }
func (policy *RandomPolicy) Slave(g *EngineGroup) *Engine { func (policy *RandomPolicy) Slave(g *EngineGroup) *Engine {
if g.s_count == 1 {
return g.Slaves()[0]
}
return g.Slaves()[policy.r.Intn(len(g.Slaves()))] return g.Slaves()[policy.r.Intn(len(g.Slaves()))]
} }
@ -54,9 +51,6 @@ func NewWeightRandomPolicy(weights []int) *WeightRandomPolicy {
func (policy *WeightRandomPolicy) Slave(g *EngineGroup) *Engine { func (policy *WeightRandomPolicy) Slave(g *EngineGroup) *Engine {
var slaves = g.Slaves() var slaves = g.Slaves()
if g.s_count == 1 {
return slaves[0]
}
idx := policy.rands[policy.r.Intn(len(policy.rands))] idx := policy.rands[policy.r.Intn(len(policy.rands))]
if idx >= len(slaves) { if idx >= len(slaves) {
idx = len(slaves) - 1 idx = len(slaves) - 1
@ -74,10 +68,6 @@ func NewRoundRobinPolicy() *RoundRobinPolicy {
} }
func (policy *RoundRobinPolicy) Slave(g *EngineGroup) *Engine { func (policy *RoundRobinPolicy) Slave(g *EngineGroup) *Engine {
if g.s_count == 1 {
return g.Slaves()[0]
}
var pos int var pos int
policy.lock.Lock() policy.lock.Lock()
policy.pos++ policy.pos++
@ -116,10 +106,6 @@ func NewWeightRoundRobinPolicy(weights []int) *WeightRoundRobinPolicy {
func (policy *WeightRoundRobinPolicy) Slave(g *EngineGroup) *Engine { func (policy *WeightRoundRobinPolicy) Slave(g *EngineGroup) *Engine {
var slaves = g.Slaves() var slaves = g.Slaves()
if g.s_count == 1 {
return slaves[0]
}
var pos int var pos int
policy.lock.Lock() policy.lock.Lock()
policy.pos++ policy.pos++
@ -144,6 +130,18 @@ func NewLeastConnPolicy() *LeastConnPolicy {
} }
func (policy *LeastConnPolicy) Slave(g *EngineGroup) *Engine { func (policy *LeastConnPolicy) Slave(g *EngineGroup) *Engine {
panic("not implementation") var slaves = g.Slaves()
return nil connections := 0
idx := 0
for i, _ := range slaves {
open_connections := slaves[i].Stats()
if i == 0 {
connections = open_connections
idx = i
} else if open_connections <= connections {
connections = open_connections
idx = i
}
}
return slaves[idx]
} }