From 6fcbb3ba58fafc1e87f9309bc24d68a65c4fe2f6 Mon Sep 17 00:00:00 2001 From: smallnest Date: Tue, 23 Apr 2024 19:22:55 +0800 Subject: [PATCH] remove json-iterator to simpify deps --- codec/codec.go | 21 ++------------------- go.mod | 3 --- go.sum | 5 ----- protocol/message.go | 2 -- reflection/server_reflection.go | 6 +----- share/share.go | 1 - 6 files changed, 3 insertions(+), 35 deletions(-) diff --git a/codec/codec.go b/codec/codec.go index 8670836..750d3d0 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -6,12 +6,12 @@ import ( "encoding/json" "errors" "fmt" - pb "google.golang.org/protobuf/proto" "reflect" + pb "google.golang.org/protobuf/proto" + "github.com/apache/thrift/lib/go/thrift" "github.com/gogo/protobuf/proto" - jsoniter "github.com/json-iterator/go" "github.com/tinylib/msgp/msgp" "github.com/vmihailenco/msgpack/v5" ) @@ -142,20 +142,3 @@ func (c ThriftCodec) Decode(data []byte, i interface{}) error { d.Transport.Close() return d.Read(context.Background(), i.(thrift.TStruct), data) } - -type JSONIterCodec struct{} - -func (c JSONIterCodec) Encode(i interface{}) ([]byte, error) { - var buf bytes.Buffer - enc := jsoniter.NewEncoder(&buf) - enc.SetEscapeHTML(false) - err := enc.Encode(i) - return buf.Bytes(), err -} - -// Decode decodes an object from slice of bytes. -func (c JSONIterCodec) Decode(data []byte, i interface{}) error { - d := jsoniter.NewDecoder(bytes.NewBuffer(data)) - d.UseNumber() - return d.Decode(i) -} diff --git a/go.mod b/go.mod index c4c2ce7..bb3bd2e 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v0.5.4 github.com/jamiealquiza/tachymeter v2.0.0+incompatible - github.com/json-iterator/go v1.1.12 github.com/juju/ratelimit v1.0.2 github.com/julienschmidt/httprouter v1.3.0 github.com/kavu/go_reuseport v1.5.0 @@ -66,8 +65,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/miekg/dns v1.1.51 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect github.com/onsi/ginkgo/v2 v2.9.5 // indirect github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1 // indirect github.com/philhofer/fwd v1.1.2 // indirect diff --git a/go.sum b/go.sum index 5ef0851..a481fc1 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,6 @@ github.com/jamiealquiza/tachymeter v2.0.0+incompatible h1:mGiF1DGo8l6vnGT8FXNNcI github.com/jamiealquiza/tachymeter v2.0.0+incompatible/go.mod h1:Ayf6zPZKEnLsc3winWEXJRkTBhdHo58HODAu1oFJkYU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/juju/ratelimit v1.0.2 h1:sRxmtRiajbvrcLQT7S+JbqU0ntsb9W2yhSdNN8tWfaI= github.com/juju/ratelimit v1.0.2/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -201,12 +199,9 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= diff --git a/protocol/message.go b/protocol/message.go index 14f19a9..c925453 100644 --- a/protocol/message.go +++ b/protocol/message.go @@ -92,8 +92,6 @@ const ( // Thrift // Thrift for payload Thrift - // JSONIterCodec for payload - JSONIterCodec ) // Message is the generic type of Request and Response. diff --git a/reflection/server_reflection.go b/reflection/server_reflection.go index e955662..6099c95 100644 --- a/reflection/server_reflection.go +++ b/reflection/server_reflection.go @@ -3,6 +3,7 @@ package reflection import ( "bytes" "context" + "encoding/json" "fmt" "path/filepath" "reflect" @@ -12,7 +13,6 @@ import ( "unicode/utf8" "github.com/ChimeraCoder/gojson" - jsoniter "github.com/json-iterator/go" "github.com/smallnest/rpcx/log" ) @@ -21,10 +21,6 @@ var ( typeOfContext = reflect.TypeOf((*context.Context)(nil)).Elem() ) -var json = jsoniter.Config{ - TagKey: "-", -}.Froze() - // ServiceInfo service info. type ServiceInfo struct { Name string diff --git a/share/share.go b/share/share.go index 9edaea3..4302eb8 100644 --- a/share/share.go +++ b/share/share.go @@ -42,7 +42,6 @@ var Codecs = map[protocol.SerializeType]codec.Codec{ protocol.ProtoBuffer: &codec.PBCodec{}, protocol.MsgPack: &codec.MsgpackCodec{}, protocol.Thrift: &codec.ThriftCodec{}, - protocol.JSONIterCodec: &codec.JSONIterCodec{}, } // RegisterCodec register customized codec.