Skip to content
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

Add a check to rows.Err after processing all rows #835

Merged
merged 6 commits into from
Aug 20, 2020
Merged

Add a check to rows.Err after processing all rows #835

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61de098
Add a check to rows.Err after processing all rows
ajm188 Mar 31, 2020
90ad7a0
Handle the rest of `rows.Err` cases
ajm188 Apr 21, 2020
5b6da5b
Merge branch 'master' into handle_driver_timeout_error
timvaillancourt Aug 13, 2020
4bbc8de
Fix tabs from merge conflict
timvaillancourt Aug 13, 2020
f268259
Merge branch 'master' into handle_driver_timeout_error
timvaillancourt Aug 19, 2020
8b3a8be
Merge branch 'master' into handle_driver_timeout_error
timvaillancourt Aug 19, 2020
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
7 changes: 7 additions & 0 deletions go/logic/applier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@ func (this *Applier) ReadMigrationMinValues(uniqueKey *sql.UniqueKey) error {
}
}
this.migrationContext.Log.Infof("Migration min values: [%s]", this.migrationContext.MigrationRangeMinValues)

err = rows.Err()
return err
}

Expand All @@ -391,6 +393,8 @@ func (this *Applier) ReadMigrationMaxValues(uniqueKey *sql.UniqueKey) error {
}
}
this.migrationContext.Log.Infof("Migration max values: [%s]", this.migrationContext.MigrationRangeMaxValues)

err = rows.Err()
return err
}

Expand Down Expand Up @@ -443,6 +447,9 @@ func (this *Applier) CalculateNextIterationRangeEndValues() (hasFurtherRange boo
}
hasFurtherRange = true
}
if err = rows.Err(); err != nil {
return hasFurtherRange, err
}
if hasFurtherRange {
this.migrationContext.MigrationIterationRangeMaxValues = iterationRangeMaxValues
return hasFurtherRange, nil
Expand Down