6396be350f
Runs a bit faster, but more importantly, only needs a single buffer to encode nested, sorted maps
instead of using multiple temporary buffers.
│ before.txt │ after.txt │
│ sec/op │ sec/op vs base │
MarshalCanonical/Go_map[string]string_to_CBOR_map_canonical 1.464µ ± 0% 1.395µ ± 0% -4.68% (p=0.000 n=10)
MarshalCanonical/Go_map[int]int_to_CBOR_map_canonical 192.1n ± 0% 186.2n ± 1% -3.10% (p=0.000 n=10)
geomean 530.2n 509.6n -3.89%
│ before.txt │ after.txt │
│ B/op │ B/op vs base │
MarshalCanonical/Go_map[string]string_to_CBOR_map_canonical 88.00 ± 0% 112.00 ± 0% +27.27% (p=0.000 n=10)
MarshalCanonical/Go_map[int]int_to_CBOR_map_canonical 3.000 ± 0% 3.000 ± 0% ~ (p=1.000 n=10) ¹
geomean 16.25 18.33 +12.82%
¹ all samples are equal
│ before.txt │ after.txt │
│ allocs/op │ allocs/op vs base │
MarshalCanonical/Go_map[string]string_to_CBOR_map_canonical 2.000 ± 0% 2.000 ± 0% ~ (p=1.000 n=10) ¹
MarshalCanonical/Go_map[int]int_to_CBOR_map_canonical 1.000 ± 0% 1.000 ± 0% ~ (p=1.000 n=10) ¹
geomean 1.414 1.414 +0.00%
¹ all samples are equal
Signed-off-by: Ben Luddy <bluddy@redhat.com>
95 lines
1.8 KiB
Go
95 lines
1.8 KiB
Go
// Copyright (c) Faye Amacker. All rights reserved.
|
|
// Licensed under the MIT License. See LICENSE in the project root for license information.
|
|
|
|
//go:build go1.20
|
|
|
|
package cbor
|
|
|
|
import (
|
|
"bytes"
|
|
"reflect"
|
|
"sync"
|
|
)
|
|
|
|
type mapKeyValueEncodeFunc struct {
|
|
kf, ef encodeFunc
|
|
kpool, vpool sync.Pool
|
|
}
|
|
|
|
func (me *mapKeyValueEncodeFunc) encodeKeyValues(e *bytes.Buffer, em *encMode, v reflect.Value, kvs []keyValue) error {
|
|
iterk := me.kpool.Get().(*reflect.Value)
|
|
defer func() {
|
|
iterk.SetZero()
|
|
me.kpool.Put(iterk)
|
|
}()
|
|
iterv := me.vpool.Get().(*reflect.Value)
|
|
defer func() {
|
|
iterv.SetZero()
|
|
me.vpool.Put(iterv)
|
|
}()
|
|
|
|
if kvs == nil {
|
|
for i, iter := 0, v.MapRange(); iter.Next(); i++ {
|
|
iterk.SetIterKey(iter)
|
|
iterv.SetIterValue(iter)
|
|
|
|
if err := me.kf(e, em, *iterk); err != nil {
|
|
return err
|
|
}
|
|
if err := me.ef(e, em, *iterv); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
initial := e.Len()
|
|
for i, iter := 0, v.MapRange(); iter.Next(); i++ {
|
|
iterk.SetIterKey(iter)
|
|
iterv.SetIterValue(iter)
|
|
|
|
offset := e.Len()
|
|
if err := me.kf(e, em, *iterk); err != nil {
|
|
return err
|
|
}
|
|
valueOffset := e.Len()
|
|
if err := me.ef(e, em, *iterv); err != nil {
|
|
return err
|
|
}
|
|
kvs[i] = keyValue{
|
|
offset: offset - initial,
|
|
valueOffset: valueOffset - initial,
|
|
nextOffset: e.Len() - initial,
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func getEncodeMapFunc(t reflect.Type) encodeFunc {
|
|
kf, _ := getEncodeFunc(t.Key())
|
|
ef, _ := getEncodeFunc(t.Elem())
|
|
if kf == nil || ef == nil {
|
|
return nil
|
|
}
|
|
mkv := &mapKeyValueEncodeFunc{
|
|
kf: kf,
|
|
ef: ef,
|
|
kpool: sync.Pool{
|
|
New: func() interface{} {
|
|
rk := reflect.New(t.Key()).Elem()
|
|
return &rk
|
|
},
|
|
},
|
|
vpool: sync.Pool{
|
|
New: func() interface{} {
|
|
rv := reflect.New(t.Elem()).Elem()
|
|
return &rv
|
|
},
|
|
},
|
|
}
|
|
return mapEncodeFunc{
|
|
e: mkv.encodeKeyValues,
|
|
}.encode
|
|
}
|