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

improve range and refactor

This commit is contained in:
Lunny Xiao 2017-09-26 13:41:48 +08:00
parent b354379b9c
commit 741af4a315
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
engine_group.go
View File

@ -6,7 +6,6 @@ package xorm
import ( import (
"strings" "strings"
"time"
"github.com/go-xorm/core" "github.com/go-xorm/core"
) )
@ -67,7 +66,7 @@ func (eg *EngineGroup) Master() *Engine {
return eg.Engine return eg.Engine
} }
// Slave returns one of the physical databases which is a slave // Slave returns one of the physical databases which is a slave according the policy
func (eg *EngineGroup) Slave() *Engine { func (eg *EngineGroup) Slave() *Engine {
switch len(eg.slaves) { switch len(eg.slaves) {
case 0: case 0:
@ -89,7 +88,7 @@ func (eg *EngineGroup) GetSlave(i int) *Engine {
// ShowSQL show SQL statement or not on logger if log level is great than INFO // ShowSQL show SQL statement or not on logger if log level is great than INFO
func (eg *EngineGroup) ShowSQL(show ...bool) { func (eg *EngineGroup) ShowSQL(show ...bool) {
eg.Engine.ShowSQL(show...) eg.Engine.ShowSQL(show...)
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].ShowSQL(show...) eg.slaves[i].ShowSQL(show...)
} }
} }
@ -97,25 +96,31 @@ func (eg *EngineGroup) ShowSQL(show ...bool) {
// ShowExecTime show SQL statement and execute time or not on logger if log level is great than INFO // ShowExecTime show SQL statement and execute time or not on logger if log level is great than INFO
func (eg *EngineGroup) ShowExecTime(show ...bool) { func (eg *EngineGroup) ShowExecTime(show ...bool) {
eg.Engine.ShowExecTime(show...) eg.Engine.ShowExecTime(show...)
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].ShowExecTime(show...) eg.slaves[i].ShowExecTime(show...)
} }
} }
// SetMapper set the name mapping rules // SetMapper set the name mapping rules
func (eg *EngineGroup) SetMapper(mapper core.IMapper) { func (eg *EngineGroup) SetMapper(mapper core.IMapper) {
eg.Engine.SetTableMapper(mapper) eg.Engine.SetMapper(mapper)
eg.Engine.SetColumnMapper(mapper) for i := 0; i < len(eg.slaves); i++ {
for i, _ := range eg.slaves { eg.slaves[i].SetMapper(mapper)
eg.slaves[i].SetTableMapper(mapper) }
eg.slaves[i].SetColumnMapper(mapper) }
// SetLogger set the new logger
func (eg *EngineGroup) SetLogger(logger core.ILogger) {
eg.Engine.SetLogger(logger)
for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].SetLogger(logger)
} }
} }
// SetTableMapper set the table name mapping rule // SetTableMapper set the table name mapping rule
func (eg *EngineGroup) SetTableMapper(mapper core.IMapper) { func (eg *EngineGroup) SetTableMapper(mapper core.IMapper) {
eg.Engine.TableMapper = mapper eg.Engine.TableMapper = mapper
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].TableMapper = mapper eg.slaves[i].TableMapper = mapper
} }
} }
@ -123,7 +128,7 @@ func (eg *EngineGroup) SetTableMapper(mapper core.IMapper) {
// SetColumnMapper set the column name mapping rule // SetColumnMapper set the column name mapping rule
func (eg *EngineGroup) SetColumnMapper(mapper core.IMapper) { func (eg *EngineGroup) SetColumnMapper(mapper core.IMapper) {
eg.Engine.ColumnMapper = mapper eg.Engine.ColumnMapper = mapper
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].ColumnMapper = mapper eg.slaves[i].ColumnMapper = mapper
} }
} }
@ -131,7 +136,7 @@ func (eg *EngineGroup) SetColumnMapper(mapper core.IMapper) {
// SetMaxOpenConns is only available for go 1.2+ // SetMaxOpenConns is only available for go 1.2+
func (eg *EngineGroup) SetMaxOpenConns(conns int) { func (eg *EngineGroup) SetMaxOpenConns(conns int) {
eg.Engine.db.SetMaxOpenConns(conns) eg.Engine.db.SetMaxOpenConns(conns)
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].db.SetMaxOpenConns(conns) eg.slaves[i].db.SetMaxOpenConns(conns)
} }
} }
@ -139,20 +144,20 @@ func (eg *EngineGroup) SetMaxOpenConns(conns int) {
// SetMaxIdleConns set the max idle connections on pool, default is 2 // SetMaxIdleConns set the max idle connections on pool, default is 2
func (eg *EngineGroup) SetMaxIdleConns(conns int) { func (eg *EngineGroup) SetMaxIdleConns(conns int) {
eg.Engine.db.SetMaxIdleConns(conns) eg.Engine.db.SetMaxIdleConns(conns)
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].db.SetMaxIdleConns(conns) eg.slaves[i].db.SetMaxIdleConns(conns)
} }
} }
// Close the engine // Close the engine
func (eg *EngineGroup) Close() error { func (eg *EngineGroup) Close() error {
err := eg.Engine.db.Close() err := eg.Engine.Close()
if err != nil { if err != nil {
return err return err
} }
for i, _ := range eg.slaves { for i := 0; i < len(eg.slaves); i++ {
err := eg.slaves[i].db.Close() err := eg.slaves[i].Close()
if err != nil { if err != nil {
return err return err
} }
@ -173,11 +178,3 @@ func (eg *EngineGroup) Ping() error {
} }
return nil return nil
} }
// SetConnMaxLifetime sets the maximum amount of time a connection may be reused.
func (eg *EngineGroup) SetConnMaxLifetime(d time.Duration) {
eg.Engine.db.SetConnMaxLifetime(d)
for i, _ := range eg.slaves {
eg.slaves[i].db.SetConnMaxLifetime(d)
}
}

8
engine_maxlife.go
View File

@ -12,3 +12,11 @@ import "time"
func (engine *Engine) SetConnMaxLifetime(d time.Duration) { func (engine *Engine) SetConnMaxLifetime(d time.Duration) {
engine.db.SetConnMaxLifetime(d) engine.db.SetConnMaxLifetime(d)
} }
// SetConnMaxLifetime sets the maximum amount of time a connection may be reused.
func (eg *EngineGroup) SetConnMaxLifetime(d time.Duration) {
eg.Engine.SetConnMaxLifetime(d)
for i := 0; i < len(eg.slaves); i++ {
eg.slaves[i].SetConnMaxLifetime(d)
}
}