Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Added sync.Pool for the decoder buffers

## v3.133.1
* Added `TopicListener.ReadSessionID()` getter

Expand Down
16 changes: 14 additions & 2 deletions internal/topic/topicreadercommon/decoders.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
)

type PublicResettableReader interface {
Expand Down Expand Up @@ -40,12 +41,18 @@ func newDecoderPool() *decoderPool {
type MultiDecoder struct {
m map[rawtopiccommon.Codec]PublicCreateDecoderFunc

bp xsync.Pool[bytes.Reader]
dp map[rawtopiccommon.Codec]*decoderPool
}

func NewMultiDecoder() *MultiDecoder {
md := &MultiDecoder{
m: make(map[rawtopiccommon.Codec]PublicCreateDecoderFunc),
m: make(map[rawtopiccommon.Codec]PublicCreateDecoderFunc),
bp: xsync.Pool[bytes.Reader]{
New: func() *bytes.Reader {
return bytes.NewReader(nil)
},
},
dp: make(map[rawtopiccommon.Codec]*decoderPool),
}

Expand All @@ -64,7 +71,12 @@ func (d *MultiDecoder) AddDecoder(codec rawtopiccommon.Codec, createFunc PublicC
d.dp[codec] = newDecoderPool()
}

func (d *MultiDecoder) Decode(codec rawtopiccommon.Codec, input io.Reader) (io.Reader, error) {
func (d *MultiDecoder) Decode(codec rawtopiccommon.Codec, rawBytes []byte) (io.Reader, error) {
input := d.bp.GetOrNew()
defer d.bp.Put(input)

input.Reset(rawBytes)

dec, err := d.createDecodeReader(codec, input)
if err != nil {
return nil, err
Expand Down
26 changes: 11 additions & 15 deletions internal/topic/topicreadercommon/decoders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,23 @@ import (
)

func TestMultiDecoder(t *testing.T) {
compressGzip := func(data string) io.Reader {
compressGzip := func(data string) []byte {
buf := &bytes.Buffer{}

gzipWriter := gzip.NewWriter(buf)
_, err := gzipWriter.Write([]byte(data))
require.NoError(t, err)
require.NoError(t, gzipWriter.Close())

return buf
return buf.Bytes()
}

t.Run("NotResettableReader", func(t *testing.T) {
testMultiDecoder := NewMultiDecoder()
require.Len(t, testMultiDecoder.m, 2)
require.Len(t, testMultiDecoder.dp, 2)

buf := &bytes.Buffer{}
_, err := buf.WriteString("test_data")
require.NoError(t, err)

decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecRaw, buf)
decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecRaw, []byte("test_data"))
require.NoError(t, err)

decoded, err := io.ReadAll(decodedReader)
Expand All @@ -44,16 +40,16 @@ func TestMultiDecoder(t *testing.T) {
t.Run("ResettableReader", func(t *testing.T) {
testMultiDecoder := NewMultiDecoder()

encodedReader := compressGzip("test_data_1")
decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedReader)
encodedData := compressGzip("test_data_1")
decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedData)
require.NoError(t, err)

decoded, err := io.ReadAll(decodedReader)
require.NoError(t, err)
require.Equal(t, "test_data_1", string(decoded))

encodedReader = compressGzip("test_data_2")
decodedReader, err = testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedReader)
encodedData = compressGzip("test_data_2")
decodedReader, err = testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedData)
require.NoError(t, err)

decoded, err = io.ReadAll(decodedReader)
Expand All @@ -71,8 +67,8 @@ func TestMultiDecoder(t *testing.T) {
require.Len(t, testMultiDecoder.m, 3)
require.Len(t, testMultiDecoder.dp, 3)

encodedReader := compressGzip("test_data_1")
decodedReader, err := testMultiDecoder.Decode(customCodec, encodedReader)
encodedData := compressGzip("test_data_1")
decodedReader, err := testMultiDecoder.Decode(customCodec, encodedData)
require.NoError(t, err)

decoded, err := io.ReadAll(decodedReader)
Expand All @@ -85,9 +81,9 @@ func TestMultiDecoder(t *testing.T) {

for i := 0; i < 50; i++ {
testMsg := fmt.Sprintf("test_data_%d", i)
encodedReader := compressGzip(testMsg)
encodedData := compressGzip(testMsg)

decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedReader)
decodedReader, err := testMultiDecoder.Decode(rawtopiccommon.CodecGzip, encodedData)
require.NoError(t, err)

decoded, err := io.ReadAll(decodedReader)
Expand Down
2 changes: 1 addition & 1 deletion internal/topic/topicreadercommon/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type PublicMessageContentUnmarshaler interface {

func createReader(decoders *MultiDecoder, codec rawtopiccommon.Codec, rawBytes []byte) oneTimeReader {
var maker readerMaker = func() io.Reader {
reader, err := decoders.Decode(codec, bytes.NewReader(rawBytes))
reader, err := decoders.Decode(codec, rawBytes)
if err != nil {
reader = errorReader{
err: fmt.Errorf("failed to decode message with codec '%v': %w", codec, err),
Expand Down
Loading