Skip to content

Improve applier .ReadMigrationRangeValues() func accuracy #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timvaillancourt merged 3 commits into from
Sep 6, 2022
Merged

Improve applier .ReadMigrationRangeValues() func accuracy #1164

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf9a46f
Use a transaction in applier `ReadMigrationRangeValues` func
timvaillancourt Aug 13, 2022
5356fd7
Private func names
timvaillancourt Aug 14, 2022
23f4627
Merge branch 'master' into ReadMigrationValues-transaction
timvaillancourt Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions go/logic/applier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,15 @@ func (this *Applier) ExecuteThrottleQuery() (int64, error) {
return result, nil
}

// ReadMigrationMinValues returns the minimum values to be iterated on rowcopy
func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error {
// readMigrationMinValues returns the minimum values to be iterated on rowcopy
func (this *Applier) readMigrationMinValues(tx *gosql.Tx, uniqueKey *sql.UniqueKey) error {
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)
if err != nil {
return err
}

rows, err := this.db.Query(query)
rows, err := tx.Query(query)
if err != nil {
return err
}
Expand All @@ -463,15 +463,15 @@ func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error {
return rows.Err()
}

// ReadMigrationMaxValues returns the maximum values to be iterated on rowcopy
func (this *Applier) ReadMigrationMaxValues(uniqueKey *sql.UniqueKey) error {
// readMigrationMaxValues returns the maximum values to be iterated on rowcopy
func (this *Applier) readMigrationMaxValues(tx *gosql.Tx, uniqueKey *sql.UniqueKey) error {
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)
if err != nil {
return err
}

rows, err := this.db.Query(query)
rows, err := tx.Query(query)
if err != nil {
return err
}
Expand Down Expand Up @@ -510,13 +510,20 @@ func (this *Applier) ReadMigrationRangeValues() error {
return err
}

if err := this.ReadMigrationMinValues(this.migrationContext.UniqueKey); err != nil {
tx, err := this.db.Begin()
if err != nil {
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 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,
Expand Down