Fix LengthDelimitedCodec buffer over-reservation. #4997
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
LengthDelimitedCodec
callsBytesMut::reserve
on two occasions:In both cases, the implementation currently calls
src.reserve(n)
which reserves the necessaryn
bytes for additional data, disregarding the fact that the buffer might already have additional data present that just wasn't decoded yet.Motivation
This causes excess memory allocation, which might be quite substantial in certain cases.
Solution
Take into account the buffer's current length when calculating the amount of memory that should be reserved.
As a small drive-by cleanup, I also removed a check that
n != 0
before calling tosrc.advance(n)
, since that is redundant according to the docs:Not sure if/how to write tests for this, any feedback would be welcome.