Rewrite error handling from panics to error returns #1232
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Something like this:
func (cn *conn) begin(mode string) (_ driver.Tx, err error) {
defer cn.errRecover(&err)
cn.checkIsInTransaction(false)
[..]
}
Can now be rewritten to:
func (cn *conn) begin(mode string) (driver.Tx, error) {
err := cn.checkIsInTransaction(false)
if err != nil {
return cn.handleError(err)
}
[..]
}
Which is still not entirely ideal as calls to cn.handleError() need to
be repeated, but it's a good first step towards removing the panics, and
fairly safe against regressions.
errRecover() is rewritten to use this. I commented out the branches to
make sure tests fail (they do).
We want to ignore the error from these in cases where we're handling an ErrorReponse, as we want to return the first error, which is almost always the most useful one.
Update the list of unsupported environment variables and return an error instead of panicking.
Remove most panics. The only ones remaining are in writeBuf when the messages are too long (added in #1161). I think that's probably okay: normal operations should never hit this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This rewrites the error handling from panics to error returns.
The special handling to return driver.ErrBadConn is now in conn.handleError(), Something like this:
Can now be rewritten to:
Which is not entirely ideal as calls to cn.handleError() need to be repeated, but it's fairly safe against regressions and rewriting things to handle these errors closer to the source can be done later.
PR is rather larger than I would like, but if you change it in one place you kind of need to change it everywhere.