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

Move .Kill() func from inspector to go/mysql (#1148)

Browse Source
This commit is contained in:
Tim Vaillancourt 2022-07-11 11:02:04 +02:00 committed by GitHub
parent ae02941f67
commit f527d63c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go/logic/inspect.go
View File

@ -533,14 +533,6 @@ func (this *Inspector) estimateTableRowsViaExplain() error {
return nil return nil
} }
// Kill kills a query for connectionID.
// - @amason: this should go somewhere _other_ than `logic`, but I couldn't decide
// between `base`, `sql`, or `mysql`.
func Kill(db *gosql.DB, connectionID string) error {
_, err := db.Exec(`KILL QUERY %s`, connectionID)
return err
}
// CountTableRows counts exact number of rows on the original table // CountTableRows counts exact number of rows on the original table
func (this *Inspector) CountTableRows(ctx context.Context) error { func (this *Inspector) CountTableRows(ctx context.Context) error {
atomic.StoreInt64(&this.migrationContext.CountingRowsFlag, 1) atomic.StoreInt64(&this.migrationContext.CountingRowsFlag, 1)
@ -565,7 +557,7 @@ func (this *Inspector) CountTableRows(ctx context.Context) error {
switch err { switch err {
case context.Canceled, context.DeadlineExceeded: case context.Canceled, context.DeadlineExceeded:
this.migrationContext.Log.Infof("exact row count cancelled (%s), likely because I'm about to cut over. I'm going to kill that query.", ctx.Err()) this.migrationContext.Log.Infof("exact row count cancelled (%s), likely because I'm about to cut over. I'm going to kill that query.", ctx.Err())
return Kill(this.db, connectionID) return mysql.Kill(this.db, connectionID)
default: default:
return err return err
} }

6
go/mysql/utils.go
View File

@ -205,3 +205,9 @@ func GetTableColumns(db *gosql.DB, databaseName, tableName string) (*sql.ColumnL
} }
return sql.NewColumnList(columnNames), sql.NewColumnList(virtualColumnNames), nil return sql.NewColumnList(columnNames), sql.NewColumnList(virtualColumnNames), nil
} }
// Kill executes a KILL QUERY by connection id
func Kill(db *gosql.DB, connectionID string) error {
_, err := db.Exec(`KILL QUERY %s`, connectionID)
return err
}