forked from fl00r/go-tarantool-1.6
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
api: support errors extra information
Since Tarantool 2.4.1, iproto error responses contain extra info with backtrace [1]. After this patch, Error would contain ExtraInfo field (BoxError object), if it was provided. 1. https://www.tarantool.io/en/doc/latest/dev_guide/internals/box_protocol/#responses-for-errors Part of #209
- Loading branch information
1 parent
7592b93
commit a3bc8c4
Showing
7 changed files
with
358 additions
and
5 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,220 @@ | ||
| package tarantool | ||
|
|
||
| // BoxError is a type representing Tarantool `box.error` object: a single | ||
| // MP_ERROR_STACK object with a link to the previous stack error. | ||
| type BoxError struct { | ||
| Type string // Type that implies source, for example "ClientError". | ||
| File string // Source code file where error was caught. | ||
| Line int64 // Line number in source code file. | ||
| Message string // Text of reason. | ||
| Errno int64 // Ordinal number of the error. | ||
| Errcode int64 // Number of the error as defined in `errcode.h`. | ||
| // Additional fields depending on error type. For example, if | ||
| // type is "AccessDeniedError", then it will include "object_type", | ||
| // "object_name", "access_type". | ||
| Fields map[interface{}]interface{} | ||
| Prev *BoxError // Previous error in stack. | ||
| } | ||
|
|
||
| func (err BoxError) Depth() (depth int) { | ||
| depth = 1 | ||
| for err.Prev != nil { | ||
| err = *err.Prev | ||
| depth++ | ||
| } | ||
| return depth | ||
| } | ||
|
|
||
| func decodeBoxErrorStack(d *decoder) (*BoxError, error) { | ||
| var l, larr, l1, l2 int | ||
| var errorStack []BoxError | ||
| var err error | ||
| var mapk, mapv interface{} | ||
|
|
||
| if l, err = d.DecodeMapLen(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| for ; l > 0; l-- { | ||
| var cd int | ||
| if cd, err = d.DecodeInt(); err != nil { | ||
| return nil, err | ||
| } | ||
| switch cd { | ||
| case KeyErrorStack: | ||
| if larr, err = d.DecodeArrayLen(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| errorStack = make([]BoxError, larr) | ||
|
|
||
| for i := 0; i < larr; i++ { | ||
| if l1, err = d.DecodeMapLen(); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| for ; l1 > 0; l1-- { | ||
| var cd1 int | ||
| if cd1, err = d.DecodeInt(); err != nil { | ||
| return nil, err | ||
| } | ||
| switch cd1 { | ||
| case KeyErrorType: | ||
| if errorStack[i].Type, err = d.DecodeString(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorFile: | ||
| if errorStack[i].File, err = d.DecodeString(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorLine: | ||
| if errorStack[i].Line, err = d.DecodeInt64(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorMessage: | ||
| if errorStack[i].Message, err = d.DecodeString(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorErrno: | ||
| if errorStack[i].Errno, err = d.DecodeInt64(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorErrcode: | ||
| if errorStack[i].Errcode, err = d.DecodeInt64(); err != nil { | ||
| return nil, err | ||
| } | ||
| case KeyErrorFields: | ||
| errorStack[i].Fields = make(map[interface{}]interface{}) | ||
| if l2, err = d.DecodeMapLen(); err != nil { | ||
| return nil, err | ||
| } | ||
| for ; l2 > 0; l2-- { | ||
| if mapk, err = d.DecodeInterface(); err != nil { | ||
| return nil, err | ||
| } | ||
| if mapv, err = d.DecodeInterface(); err != nil { | ||
| return nil, err | ||
| } | ||
| errorStack[i].Fields[mapk] = mapv | ||
| } | ||
| default: | ||
| if err = d.Skip(); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if i > 0 { | ||
| errorStack[i-1].Prev = &errorStack[i] | ||
| } | ||
| } | ||
| default: | ||
| if err = d.Skip(); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if len(errorStack) > 0 { | ||
| return &errorStack[0], nil | ||
| } | ||
|
|
||
| return nil, nil | ||
| } | ||
|
|
||
| // func encodeBoxError(enc *encoder, err BoxError) (*BoxError, error) { | ||
| // var l, larr, l1, l2 int | ||
| // var errorStack []BoxError | ||
| // var err error | ||
| // var mapk, mapv interface{} | ||
|
|
||
| // if l, err = d.DecodeMapLen(); err != nil { | ||
| // return nil, err | ||
| // } | ||
|
|
||
| // for ; l > 0; l-- { | ||
| // var cd int | ||
| // if cd, err = d.DecodeInt(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // switch cd { | ||
| // case KeyErrorStack: | ||
| // if larr, err = d.DecodeArrayLen(); err != nil { | ||
| // return nil, err | ||
| // } | ||
|
|
||
| // errorStack = make([]BoxError, larr) | ||
|
|
||
| // for i := 0; i < larr; i++ { | ||
| // if l1, err = d.DecodeMapLen(); err != nil { | ||
| // return nil, err | ||
| // } | ||
|
|
||
| // for ; l1 > 0; l1-- { | ||
| // var cd1 int | ||
| // if cd1, err = d.DecodeInt(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // switch cd1 { | ||
| // case KeyErrorType: | ||
| // if errorStack[i].Type, err = d.DecodeString(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorFile: | ||
| // if errorStack[i].File, err = d.DecodeString(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorLine: | ||
| // if errorStack[i].Line, err = d.DecodeInt64(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorMessage: | ||
| // if errorStack[i].Message, err = d.DecodeString(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorErrno: | ||
| // if errorStack[i].Errno, err = d.DecodeInt64(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorErrcode: | ||
| // if errorStack[i].Errcode, err = d.DecodeInt64(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // case KeyErrorFields: | ||
| // errorStack[i].Fields = make(map[interface{}]interface{}) | ||
| // if l2, err = d.DecodeMapLen(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // for ; l2 > 0; l2-- { | ||
| // if mapk, err = d.DecodeInterface(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // if mapv, err = d.DecodeInterface(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // errorStack[i].Fields[mapk] = mapv | ||
| // } | ||
| // default: | ||
| // if err = d.Skip(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // if i > 0 { | ||
| // errorStack[i-1].Prev = &errorStack[i] | ||
| // } | ||
| // } | ||
| // default: | ||
| // if err = d.Skip(); err != nil { | ||
| // return nil, err | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // if len(errorStack) > 0 { | ||
| // return &errorStack[0], nil | ||
| // } | ||
|
|
||
| // return nil, nil | ||
| // } |
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
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
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
Oops, something went wrong.