Skip to content

Commit b4a0a79

Browse files
committed
Runned automatic formater
1 parent 38e66e2 commit b4a0a79

3 files changed

Lines changed: 22 additions & 23 deletions

File tree

go/base/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ type MigrationContext struct {
216216
MigrationIterationRangeMaxValues *sql.ColumnValues
217217
ForceTmpTableName string
218218

219-
TriggerCutoverUniqueKeys [][]interface {}
219+
TriggerCutoverUniqueKeys [][]interface{}
220220

221221
recentBinlogCoordinates mysql.BinlogCoordinates
222222
}

go/logic/applier.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ package logic
88
import (
99
gosql "database/sql"
1010
"fmt"
11-
"sync/atomic"
12-
"time"
1311
"regexp"
1412
"strings"
13+
"sync/atomic"
14+
"time"
1515

1616
"github.com/github/gh-ost/go/base"
1717
"github.com/github/gh-ost/go/binlog"
@@ -554,9 +554,9 @@ func (this *Applier) CreateTriggersOriginalTable() error {
554554
}
555555

556556
deleteTrigger := fmt.Sprintf(
557-
"CREATE /* gh-ost */ TRIGGER `%s_del` AFTER DELETE ON %s.%s " +
558-
"FOR EACH ROW " +
559-
"DELETE /* gh-ost */ IGNORE FROM %s.%s WHERE %s",
557+
"CREATE /* gh-ost */ TRIGGER `%s_del` AFTER DELETE ON %s.%s "+
558+
"FOR EACH ROW "+
559+
"DELETE /* gh-ost */ IGNORE FROM %s.%s WHERE %s",
560560
prefix,
561561
sql.EscapeName(this.migrationContext.DatabaseName),
562562
sql.EscapeName(this.migrationContext.OriginalTableName),
@@ -574,11 +574,10 @@ func (this *Applier) CreateTriggersOriginalTable() error {
574574
insertValues = append(insertValues, value)
575575
}
576576

577-
578577
insertTrigger := fmt.Sprintf(
579-
"CREATE /* gh-ost */ TRIGGER `%s_ins` AFTER INSERT ON %s.%s " +
580-
"FOR EACH ROW " +
581-
"REPLACE /* gh-ost */ INTO %s.%s (%s) VALUES (%s)",
578+
"CREATE /* gh-ost */ TRIGGER `%s_ins` AFTER INSERT ON %s.%s "+
579+
"FOR EACH ROW "+
580+
"REPLACE /* gh-ost */ INTO %s.%s (%s) VALUES (%s)",
582581
prefix,
583582
sql.EscapeName(this.migrationContext.DatabaseName),
584583
sql.EscapeName(this.migrationContext.OriginalTableName),
@@ -598,12 +597,12 @@ func (this *Applier) CreateTriggersOriginalTable() error {
598597
}
599598

600599
updateTrigger := fmt.Sprintf(
601-
"CREATE /* gh-ost */ TRIGGER `%s_upd` AFTER UPDATE ON %s.%s " +
602-
"FOR EACH ROW " +
603-
"BEGIN /* gh-ost */ " +
604-
"DELETE IGNORE FROM %s.%s WHERE !(%s) AND %s; " +
605-
"REPLACE INTO %s.%s (%s) VALUES (%s); " +
606-
"END",
600+
"CREATE /* gh-ost */ TRIGGER `%s_upd` AFTER UPDATE ON %s.%s "+
601+
"FOR EACH ROW "+
602+
"BEGIN /* gh-ost */ "+
603+
"DELETE IGNORE FROM %s.%s WHERE !(%s) AND %s; "+
604+
"REPLACE INTO %s.%s (%s) VALUES (%s); "+
605+
"END",
607606
prefix,
608607
sql.EscapeName(this.migrationContext.DatabaseName),
609608
sql.EscapeName(this.migrationContext.OriginalTableName),

go/logic/migrator.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
type ChangelogState string
2626

2727
const (
28-
GhostTableMigrated ChangelogState = "GhostTableMigrated"
29-
AllEventsUpToLockProcessed = "AllEventsUpToLockProcessed"
30-
StopWriteEvents = "StopWriteEvents"
31-
AllEventsUpToTriggersProcessed = "AllEventsUpToTriggersProcessed"
28+
GhostTableMigrated ChangelogState = "GhostTableMigrated"
29+
AllEventsUpToLockProcessed = "AllEventsUpToLockProcessed"
30+
StopWriteEvents = "StopWriteEvents"
31+
AllEventsUpToTriggersProcessed = "AllEventsUpToTriggersProcessed"
3232
)
3333

3434
func ReadChangelogState(s string) ChangelogState {
@@ -80,7 +80,7 @@ type Migrator struct {
8080
stoppedWriteEvents chan string
8181
allEventsUpToTriggersProcessed chan string
8282

83-
triggerCutoverUniqueKeys [][]interface {}
83+
triggerCutoverUniqueKeys [][]interface{}
8484

8585
rowCopyCompleteFlag int64
8686
// copyRowsQueue should not be buffered; if buffered some non-damaging but
@@ -749,7 +749,7 @@ func (this *Migrator) cutOverTrigger() (err error) {
749749
log.Infof(
750750
"Creating triggers for %s.%s",
751751
this.migrationContext.DatabaseName,
752-
this.migrationContext.OriginalTableName);
752+
this.migrationContext.OriginalTableName)
753753

754754
if err := this.retryOperation(this.applier.CreateTriggersOriginalTable); err != nil {
755755
return err
@@ -763,7 +763,7 @@ func (this *Migrator) cutOverTrigger() (err error) {
763763

764764
CompareNewRow:
765765
for _, rowToAdd := range this.triggerCutoverUniqueKeys {
766-
CompareAddedRow:
766+
CompareAddedRow:
767767
for _, rowAdded := range this.migrationContext.TriggerCutoverUniqueKeys {
768768
for i := range rowAdded {
769769
if rowToAdd[i] != rowAdded[i] {

0 commit comments

Comments
 (0)