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

Separate Envelope writing from marshalling #546

Closed
wants to merge 4 commits into from
Closed

Separate Envelope writing from marshalling #546

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d239b9
Flatten marshal and unmarshal
emcfarlane Jul 5, 2023
ea38c47
Encode envelope as a single buffer
emcfarlane Jul 10, 2023
e5503a1
Remove conn lived buffers
emcfarlane Jul 10, 2023
1035d78
Merge branch 'main' into emcfarlane/marshallers
emcfarlane Jul 12, 2023
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
10 changes: 1 addition & 9 deletions buffer_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,7 @@ type bufferPool struct {
sync.Pool
}

func newBufferPool() *bufferPool {
return &bufferPool{
Pool: sync.Pool{
New: func() any {
return bytes.NewBuffer(make([]byte, 0, initialBufferSize))
},
},
}
}
emcfarlane marked this conversation as resolved.
Show resolved Hide resolved
func newBufferPool() *bufferPool { return &bufferPool{} }

func (b *bufferPool) Get() *bytes.Buffer {
if buf, ok := b.Pool.Get().(*bytes.Buffer); ok {
Expand Down
2 changes: 1 addition & 1 deletion connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func receiveUnaryResponse[T any](conn StreamingClientConn) (*Response[T], error)
// In a well-formed stream, the response message may be followed by a block
// of in-stream trailers or HTTP trailers. To ensure that we receive the
// trailers, try to read another message from the stream.
if err := conn.Receive(new(T)); err == nil {
Copy link
Contributor Author

@emcfarlane emcfarlane Jul 10, 2023 •
edited by jhump
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this extra Receive call with this protocol drain fix: #536

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. That'd also let us make the function non-generic, which would cut binary size a bit.

if err := conn.Receive(&msg); err == nil {
return nil, NewError(CodeUnknown, errors.New("unary stream has multiple messages"))
} else if err != nil && !errors.Is(err, io.EOF) {
return nil, NewError(CodeUnknown, err)
Expand Down
1 change: 0 additions & 1 deletion connect_ext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,6 @@ func TestStreamUnexpectedEOF(t *testing.T) {
assert.Equal(t, stream.Msg().Number, 42)
}
assert.NotNil(t, stream.Err())
t.Log(stream.Err())
assert.Equal(t, connect.CodeOf(stream.Err()), testcase.expectCode)
assert.Equal(t, stream.Err().Error(), testcase.expectMsg)
})
Expand Down
Loading