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

Improve applier .ReadMigrationRangeValues() func accuracy (#1164)

Browse Source 
* Use a transaction in applier `ReadMigrationRangeValues` func

* Private func names
This commit is contained in:
Tim Vaillancourt 2022-09-06 14:07:47 +02:00 committed by GitHub
parent 1a473a4f66
commit 3c946e97d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
go/logic/applier.go
View File

@ -438,15 +438,15 @@ func (this *Applier) ExecuteThrottleQuery() (int64, error) {
return result, nil return result, nil
} }
// ReadMigrationMinValues returns the minimum values to be iterated on rowcopy // readMigrationMinValues returns the minimum values to be iterated on rowcopy
func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error { func (this *Applier) readMigrationMinValues(tx *gosql.Tx, uniqueKey *sql.UniqueKey) error {
this.migrationContext.Log.Debugf("Reading migration range according to key: %s", uniqueKey.Name) this.migrationContext.Log.Debugf("Reading migration range according to key: %s", uniqueKey.Name)
query, err := sql.BuildUniqueKeyMinValuesPreparedQuery(this.migrationContext.DatabaseName, this.migrationContext.OriginalTableName, &uniqueKey.Columns) query, err := sql.BuildUniqueKeyMinValuesPreparedQuery(this.migrationContext.DatabaseName, this.migrationContext.OriginalTableName, &uniqueKey.Columns)
if err != nil { if err != nil {
return err return err
} }
rows, err := this.db.Query(query) rows, err := tx.Query(query)
if err != nil { if err != nil {
return err return err
} }
@ -463,15 +463,15 @@ func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error {
return rows.Err() return rows.Err()
} }
// ReadMigrationMaxValues returns the maximum values to be iterated on rowcopy // readMigrationMaxValues returns the maximum values to be iterated on rowcopy
func (this *Applier) ReadMigrationMaxValues(uniqueKey *sql.UniqueKey) error { func (this *Applier) readMigrationMaxValues(tx *gosql.Tx, uniqueKey *sql.UniqueKey) error {
this.migrationContext.Log.Debugf("Reading migration range according to key: %s", uniqueKey.Name) this.migrationContext.Log.Debugf("Reading migration range according to key: %s", uniqueKey.Name)
query, err := sql.BuildUniqueKeyMaxValuesPreparedQuery(this.migrationContext.DatabaseName, this.migrationContext.OriginalTableName, &uniqueKey.Columns) query, err := sql.BuildUniqueKeyMaxValuesPreparedQuery(this.migrationContext.DatabaseName, this.migrationContext.OriginalTableName, &uniqueKey.Columns)
if err != nil { if err != nil {
return err return err
} }
rows, err := this.db.Query(query) rows, err := tx.Query(query)
if err != nil { if err != nil {
return err return err
} }
@ -510,13 +510,20 @@ func (this *Applier) ReadMigrationRangeValues() error {
return err return err
} }
if err := this.ReadMigrationMinValues(this.migrationContext.UniqueKey); err != nil { tx, err := this.db.Begin()
if err != nil {
return err return err
} }
if err := this.ReadMigrationMaxValues(this.migrationContext.UniqueKey); err != nil { defer tx.Rollback()
if err := this.readMigrationMinValues(tx, this.migrationContext.UniqueKey); err != nil {
return err return err
} }
return nil if err := this.readMigrationMaxValues(tx, this.migrationContext.UniqueKey); err != nil {
return err
}
return tx.Commit()
} }
// CalculateNextIterationRangeEndValues reads the next-iteration-range-end unique key values, // CalculateNextIterationRangeEndValues reads the next-iteration-range-end unique key values,