Skip to content

Commit 21ce1b6

Browse files
mhmtszrmhmtszr
authored
feat: update json library to sonic (#123)
1 parent 26af903 commit 21ce1b6

File tree

11 files changed

+74
-31
lines changed

11 files changed

+74
-31
lines changed

‎couchbase/http_client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/Trendyol/go-dcp/config"
1010

11-
jsoniter "github.com/json-iterator/go"
11+
"github.com/bytedance/sonic"
1212
"github.com/valyala/fasthttp"
1313
)
1414

@@ -68,7 +68,7 @@ func (h *httpClient) doRequest(req *fasthttp.Request, v interface{}) error {
6868
return err
6969
}
7070

71-
err = jsoniter.Unmarshal(res.Body(), v)
71+
err = sonic.Unmarshal(res.Body(), v)
7272
if err != nil {
7373
return err
7474
}

‎couchbase/membership.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"sync"
88
"time"
99

10+
"github.com/bytedance/sonic"
11+
1012
"github.com/asaskevich/EventBus"
1113

1214
"github.com/Trendyol/go-dcp/config"
@@ -15,8 +17,6 @@ import (
1517
"github.com/Trendyol/go-dcp/logger"
1618
"github.com/Trendyol/go-dcp/membership"
1719

18-
"github.com/json-iterator/go"
19-
2020
"github.com/google/uuid"
2121

2222
"github.com/couchbase/gocbcore/v10"
@@ -79,7 +79,7 @@ func (h *cbMembership) register() {
7979
ClusterJoinTime: now,
8080
}
8181

82-
payload, _ := jsoniter.Marshal(instance)
82+
payload, _ := sonic.Marshal(instance)
8383

8484
err = UpdateDocument(ctx, h.client.GetMetaAgent(), h.scopeName, h.collectionName, h.id, payload, h.membershipConfig.ExpirySeconds, nil)
8585

@@ -108,7 +108,7 @@ func (h *cbMembership) register() {
108108
}
109109

110110
func (h *cbMembership) createIndex(ctx context.Context, clusterJoinTime int64) error {
111-
payload, _ := jsoniter.Marshal(clusterJoinTime)
111+
payload, _ := sonic.Marshal(clusterJoinTime)
112112

113113
return CreatePath(ctx, h.client.GetMetaAgent(), h.scopeName, h.collectionName, h.instanceAll, h.id, payload, memd.SubdocDocFlagMkDoc)
114114
}
@@ -137,7 +137,7 @@ func (h *cbMembership) heartbeat() {
137137
ClusterJoinTime: h.clusterJoinTime,
138138
}
139139

140-
payload, _ := jsoniter.Marshal(instance)
140+
payload, _ := sonic.Marshal(instance)
141141

142142
err := UpdateDocument(ctx, h.client.GetMetaAgent(), h.scopeName, h.collectionName, h.id, payload, h.membershipConfig.ExpirySeconds, nil)
143143
if err != nil {
@@ -169,7 +169,7 @@ func (h *cbMembership) monitor() {
169169

170170
all := map[string]int64{}
171171

172-
err = jsoniter.Unmarshal(data.Value, &all)
172+
err = sonic.Unmarshal(data.Value, &all)
173173
if err != nil {
174174
logger.Log.Error("error while monitor try to unmarshal index: %v", err)
175175
return
@@ -205,7 +205,7 @@ func (h *cbMembership) monitor() {
205205

206206
copyID := id
207207
instance := &Instance{ID: &copyID}
208-
err = jsoniter.Unmarshal(doc.Value, instance)
208+
err = sonic.Unmarshal(doc.Value, instance)
209209
if err != nil {
210210
logger.Log.Error("error while monitor try to unmarshal instance %v, err: %v", string(doc.Value), err)
211211
panic(err)
@@ -249,7 +249,7 @@ func (h *cbMembership) updateIndex(ctx context.Context, instances []Instance, ca
249249
all[*instance.ID] = instance.ClusterJoinTime
250250
}
251251

252-
payload, _ := jsoniter.Marshal(all)
252+
payload, _ := sonic.Marshal(all)
253253

254254
err := UpdateDocument(ctx, h.client.GetMetaAgent(), h.scopeName, h.collectionName, h.instanceAll, payload, 0, &cas)
255255
if err != nil {

‎couchbase/metadata.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"strings"
88
"sync"
99

10+
"github.com/bytedance/sonic"
11+
1012
"github.com/couchbase/gocbcore/v10"
1113

1214
"github.com/Trendyol/go-dcp/wrapper"
@@ -20,8 +22,6 @@ import (
2022
"github.com/Trendyol/go-dcp/metadata"
2123
"github.com/Trendyol/go-dcp/models"
2224

23-
"github.com/json-iterator/go"
24-
2525
"github.com/couchbase/gocbcore/v10/memd"
2626
)
2727

@@ -49,7 +49,7 @@ func (s *cbMetadata) Save(state map[uint16]*models.CheckpointDocument, dirtyOffs
4949
func (s *cbMetadata) saveVBucketCheckpoint(ctx context.Context, vbID uint16, checkpointDocument *models.CheckpointDocument) func() error {
5050
return func() error {
5151
id := getCheckpointID(vbID, s.config.Dcp.Group.Name)
52-
payload, _ := jsoniter.Marshal(checkpointDocument)
52+
payload, _ := sonic.Marshal(checkpointDocument)
5353
err := UpsertXattrs(ctx, s.client.GetMetaAgent(), s.scopeName, s.collectionName, id, helpers.Name, payload, 0)
5454

5555
var kvErr *gocbcore.KeyValueError
@@ -86,7 +86,7 @@ func (s *cbMetadata) Load(
8686
var doc *models.CheckpointDocument
8787

8888
if err == nil {
89-
err = jsoniter.Unmarshal(data, &doc)
89+
err = sonic.Unmarshal(data, &doc)
9090

9191
if err != nil {
9292
doc = models.NewEmptyCheckpointDocument(bucketUUID)

‎dcp.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111
"strings"
1212
"syscall"
1313

14+
"github.com/bytedance/sonic"
15+
1416
"github.com/Trendyol/go-dcp/tracing"
1517

1618
"github.com/Trendyol/go-dcp/metric"
@@ -21,8 +23,6 @@ import (
2123

2224
"github.com/sirupsen/logrus"
2325

24-
jsoniter "github.com/json-iterator/go"
25-
2626
"gopkg.in/yaml.v3"
2727

2828
"github.com/prometheus/client_golang/prometheus"
@@ -369,7 +369,7 @@ func NewDcpWithLogger(cfg any, listener models.Listener, logrus *logrus.Logger)
369369

370370
func printConfiguration(config config.Dcp) {
371371
config.Password = "*****"
372-
configJSON, _ := jsoniter.Marshal(config)
372+
configJSON, _ := sonic.Marshal(config)
373373

374374
dst := &bytes.Buffer{}
375375
if err := json.Compact(dst, configJSON); err != nil {

‎go.mod‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ retract (
1010
require (
1111
github.com/ansrivas/fiberprometheus/v2 v2.7.0
1212
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
13+
github.com/bytedance/sonic v1.12.8
1314
github.com/couchbase/gocbcore/v10 v10.5.2
1415
github.com/gofiber/fiber/v2 v2.52.5
1516
github.com/google/uuid v1.6.0
16-
github.com/json-iterator/go v1.1.12
1717
github.com/mhmtszr/concurrent-swiss-map v1.0.8
1818
github.com/prometheus/client_golang v1.20.5
1919
github.com/sirupsen/logrus v1.9.3
@@ -27,7 +27,9 @@ require (
2727
require (
2828
github.com/andybalholm/brotli v1.1.1 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
30+
github.com/bytedance/sonic/loader v0.2.2 // indirect
3031
github.com/cespare/xxhash/v2 v2.3.0 // indirect
32+
github.com/cloudwego/base64x v0.1.5 // indirect
3133
github.com/davecgh/go-spew v1.1.1 // indirect
3234
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3335
github.com/go-logr/logr v1.4.1 // indirect
@@ -40,7 +42,9 @@ require (
4042
github.com/google/gnostic-models v0.6.8 // indirect
4143
github.com/google/gofuzz v1.2.0 // indirect
4244
github.com/josharian/intern v1.0.0 // indirect
45+
github.com/json-iterator/go v1.1.12 // indirect
4346
github.com/klauspost/compress v1.17.11 // indirect
47+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
4448
github.com/mailru/easyjson v0.7.7 // indirect
4549
github.com/mattn/go-colorable v0.1.13 // indirect
4650
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -52,8 +56,10 @@ require (
5256
github.com/prometheus/common v0.58.0 // indirect
5357
github.com/prometheus/procfs v0.15.1 // indirect
5458
github.com/rivo/uniseg v0.4.7 // indirect
59+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
5560
github.com/valyala/bytebufferpool v1.0.0 // indirect
5661
github.com/valyala/tcplisten v1.0.0 // indirect
62+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
5763
golang.org/x/net v0.30.0 // indirect
5864
golang.org/x/oauth2 v0.22.0 // indirect
5965
golang.org/x/sys v0.26.0 // indirect

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP
66
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII=
77
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
88
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
9+
github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs=
10+
github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
11+
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
12+
github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o=
13+
github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
914
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
1015
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
16+
github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
17+
github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
18+
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
1119
github.com/couchbase/gocbcore/v10 v10.5.2 h1:DHK042E1RfhPBR3b14CITl5XHRsLjH3hpERuwUc5UIg=
1220
github.com/couchbase/gocbcore/v10 v10.5.2/go.mod h1:rulbgUK70EuyRUiLQ0LhQAfSI/Rl+jWws8tTbHzvB6M=
1321
github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259 h1:2TXy68EGEzIMHOx9UvczR5ApVecwCfQZ0LjkmwMI6g4=
@@ -56,6 +64,9 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
5664
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
5765
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
5866
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
67+
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
68+
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
69+
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
5970
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
6071
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
6172
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -114,6 +125,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
114125
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
115126
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
116127
github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU=
128+
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
129+
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
117130
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
118131
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
119132
github.com/valyala/fasthttp v1.57.0 h1:Xw8SjWGEP/+wAAgyy5XTvgrWlOD1+TxbbvNADYCm1Tg=
@@ -124,6 +137,8 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ
124137
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
125138
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
126139
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
140+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU=
141+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
127142
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
128143
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
129144
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -192,6 +207,7 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
192207
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
193208
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
194209
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
210+
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
195211
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
196212
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
197213
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

‎metadata/file_metadata.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ import (
44
"errors"
55
"os"
66

7+
"github.com/bytedance/sonic"
8+
79
"github.com/Trendyol/go-dcp/wrapper"
810

911
"github.com/Trendyol/go-dcp/config"
1012

1113
"github.com/Trendyol/go-dcp/models"
1214

1315
"github.com/Trendyol/go-dcp/logger"
14-
15-
"github.com/json-iterator/go"
1616
)
1717

1818
type fileMetadata struct { //nolint:unused
1919
fileName string
2020
}
2121

2222
func (s *fileMetadata) Save(state map[uint16]*models.CheckpointDocument, _ map[uint16]bool, _ string) error { //nolint:unused
23-
file, _ := jsoniter.MarshalIndent(state, "", " ")
23+
file, _ := sonic.MarshalIndent(state, "", " ")
2424
_ = os.WriteFile(s.fileName, file, 0o644) //nolint:gosec
2525
return nil
2626
}

‎models/identity.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package models
22

33
import (
4-
"github.com/json-iterator/go"
5-
64
"github.com/Trendyol/go-dcp/logger"
5+
"github.com/bytedance/sonic"
76
)
87

98
type Identity struct {
@@ -13,7 +12,7 @@ type Identity struct {
1312
}
1413

1514
func (k *Identity) String() string {
16-
str, err := jsoniter.Marshal(k)
15+
str, err := sonic.Marshal(k)
1716
if err != nil {
1817
logger.Log.Error("error while marshalling identity, err: %v", err)
1918
panic(err)
@@ -29,7 +28,7 @@ func (k *Identity) Equal(other *Identity) bool {
2928
func NewIdentityFromStr(str string) *Identity {
3029
var identity Identity
3130

32-
err := jsoniter.Unmarshal([]byte(str), &identity)
31+
err := sonic.Unmarshal([]byte(str), &identity)
3332
if err != nil {
3433
logger.Log.Error("error while unmarshalling identity, err: %v", err)
3534
panic(err)

‎test/integration/go.mod‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ require (
2020
github.com/ansrivas/fiberprometheus/v2 v2.7.0 // indirect
2121
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/bytedance/sonic v1.12.8 // indirect
24+
github.com/bytedance/sonic/loader v0.2.2 // indirect
2325
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2426
github.com/cespare/xxhash/v2 v2.3.0 // indirect
27+
github.com/cloudwego/base64x v0.1.5 // indirect
2528
github.com/containerd/containerd v1.7.18 // indirect
2629
github.com/containerd/log v0.1.0 // indirect
2730
github.com/containerd/platforms v0.2.1 // indirect
@@ -47,6 +50,7 @@ require (
4750
github.com/josharian/intern v1.0.0 // indirect
4851
github.com/json-iterator/go v1.1.12 // indirect
4952
github.com/klauspost/compress v1.17.11 // indirect
53+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
5054
github.com/lufia/plan9stats v0.0.0-20240819163618-b1d8f4d146e7 // indirect
5155
github.com/magiconair/properties v1.8.7 // indirect
5256
github.com/mailru/easyjson v0.7.7 // indirect
@@ -77,6 +81,7 @@ require (
7781
github.com/sirupsen/logrus v1.9.3 // indirect
7882
github.com/tklauser/go-sysconf v0.3.14 // indirect
7983
github.com/tklauser/numcpus v0.8.0 // indirect
84+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
8085
github.com/valyala/bytebufferpool v1.0.0 // indirect
8186
github.com/valyala/fasthttp v1.57.0 // indirect
8287
github.com/valyala/tcplisten v1.0.0 // indirect
@@ -85,6 +90,7 @@ require (
8590
go.opentelemetry.io/otel v1.24.0 // indirect
8691
go.opentelemetry.io/otel/metric v1.24.0 // indirect
8792
go.opentelemetry.io/otel/trace v1.24.0 // indirect
93+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
8894
golang.org/x/crypto v0.28.0 // indirect
8995
golang.org/x/net v0.30.0 // indirect
9096
golang.org/x/oauth2 v0.22.0 // indirect

0 commit comments

Comments
 (0)