unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #566 from unistack-org/speed

Browse Source 
codec grpc: fix extra allocations on message unmarshal
This commit is contained in:
Asim Aslam
2019-07-04 17:29:32 +01:00
committed by GitHub
parent a412486c39 e40307c567
commit d1fc3c361e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/grpc/codec.go
View File

@@ -4,9 +4,11 @@ import (
"fmt" "fmt"
"strings" "strings"
b "bytes"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
"github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/codec/bytes"
"github.com/micro/go-micro/codec/jsonrpc" "github.com/micro/go-micro/codec/jsonrpc"
@@ -116,7 +118,7 @@ func (jsonCodec) Marshal(v interface{}) ([]byte, error) {
func (jsonCodec) Unmarshal(data []byte, v interface{}) error { func (jsonCodec) Unmarshal(data []byte, v interface{}) error {
if pb, ok := v.(proto.Message); ok { if pb, ok := v.(proto.Message); ok {
return jsonpb.UnmarshalString(string(data), pb) return jsonpb.Unmarshal(b.NewReader(data), pb)
} }
return json.Unmarshal(data, v) return json.Unmarshal(data, v)

4
server/grpc/codec.go
View File

@@ -5,6 +5,8 @@ import (
"fmt" "fmt"
"strings" "strings"
b "bytes"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
@@ -81,7 +83,7 @@ func (jsonCodec) Marshal(v interface{}) ([]byte, error) {
func (jsonCodec) Unmarshal(data []byte, v interface{}) error { func (jsonCodec) Unmarshal(data []byte, v interface{}) error {
if pb, ok := v.(proto.Message); ok { if pb, ok := v.(proto.Message); ok {
return jsonpb.UnmarshalString(string(data), pb) return jsonpb.Unmarshal(b.NewReader(data), pb)
} }
return json.Unmarshal(data, v) return json.Unmarshal(data, v)