Flesh out ByteRangeStream methods to make it always limit reads
#213
Conversation
This file contains hidden or 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
|
FYI @stephentoub |
dougbu
commented
Nov 25, 2018
| /// </summary> | ||
| /// <param name="count">The count requested to be read by the caller.</param> | ||
| /// <returns>The remaining bytes to read within the range defined for this stream.</returns> | ||
| private int PrepareStreamForRangeRead(int count) | ||
| { | ||
| long effectiveCount = Math.Min(count, _totalCount - _currentCount); | ||
| if (effectiveCount > 0) | ||
| // A negative count causes base.Raad* methods to throw an ArgumentOutOfRangeException. |
There was a problem hiding this comment.
Rewrote method because _currentCount may now exceed _totalCount and we need to distinguish that case (a no-op) from count < 0 (an error).
mkArtakMSFT
reviewed
Nov 26, 2018
| _currentCount = offset; | ||
| break; | ||
| case SeekOrigin.Current: | ||
| _currentCount = unchecked(_currentCount + offset); |
There was a problem hiding this comment.
From https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/unchecked:
Expressions that contain non-constant terms are unchecked by default at compile time and run time.
There was a problem hiding this comment.
That said, seems you don't need the unchecked context here.
mkArtakMSFT
approved these changes
Nov 26, 2018
- #206 - `Seek(...)` was a no-op, `Position` was incorrect if `_lowerbounds != 0`, `ReadAsync(...)` read entire inner `Stream` - rewrite `ByteRangeStreamTest` to cover new `ByteRangeStream` members and hold fewer resources - remove `DelegatingStream.CopyToAsync(...)` override because it copied entire inner `Stream` and was not needed - base implementation invokes `ReadAsync(...)`
dougbu
force-pushed
the
dougbu/remove.copytoasync.206
branch
from
2d675b0 to
ca41472
Compare
|
🆙📅 to rebase and address @mkArtakMSFT's comment. |
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.
ByteRangeStreamdoes not limitCopyToAsync(...)range as it should #206Seek(...)was a no-op,Positionwas incorrect if_lowerbounds != 0,ReadAsync(...)read entire innerStreamByteRangeStreamTestto cover newByteRangeStreammembers and hold fewer resourcesDelegatingStream.CopyToAsync(...)override because it copied entire innerStreamand was not neededReadAsync(...)