Skip to content

Commit

Permalink
cleanup: use SliceBuffer directly where no pool is available (grpc#7827)
Browse files Browse the repository at this point in the history
  • Loading branch information
ash2k authored Nov 18, 2024
1 parent d7f27c4 commit ee3fb29
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (c codecV0Bridge) Marshal(v any) (mem.BufferSlice, error) {
if err != nil {
return nil, err
}
return mem.BufferSlice{mem.NewBuffer(&data, nil)}, nil
return mem.BufferSlice{mem.SliceBuffer(data)}, nil
}

func (c codecV0Bridge) Unmarshal(data mem.BufferSlice, v any) (err error) {
Expand Down
8 changes: 4 additions & 4 deletions internal/transport/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func init() {
}

func newBufferSlice(b []byte) mem.BufferSlice {
return mem.BufferSlice{mem.NewBuffer(&b, nil)}
return mem.BufferSlice{mem.SliceBuffer(b)}
}

func (s *Stream) readTo(p []byte) (int, error) {
Expand Down Expand Up @@ -1796,7 +1796,7 @@ func (s) TestReadGivesSameErrorAfterAnyErrorOccurs(t *testing.T) {
testData := make([]byte, 1)
testData[0] = 5
testErr := errors.New("test error")
s.write(recvMsg{buffer: mem.NewBuffer(&testData, nil), err: testErr})
s.write(recvMsg{buffer: mem.SliceBuffer(testData), err: testErr})

inBuf := make([]byte, 1)
actualCount, actualErr := s.readTo(inBuf)
Expand All @@ -1807,8 +1807,8 @@ func (s) TestReadGivesSameErrorAfterAnyErrorOccurs(t *testing.T) {
t.Errorf("_ , actualErr := s.Read(_) differs; want actualErr.Error() to be %v; got %v", testErr.Error(), actualErr.Error())
}

s.write(recvMsg{buffer: mem.NewBuffer(&testData, nil), err: nil})
s.write(recvMsg{buffer: mem.NewBuffer(&testData, nil), err: errors.New("different error from first")})
s.write(recvMsg{buffer: mem.SliceBuffer(testData), err: nil})
s.write(recvMsg{buffer: mem.SliceBuffer(testData), err: errors.New("different error from first")})

for i := 0; i < 2; i++ {
inBuf := make([]byte, 1)
Expand Down
4 changes: 2 additions & 2 deletions preloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (p *PreparedMsg) Encode(s Stream, msg any) error {

materializedData := data.Materialize()
data.Free()
p.encodedData = mem.BufferSlice{mem.NewBuffer(&materializedData, nil)}
p.encodedData = mem.BufferSlice{mem.SliceBuffer(materializedData)}

// TODO: it should be possible to grab the bufferPool from the underlying
// stream implementation with a type cast to its actual type (such as
Expand All @@ -76,7 +76,7 @@ func (p *PreparedMsg) Encode(s Stream, msg any) error {
if p.pf.isCompressed() {
materializedCompData := compData.Materialize()
compData.Free()
compData = mem.BufferSlice{mem.NewBuffer(&materializedCompData, nil)}
compData = mem.BufferSlice{mem.SliceBuffer(materializedCompData)}
}

p.hdr, p.payload = msgHeader(p.encodedData, compData, p.pf)
Expand Down
2 changes: 1 addition & 1 deletion rpc_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ func recvAndDecompress(p *parser, s recvCompressor, dc Decompressor, maxReceiveM
var uncompressedBuf []byte
uncompressedBuf, err = dc.Do(compressed.Reader())
if err == nil {
out = mem.BufferSlice{mem.NewBuffer(&uncompressedBuf, nil)}
out = mem.BufferSlice{mem.SliceBuffer(uncompressedBuf)}
}
size = len(uncompressedBuf)
} else {
Expand Down
4 changes: 2 additions & 2 deletions rpc_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ func (f *fullReader) Read(n int) (mem.BufferSlice, error) {
if len(f.data) < n {
data := f.data
f.data = nil
return mem.BufferSlice{mem.NewBuffer(&data, nil)}, io.ErrUnexpectedEOF
return mem.BufferSlice{mem.SliceBuffer(data)}, io.ErrUnexpectedEOF
}

buf := f.data[:n]
f.data = f.data[n:]

return mem.BufferSlice{mem.NewBuffer(&buf, nil)}, nil
return mem.BufferSlice{mem.SliceBuffer(buf)}, nil
}

var _ CallOption = EmptyCallOption{} // ensure EmptyCallOption implements the interface
Expand Down

0 comments on commit ee3fb29

Please sign in to comment.