Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize encodeUint #2882

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Optimize encodeUint #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions x/merkledb/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"math"
"math/bits"
"slices"
"sync"

"golang.org/x/exp/maps"

Expand Down Expand Up @@ -75,22 +74,12 @@ type decoder interface {
}

func newCodec() encoderDecoder {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're going to want to completely remove this type (now that it's an empty unexported struct). But I think we can leave that to a followup.

return &codecImpl{
varIntPool: sync.Pool{
New: func() interface{} {
return make([]byte, binary.MaxVarintLen64)
},
},
}
return &codecImpl{}
}

// Note that bytes.Buffer.Write always returns nil, so we
// can ignore its return values in [codecImpl] methods.
type codecImpl struct {
// Invariant: Every byte slice returned by [varIntPool] has
// length [binary.MaxVarintLen64].
varIntPool sync.Pool
}
type codecImpl struct{}

func (c *codecImpl) childSize(index byte, childEntry *child) int {
// * index
Expand Down Expand Up @@ -285,11 +274,10 @@ func (*codecImpl) decodeUint(src *bytes.Reader) (uint64, error) {
return val64, nil
}

func (c *codecImpl) encodeUint(dst *bytes.Buffer, value uint64) {
buf := c.varIntPool.Get().([]byte)
size := binary.PutUvarint(buf, value)
func (*codecImpl) encodeUint(dst *bytes.Buffer, value uint64) {
var buf [binary.MaxVarintLen64]byte
size := binary.PutUvarint(buf[:], value)
_, _ = dst.Write(buf[:size])
c.varIntPool.Put(buf)
}

func (c *codecImpl) encodeMaybeByteSlice(dst *bytes.Buffer, maybeValue maybe.Maybe[[]byte]) {
Expand Down
17 changes: 17 additions & 0 deletions x/merkledb/codec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"io"
"math"
"math/rand"
"strconv"
"testing"

"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -266,3 +267,19 @@ func TestUintSize(t *testing.T) {
require.Equal(t, expectedSize, actualSize, power)
}
}

func Benchmark_EncodeUint(b *testing.B) {
c := codec.(*codecImpl)

var dst bytes.Buffer
dst.Grow(binary.MaxVarintLen64)

for _, v := range []uint64{0, 1, 2, 32, 1024, 32768} {
b.Run(strconv.FormatUint(v, 10), func(b *testing.B) {
for i := 0; i < b.N; i++ {
c.encodeUint(&dst, v)
dst.Reset()
}
})
}
}
Loading