Skip to content

Commit cf07dc5

Browse files
authored
Keep AcquireBytes consistent (#108)
* change code more readable * fix nacos ut failed * fix nacos ut * fix zk reconn * fix AcquireBytes logic * fix import format Co-authored-by: 文徐 <[email protected]>
1 parent dd1f644 commit cf07dc5

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

bytes/bytes_pool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ func (bp *BytesPool) findIndex(size int) int {
6161
return bp.length
6262
}
6363

64-
// AcquireBytes get specific make([]byte, 0, size)
64+
// AcquireBytes get specific length []byte
6565
func (bp *BytesPool) AcquireBytes(size int) *[]byte {
6666
idx := bp.findIndex(size)
6767
if idx >= bp.length {
68-
buf := make([]byte, 0, size)
68+
buf := make([]byte, size, size)
6969
return &buf
7070
}
7171

bytes/bytes_pool_test.go

+13
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import (
2121
"fmt"
2222
"testing"
2323
)
24+
import (
25+
"github.com/stretchr/testify/assert"
26+
)
2427

2528
func Test_findIndex(t *testing.T) {
2629
bp := NewBytesPool([]int{16, 4 << 10, 16 << 10, 32 << 10, 64 << 10})
@@ -72,3 +75,13 @@ func benchmarkfindIndex(b *testing.B, size int) {
7275
defaultBytesPool.findIndex(size)
7376
}
7477
}
78+
79+
func TestAcquireBytes(t *testing.T) {
80+
bytes := AcquireBytes(10)
81+
assert.Equal(t, 10, len(*bytes))
82+
assert.Equal(t, 512, cap(*bytes))
83+
84+
bytes3 := AcquireBytes(1000000)
85+
assert.Equal(t, 1000000, cap(*bytes3))
86+
assert.Equal(t, 1000000, cap(*bytes3))
87+
}

go.sum

+3
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
462462
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
463463
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
464464
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
465+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
465466
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
466467
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
467468
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -471,6 +472,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
471472
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
472473
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
473474
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
475+
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
474476
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
475477
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
476478
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -643,6 +645,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
643645
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
644646
golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
645647
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
648+
golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
646649
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
647650
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
648651
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)