fix: Avoid extra stream copy to memory/temp if we can determine the size #38407
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icewind1991
approved these changes
May 23, 2023
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
juliusknorr
force-pushed
the
bugfix/avoid-extra-stream-copy
branch
from
0277e70 to
a2b37a8
Compare
juliusknorr
changed the title
juliusknorr
added
3. to review
kesselb
reviewed
May 25, 2023
| $buffer->seek(0); | ||
| if ($buffer->getSize() < $this->putSizeLimit) { | ||
| $streamSize = $psrStream->getSize(); | ||
| if ($psrStream->isSeekable() && (int)$streamSize !== 0) { |
There was a problem hiding this comment.
I find it a bit weird to cast here and not above.
It should work though because $buffer->getSize will overwrite it later.
juliusknorr
commented
May 30, 2023
|
#38763 might be the reason why this wasn't working as expected on the mentioned setup |
|
Man, this would really help. Where did the stream behavior change? Is there a chance that I bakcport it already for our Next (V25) release or later - as MagentaCLOUD will hopefully move fast to V27 in fall? If I understand it right the behavior change comes from #34232, which is not merged to stable 24. I assume if I backport both, this could work, right? Thanks. |
Merged
Merged
This was referenced Mar 12, 2024
Merged
Merged
Merged
Merged
|
#49352 is going into a similar direction and was merged now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
On my local setup the stream was seekable and reported the proper size, so I think we can actually avoid the extra effort to copy the stream beginning to memory to determin which upload mechanism to use for cases where a size is reported. The fallback is still in place if the stream reports 0 or null as the size.
Introduced with https://github.com/nextcloud/server/pull/27877/files#diff-030e38a9e621019981acf91654c1d8d3a12ab3150dbd9fcc4c280479b8c853dbR144-R148
Test case needed adjustment since the implementation of a NonSeekableStream falsely reported to be seekable on its metadata.