octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor usages of GetDB to use mysql

Browse Source
This commit is contained in:
Nikhil Mathew 2017-11-10 15:44:22 -08:00
parent bb4a0be4c6
commit 2ad65ee1d7
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
go/base/context.go
View File

@ -14,12 +14,9 @@ import (
"sync/atomic"
"time"
gosql "database/sql"
"github.com/github/gh-ost/go/mysql"
"github.com/github/gh-ost/go/sql"
"github.com/outbrain/golib/sqlutils"
"gopkg.in/gcfg.v1"
gcfgscanner "gopkg.in/gcfg.v1/scanner"
)

4
go/logic/applier.go
View File

@ -47,11 +47,11 @@ func NewApplier(migrationContext *base.MigrationContext) *Applier {
func (this *Applier) InitDBConnections() (err error) {
applierUri := this.connectionConfig.GetDBUri(this.migrationContext.DatabaseName)
if this.db, _, err = this.migrationContext.GetDB(applierUri); err != nil {
if this.db, err = mysql.GetDB(applierUri); err != nil {
return err
}
singletonApplierUri := fmt.Sprintf("%s?timeout=0", applierUri)
if this.singletonDB, _, err = this.migrationContext.GetDB(singletonApplierUri); err != nil {
if this.singletonDB, err = mysql.GetDB(singletonApplierUri); err != nil {
return err
}
this.singletonDB.SetMaxOpenConns(1)

4
go/logic/inspect.go
View File

@ -41,12 +41,12 @@ func NewInspector(migrationContext *base.MigrationContext) *Inspector {
func (this *Inspector) InitDBConnections() (err error) {
inspectorUri := this.connectionConfig.GetDBUri(this.migrationContext.DatabaseName)
if this.db, _, err = this.migrationContext.GetDB(inspectorUri); err != nil {
if this.db, err = mysql.GetDB(inspectorUri); err != nil {
return err
}
informationSchemaUri := this.connectionConfig.GetDBUri("information_schema")
if this.informationSchemaDb, _, err = this.migrationContext.GetDB(informationSchemaUri); err != nil {
if this.informationSchemaDb, err = mysql.GetDB(informationSchemaUri); err != nil {
return err
}

2
go/logic/streamer.go
View File

@ -104,7 +104,7 @@ func (this *EventsStreamer) notifyListeners(binlogEvent *binlog.BinlogDMLEvent)
func (this *EventsStreamer) InitDBConnections() (err error) {
EventsStreamerUri := this.connectionConfig.GetDBUri(this.migrationContext.DatabaseName)
if this.db, _, err = this.migrationContext.GetDB(EventsStreamerUri); err != nil {
if this.db, err = mysql.GetDB(EventsStreamerUri); err != nil {
return err
}
if err := this.validateConnection(); err != nil {

2
go/logic/throttler.go
View File

@ -181,7 +181,7 @@ func (this *Throttler) collectControlReplicasLag() {
dbUri := connectionConfig.GetDBUri("information_schema")
var heartbeatValue string
if db, _, err := this.migrationContext.GetDB(dbUri); err != nil {
if db, err := mysql.GetDB(dbUri); err != nil {
return lag, err
} else if err = db.QueryRow(replicationLagQuery).Scan(&heartbeatValue); err != nil {
return lag, err

2
go/mysql/utils.go
View File

@ -62,7 +62,7 @@ func GetReplicationLag(informationSchemaDb *gosql.DB, connectionConfig *Connecti
func GetMasterKeyFromSlaveStatus(connectionConfig *ConnectionConfig) (masterKey *InstanceKey, err error) {
currentUri := connectionConfig.GetDBUri("information_schema")
// This function is only called once, okay to not have a cached connection pool
db, err := sqlutils.GetDB(currentUri)
db, err := GetDB(currentUri)
defer db.Close()
if err != nil {