github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 17:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor mapping errors (#3843)

Browse Source
This commit is contained in:
Kevin Wan 2024-01-13 22:11:19 +08:00 committed by GitHub
parent 0441f84606
commit 7822a4c1cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/mapping/unmarshaler.go
View File

@ -250,8 +250,9 @@ func (u *Unmarshaler) fillSliceFromString(fieldType reflect.Type, value reflect.
func (u *Unmarshaler) fillSliceValue(slice reflect.Value, index int, func (u *Unmarshaler) fillSliceValue(slice reflect.Value, index int,
baseKind reflect.Kind, value any, fullName string) error { baseKind reflect.Kind, value any, fullName string) error {
if value == nil { if value == nil {
return errUnsupportedType return errNilSliceElement
} }
ithVal := slice.Index(index) ithVal := slice.Index(index)
switch v := value.(type) { switch v := value.(type) {
case fmt.Stringer: case fmt.Stringer:

2
core/mapping/unmarshaler_test.go
View File

@ -1340,7 +1340,7 @@ func TestUnmarshalNullableSlice(t *testing.T) {
} }
ast := assert.New(t) ast := assert.New(t)
ast.Equal(UnmarshalKey(m, &v), errUnsupportedType) ast.Equal(UnmarshalKey(m, &v), errNilSliceElement)
} }
func TestUnmarshalIntSlice(t *testing.T) { func TestUnmarshalIntSlice(t *testing.T) {

1
core/mapping/utils.go
View File

@ -36,6 +36,7 @@ const (
var ( var (
errUnsupportedType = errors.New("unsupported type on setting field value") errUnsupportedType = errors.New("unsupported type on setting field value")
errNumberRange = errors.New("wrong number range setting") errNumberRange = errors.New("wrong number range setting")
errNilSliceElement = errors.New("null element for slice")
optionsCache = make(map[string]optionsCacheValue) optionsCache = make(map[string]optionsCacheValue)
cacheLock sync.RWMutex cacheLock sync.RWMutex
structRequiredCache = make(map[reflect.Type]requiredCacheValue) structRequiredCache = make(map[reflect.Type]requiredCacheValue)