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

bug fix merge apply diff closed on error channel #1007

Merged
merged 1 commit into from
Dec 6, 2020
Merged

bug fix merge apply diff closed on error channel #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion catalog/mvcc/cataloger_merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ func (c *cataloger) doMerge(ctx context.Context, tx db.Tx, params doDiffParams,
}
}
case err := <-errChan:
return rowsCounter, err
if err != nil {
return rowsCounter, err
}
}
}
}
Expand Down