Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use streaming implementation of thriftrw encoder/decoder #4568

Merged
merged 2 commits into from
Nov 19, 2021
Merged

Use streaming implementation of thriftrw encoder/decoder #4568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d01a0
Use streaming implementation of thriftrw encoder/decoder
Shaddoll Oct 8, 2021
362794a
Merge branch 'master' into thriftrw-opt
Shaddoll Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/codec/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package codec

import (
"go.uber.org/thriftrw/protocol/stream"
"go.uber.org/thriftrw/wire"

"github.com/uber/cadence/common/types"
Expand All @@ -37,6 +38,8 @@ type (
ThriftObject interface {
FromWire(w wire.Value) error
ToWire() (wire.Value, error)
Encode(stream.Writer) error
Decode(stream.Reader) error
}
)

Expand Down
29 changes: 11 additions & 18 deletions common/codec/version0Thriftrw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ package codec
import (
"bytes"

"go.uber.org/thriftrw/protocol"
"go.uber.org/thriftrw/wire"
"go.uber.org/thriftrw/protocol/binary"
)

type (
Expand Down Expand Up @@ -52,33 +51,27 @@ func (t *ThriftRWEncoder) Encode(obj ThriftObject) ([]byte, error) {
if err != nil {
return nil, err
}
val, err := obj.ToWire()
if err != nil {
return nil, err
}
err = protocol.Binary.Encode(val, &writer)
if err != nil {

sw := binary.Default.Writer(&writer)
defer sw.Close()
if err := obj.Encode(sw); err != nil {
return nil, err
}
return writer.Bytes(), nil
}

// Decode decode the object
func (t *ThriftRWEncoder) Decode(binary []byte, val ThriftObject) error {
if len(binary) < 1 {
func (t *ThriftRWEncoder) Decode(b []byte, val ThriftObject) error {
if len(b) < 1 {
return MissingBinaryEncodingVersion
}

version := binary[0]
version := b[0]
if version != preambleVersion0 {
return InvalidBinaryEncodingVersion
}

reader := bytes.NewReader(binary[1:])
wireVal, err := protocol.Binary.Decode(reader, wire.TStruct)
if err != nil {
return err
}

return val.FromWire(wireVal)
reader := bytes.NewReader(b[1:])
sr := binary.Default.Reader(reader)
return val.Decode(sr)
}
3 changes: 3 additions & 0 deletions common/persistence/serialization/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ package serialization
import (
"time"

"go.uber.org/thriftrw/protocol/stream"
"go.uber.org/thriftrw/wire"

"github.com/uber/cadence/.gen/go/sqlblobs"
Expand Down Expand Up @@ -391,5 +392,7 @@ type (
thriftRWType interface {
ToWire() (wire.Value, error)
FromWire(w wire.Value) error
Encode(stream.Writer) error
Decode(stream.Reader) error
}
)
11 changes: 4 additions & 7 deletions common/persistence/serialization/thrift_decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ package serialization
import (
"bytes"

"go.uber.org/thriftrw/protocol"
"go.uber.org/thriftrw/wire"
"go.uber.org/thriftrw/protocol/binary"

"github.com/uber/cadence/.gen/go/sqlblobs"
)
Expand Down Expand Up @@ -160,9 +159,7 @@ func (d *thriftDecoder) replicationTaskInfoFromBlob(data []byte) (*ReplicationTa
}

func thriftRWDecode(b []byte, result thriftRWType) error {
value, err := protocol.Binary.Decode(bytes.NewReader(b), wire.TStruct)
if err != nil {
return err
}
return result.FromWire(value)
buf := bytes.NewReader(b)
sr := binary.Default.Reader(buf)
return result.Decode(sr)
}
10 changes: 4 additions & 6 deletions common/persistence/serialization/thrift_encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package serialization
import (
"bytes"

"go.uber.org/thriftrw/protocol"
"go.uber.org/thriftrw/protocol/binary"

"github.com/uber/cadence/common"
)
Expand Down Expand Up @@ -101,12 +101,10 @@ func (e *thriftEncoder) encodingType() common.EncodingType {
}

func thriftRWEncode(t thriftRWType) ([]byte, error) {
value, err := t.ToWire()
if err != nil {
return nil, err
}
var b bytes.Buffer
if err := protocol.Binary.Encode(value, &b); err != nil {
sw := binary.Default.Writer(&b)
defer sw.Close()
if err := t.Encode(sw); err != nil {
return nil, err
}
return b.Bytes(), nil
Expand Down