diff options
| author | korzhao <korzhao95@gmail.com> | 2023-07-30 15:02:15 +0800 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-07-31 18:34:45 +0000 |
| commit | 1eaeec10958bf41d082ef212ee689fd8c1284320 (patch) | |
| tree | 8637669d6a3620c821ccefee3e16f09ef9eb0afe /src/encoding/json/decode.go | |
| parent | bac4e2f241ca8df3d5be6ddf83214b9a681f4086 (diff) | |
| download | go-1eaeec10958bf41d082ef212ee689fd8c1284320.tar.xz | |
encoding/json: optimize Unmarshal for maps
benchmark old ns/op new ns/op delta
BenchmarkUnmarshalMap-10 218 172 -21.28%
benchmark old allocs new allocs delta
BenchmarkUnmarshalMap-10 15 12 -20.00%
benchmark old bytes new bytes delta
BenchmarkUnmarshalMap-10 328 256 -21.95%
Change-Id: Ie20ab62731c752eb0040c6d1591fedd7d12b1e0c
Reviewed-on: https://go-review.googlesource.com/c/go/+/514100
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src/encoding/json/decode.go')
| -rw-r--r-- | src/encoding/json/decode.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go index 53470d8c88..2142816d88 100644 --- a/src/encoding/json/decode.go +++ b/src/encoding/json/decode.go @@ -762,17 +762,17 @@ func (d *decodeState) object(v reflect.Value) error { if v.Kind() == reflect.Map { kt := t.Key() var kv reflect.Value - switch { - case reflect.PointerTo(kt).Implements(textUnmarshalerType): + if reflect.PointerTo(kt).Implements(textUnmarshalerType) { kv = reflect.New(kt) if err := d.literalStore(item, kv, true); err != nil { return err } kv = kv.Elem() - case kt.Kind() == reflect.String: - kv = reflect.ValueOf(key).Convert(kt) - default: + } else { switch kt.Kind() { + case reflect.String: + kv = reflect.New(kt).Elem() + kv.SetString(string(key)) case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: s := string(key) n, err := strconv.ParseInt(s, 10, 64) @@ -780,7 +780,8 @@ func (d *decodeState) object(v reflect.Value) error { d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)}) break } - kv = reflect.ValueOf(n).Convert(kt) + kv = reflect.New(kt).Elem() + kv.SetInt(n) case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: s := string(key) n, err := strconv.ParseUint(s, 10, 64) @@ -788,7 +789,8 @@ func (d *decodeState) object(v reflect.Value) error { d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)}) break } - kv = reflect.ValueOf(n).Convert(kt) + kv = reflect.New(kt).Elem() + kv.SetUint(n) default: panic("json: Unexpected key type") // should never occur } |