Skip to content

Commit ee3fb29

Browse files
authored
cleanup: use SliceBuffer directly where no pool is available (#7827)
1 parent d7f27c4 commit ee3fb29

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

codec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (c codecV0Bridge) Marshal(v any) (mem.BufferSlice, error) {
7171
if err != nil {
7272
return nil, err
7373
}
74-
return mem.BufferSlice{mem.NewBuffer(&data, nil)}, nil
74+
return mem.BufferSlice{mem.SliceBuffer(data)}, nil
7575
}
7676

7777
func (c codecV0Bridge) Unmarshal(data mem.BufferSlice, v any) (err error) {

internal/transport/transport_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func init() {
7676
}
7777

7878
func newBufferSlice(b []byte) mem.BufferSlice {
79-
return mem.BufferSlice{mem.NewBuffer(&b, nil)}
79+
return mem.BufferSlice{mem.SliceBuffer(b)}
8080
}
8181

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

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

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

18131813
for i := 0; i < 2; i++ {
18141814
inBuf := make([]byte, 1)

preloader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (p *PreparedMsg) Encode(s Stream, msg any) error {
6262

6363
materializedData := data.Materialize()
6464
data.Free()
65-
p.encodedData = mem.BufferSlice{mem.NewBuffer(&materializedData, nil)}
65+
p.encodedData = mem.BufferSlice{mem.SliceBuffer(materializedData)}
6666

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

8282
p.hdr, p.payload = msgHeader(p.encodedData, compData, p.pf)

rpc_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ func recvAndDecompress(p *parser, s recvCompressor, dc Decompressor, maxReceiveM
841841
var uncompressedBuf []byte
842842
uncompressedBuf, err = dc.Do(compressed.Reader())
843843
if err == nil {
844-
out = mem.BufferSlice{mem.NewBuffer(&uncompressedBuf, nil)}
844+
out = mem.BufferSlice{mem.SliceBuffer(uncompressedBuf)}
845845
}
846846
size = len(uncompressedBuf)
847847
} else {

rpc_util_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ func (f *fullReader) Read(n int) (mem.BufferSlice, error) {
5959
if len(f.data) < n {
6060
data := f.data
6161
f.data = nil
62-
return mem.BufferSlice{mem.NewBuffer(&data, nil)}, io.ErrUnexpectedEOF
62+
return mem.BufferSlice{mem.SliceBuffer(data)}, io.ErrUnexpectedEOF
6363
}
6464

6565
buf := f.data[:n]
6666
f.data = f.data[n:]
6767

68-
return mem.BufferSlice{mem.NewBuffer(&buf, nil)}, nil
68+
return mem.BufferSlice{mem.SliceBuffer(buf)}, nil
6969
}
7070

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

0 commit comments

Comments
 (0)