Skip to content

Commit 64af440

Browse files
ymz-ncnkymz-ncnk
authored
Update mus to v0.3.0 (#172)
1 parent a57448d commit 64af440

File tree

4 files changed

+350
-353
lines changed

4 files changed

+350
-353
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/minio/sha256-simd v0.1.0 // indirect
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5656
github.com/modern-go/reflect2 v1.0.2 // indirect
57-
github.com/mus-format/mus-go v0.2.3
57+
github.com/mus-format/mus-go v0.3.0
5858
github.com/philhofer/fwd v1.1.2 // indirect
5959
github.com/pkg/errors v0.9.1 // indirect
6060
github.com/protolambda/zssz v0.1.1 // indirect

‎go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
3434
github.com/calmh/xdr v1.1.0 h1:U/Dd4CXNLoo8EiQ4ulJUXkgO1/EyQLgDKLgpY1SOoJE=
3535
github.com/calmh/xdr v1.1.0/go.mod h1:E8sz2ByAdXC8MbANf1LCRYzedSnnc+/sXXJs/PVqoeg=
3636
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
37-
github.com/chmike/ditp v0.0.0-20240621105623-1fe3e031524f h1:fxT+cPh0H+xo8ojX5O1zt/o/vTf7oeKdpk7r7asg2fs=
38-
github.com/chmike/ditp v0.0.0-20240621105623-1fe3e031524f/go.mod h1:Az8w1aHUmNFs7+C7v41Y/cpXIBafvOs+7J7M/KGsM1c=
3937
github.com/chmike/ditp v0.0.0-20240629115045-1ab5bbd646cd h1:ImEBzQdUJ6jx65nsFrBlNNV8um9lW4ApGEa+mIjXOZQ=
4038
github.com/chmike/ditp v0.0.0-20240629115045-1ab5bbd646cd/go.mod h1:Az8w1aHUmNFs7+C7v41Y/cpXIBafvOs+7J7M/KGsM1c=
4139
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -200,8 +198,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
200198
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
201199
github.com/mus-format/common-go v0.0.0-20240427160332-fda7f59c1da2 h1:VlQlK11OtURHQ1VsdHcp9OFq56i8HEIHURgfEtP9Jek=
202200
github.com/mus-format/common-go v0.0.0-20240427160332-fda7f59c1da2/go.mod h1:1hTb8w0YdSGIOU6wNY+e9uXnDZ9OQnUivNtd8cPSdoU=
203-
github.com/mus-format/mus-go v0.2.3 h1:HZ4NqdThMV2js9/goQueFqxAHaMBZDGBPwOwFv5f3LA=
204-
github.com/mus-format/mus-go v0.2.3/go.mod h1:uRQAo0t2WbvKZ9Iz5wdZV4s5eq1LsTS9dSizQeV9s+M=
201+
github.com/mus-format/mus-go v0.3.0 h1:OUBb/uWaaVPVpmyOo+DUVdjw5dkxQ1TCG3HO8q/Gyq8=
202+
github.com/mus-format/mus-go v0.3.0/go.mod h1:uRQAo0t2WbvKZ9Iz5wdZV4s5eq1LsTS9dSizQeV9s+M=
205203
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
206204
github.com/nazarifard/fastape v0.0.0-20240611084216-abaecf150e5b h1:Roh7HBLqAxLpo/qxWztQlzt6QUBGTCX9AXxCaJf+pB8=
207205
github.com/nazarifard/fastape v0.0.0-20240611084216-abaecf150e5b/go.mod h1:F54tpGg4uMgsYNUqD07iNENNGcS2GJobr+td/iZ5Xm4=

‎internal/serializers/mus/mus.go

+21-22
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,63 @@ import (
77
"github.com/mus-format/mus-go/ord"
88
"github.com/mus-format/mus-go/raw"
99
"github.com/mus-format/mus-go/unsafe"
10-
"github.com/mus-format/mus-go/varint"
1110
)
1211

1312
type MUSSerializer struct{}
1413

1514
func (s MUSSerializer) Marshal(o interface{}) ([]byte, error) {
1615
v := o.(*goserbench.SmallStruct)
17-
n := ord.SizeString(v.Name)
18-
n += raw.SizeInt64(v.BirthDay.UnixNano())
19-
n += ord.SizeString(v.Phone)
20-
n += varint.SizeInt32(int32(v.Siblings))
21-
n += ord.SizeBool(v.Spouse)
22-
n += raw.SizeFloat64(v.Money)
16+
n := ord.SizeString(v.Name, nil)
17+
n += unsafe.SizeInt64(v.BirthDay.UnixNano())
18+
n += ord.SizeString(v.Phone, nil)
19+
n += unsafe.SizeInt32(int32(v.Siblings))
20+
n += unsafe.SizeBool(v.Spouse)
21+
n += unsafe.SizeFloat64(v.Money)
2322
buf := make([]byte, n)
24-
n = ord.MarshalString(v.Name, buf)
25-
n += raw.MarshalInt64(v.BirthDay.UnixNano(), buf[n:])
26-
n += ord.MarshalString(v.Phone, buf[n:])
27-
n += varint.MarshalInt32(int32(v.Siblings), buf[n:])
28-
n += ord.MarshalBool(v.Spouse, buf[n:])
23+
n = ord.MarshalString(v.Name, nil, buf)
24+
n += unsafe.MarshalInt64(v.BirthDay.UnixNano(), buf[n:])
25+
n += ord.MarshalString(v.Phone, nil, buf[n:])
26+
n += unsafe.MarshalInt32(int32(v.Siblings), buf[n:])
27+
n += unsafe.MarshalBool(v.Spouse, buf[n:])
2928
raw.MarshalFloat64(v.Money, buf[n:])
3029
return buf, nil
3130
}
3231

3332
func (s MUSSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
3433
v := o.(*goserbench.SmallStruct)
3534
var n int
36-
v.Name, n, err = ord.UnmarshalString(bs)
35+
v.Name, n, err = ord.UnmarshalString(nil, bs)
3736
if err != nil {
3837
return
3938
}
4039
var (
4140
n1 int
4241
birthDay64 int64
4342
)
44-
birthDay64, n1, err = raw.UnmarshalInt64(bs[n:])
43+
birthDay64, n1, err = unsafe.UnmarshalInt64(bs[n:])
4544
n += n1
4645
if err != nil {
4746
return
4847
}
4948
v.BirthDay = time.Unix(0, birthDay64)
50-
v.Phone, n1, err = ord.UnmarshalString(bs[n:])
49+
v.Phone, n1, err = ord.UnmarshalString(nil, bs[n:])
5150
n += n1
5251
if err != nil {
5352
return
5453
}
5554
var siblings32 int32
56-
siblings32, n1, err = varint.UnmarshalInt32(bs[n:])
55+
siblings32, n1, err = unsafe.UnmarshalInt32(bs[n:])
5756
n += n1
5857
if err != nil {
5958
return
6059
}
6160
v.Siblings = int(siblings32)
62-
v.Spouse, n1, err = ord.UnmarshalBool(bs[n:])
61+
v.Spouse, n1, err = unsafe.UnmarshalBool(bs[n:])
6362
n += n1
6463
if err != nil {
6564
return
6665
}
67-
v.Money, n1, err = raw.UnmarshalFloat64(bs[n:])
66+
v.Money, n1, err = unsafe.UnmarshalFloat64(bs[n:])
6867
n += n1
6968
return
7069
}
@@ -79,9 +78,9 @@ type MUSUnsafeReuseSerializer struct {
7978

8079
func (s MUSUnsafeReuseSerializer) Marshal(o interface{}) ([]byte, error) {
8180
v := o.(*goserbench.SmallStruct)
82-
n := unsafe.MarshalString(v.Name, s.buf)
81+
n := unsafe.MarshalString(v.Name, nil, s.buf)
8382
n += unsafe.MarshalInt64(v.BirthDay.UnixNano(), s.buf[n:])
84-
n += unsafe.MarshalString(v.Phone, s.buf[n:])
83+
n += unsafe.MarshalString(v.Phone, nil, s.buf[n:])
8584
n += unsafe.MarshalInt32(int32(v.Siblings), s.buf[n:])
8685
n += unsafe.MarshalBool(v.Spouse, s.buf[n:])
8786
n += unsafe.MarshalFloat64(v.Money, s.buf[n:])
@@ -91,7 +90,7 @@ func (s MUSUnsafeReuseSerializer) Marshal(o interface{}) ([]byte, error) {
9190
func (s MUSUnsafeReuseSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
9291
v := o.(*goserbench.SmallStruct)
9392
var n int
94-
v.Name, n, err = unsafe.UnmarshalString(bs)
93+
v.Name, n, err = unsafe.UnmarshalString(nil, bs)
9594
if err != nil {
9695
return
9796
}
@@ -105,7 +104,7 @@ func (s MUSUnsafeReuseSerializer) Unmarshal(bs []byte, o interface{}) (err error
105104
return
106105
}
107106
v.BirthDay = time.Unix(0, birthDay64)
108-
v.Phone, n1, err = unsafe.UnmarshalString(bs[n:])
107+
v.Phone, n1, err = unsafe.UnmarshalString(nil, bs[n:])
109108
n += n1
110109
if err != nil {
111110
return

0 commit comments

Comments
 (0)