Max/sqlerror codes #297
Merged
Max/sqlerror codes #297
Conversation
This file contains 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
|
|
zachmu
reviewed
Feb 15, 2021
server/handler.go
Outdated
| @@ -321,7 +321,7 @@ func (h *Handler) doQuery( | |||
| }() | |||
| if err != nil { | |||
| logrus.Tracef("Error running query %s: %s", query, err) | |||
| return err | |||
| return sql.CastSQLError(err) | |||
There was a problem hiding this comment.
You need this in more places. Check out the other return code paths.
Or to make it easier, you might wrap the invocation of this entire function in another that inspects the error as necessary.
There was a problem hiding this comment.
ended up adding the new function because of go's type/value interface nil idiosyncrasies
sql/errors.go
Outdated
| var sqlState string = "" | ||
| switch { | ||
| case ErrTableNotFound.Is(err): | ||
| code = 1146 |
There was a problem hiding this comment.
Probably better to use the constants for these that vitess defines. They can be exported if they aren't already. Hard to review changes here with them being magic numbers.
zachmu
approved these changes
Feb 15, 2021
server/handler.go
Outdated
| @@ -156,7 +159,10 @@ func (h *Handler) ComQuery( | |||
| query string, | |||
| callback func(*sqltypes.Result) error, | |||
| ) error { | |||
| return h.doQuery(c, query, nil, callback) | |||
| if err := h.doQuery(c, query, nil, callback); err != nil { | |||
There was a problem hiding this comment.
Nit: just make CastSQLError handle the nil err case and you don't need the conditional logic
server/handler.go
Outdated
| @@ -321,7 +321,7 @@ func (h *Handler) doQuery( | |||
| }() | |||
| if err != nil { | |||
| logrus.Tracef("Error running query %s: %s", query, err) | |||
| return err | |||
| return sql.CastSQLError(err) | |||
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.
Append error codes/sql state to error messages for downstream clients.