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

Address PR feedback

Browse Source
This commit is contained in:
Morgan Tocker 2022-11-14 14:47:00 -07:00
parent cfd83728ed
commit 3f3a10a213
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go/logic/applier_test.go
View File

@ -182,5 +182,4 @@ func TestApplierInstantDDL(t *testing.T) {
stmt := applier.generateInstantDDLQuery() stmt := applier.generateInstantDDLQuery()
test.S(t).ExpectEquals(stmt, "ALTER /* gh-ost */ TABLE `test`.`mytable` ADD INDEX (foo), ALGORITHM=INSTANT") test.S(t).ExpectEquals(stmt, "ALTER /* gh-ost */ TABLE `test`.`mytable` ADD INDEX (foo), ALGORITHM=INSTANT")
}) })
} }

23
go/logic/migrator.go
View File

@ -351,6 +351,15 @@ func (this *Migrator) Migrate() (err error) {
if err := this.initiateInspector(); err != nil { if err := this.initiateInspector(); err != nil {
return err return err
} }
if err := this.initiateStreaming(); err != nil {
return err
}
if err := this.initiateApplier(); err != nil {
return err
}
if err := this.createFlagFiles(); err != nil {
return err
}
// In MySQL 8.0 (and possibly earlier) some DDL statements can be applied instantly. // In MySQL 8.0 (and possibly earlier) some DDL statements can be applied instantly.
// Attempt to do this if AttemptInstantDDL is set. // Attempt to do this if AttemptInstantDDL is set.
if this.migrationContext.AttemptInstantDDL { if this.migrationContext.AttemptInstantDDL {
@ -363,16 +372,6 @@ func (this *Migrator) Migrate() (err error) {
} }
} }
if err := this.initiateStreaming(); err != nil {
return err
}
if err := this.initiateApplier(); err != nil {
return err
}
if err := this.createFlagFiles(); err != nil {
return err
}
initialLag, _ := this.inspector.getReplicationLag() initialLag, _ := this.inspector.getReplicationLag()
this.migrationContext.Log.Infof("Waiting for ghost table to be migrated. Current lag is %+v", initialLag) this.migrationContext.Log.Infof("Waiting for ghost table to be migrated. Current lag is %+v", initialLag)
<-this.ghostTableMigrated <-this.ghostTableMigrated
@ -750,10 +749,6 @@ func (this *Migrator) initiateServer() (err error) {
// using a ALGORITHM=INSTANT assertion. If this fails, it will return an error, // using a ALGORITHM=INSTANT assertion. If this fails, it will return an error,
// in which case the original algorithm should be used. // in which case the original algorithm should be used.
func (this *Migrator) attemptInstantDDL() (err error) { func (this *Migrator) attemptInstantDDL() (err error) {
this.applier = NewApplier(this.migrationContext)
if err := this.applier.InitDBConnections(); err != nil {
return err
}
return this.applier.AttemptInstantDDL() return this.applier.AttemptInstantDDL()
} }