Added the ability to upload files larger than 4MB #2180
Conversation
| } | ||
| index += length; | ||
| bytesLeft -= length; | ||
| if (bytesLeft == 0) break; |
There was a problem hiding this comment.
nit: why not use this as the while loop condition, especially since we do this check at the end of the loop anyway?
| { | ||
| FilePath = filePath; | ||
| FileContent = fileContent; | ||
| if (offset < 0) throw new ArgumentOutOfRangeException(nameof(offset)); |
There was a problem hiding this comment.
Do we need to add checks for offset greater than _length?
There was a problem hiding this comment.
offset can be greater, equal, or less than length. It cannot be greater than fileContent.Length - _length. I will add the check.
| writer.WriteHeader("x-ms-date", Time, 'R'); | ||
| // TODO (pri 3): this allocation should be eliminated | ||
| writer.WriteHeader("x-ms-range", $"bytes=0-{size - 1}"); | ||
|
|
||
| var start = arguments._offset; |
| { | ||
| Memory<byte> buffer = writer.GetMemory(); | ||
| if(buffer.Length > bytesToWrite) |
| @@ -131,14 +138,21 @@ class Writer : StorageRequestWriter<PutRangeRequest> | |||
| public override Http.Method Verb => Http.Method.Put; | |||
|
|
|||
| protected override async Task WriteBody(PipeWriter writer, PutRangeRequest arguments) | |||
| => await writer.WriteAsync(arguments.FileContent); | |||
| { | |||
| var stream = arguments._fileContent; | |||
| { | ||
| FilePath = filePath; | ||
| FileContent = fileContent; | ||
| if (offset < 0 || offset > fileContent.Length - length) throw new ArgumentOutOfRangeException(nameof(offset)); |
There was a problem hiding this comment.
Hmm. What about the case when length > fileContent.Length?
There was a problem hiding this comment.
AORE will be thrown. fileContent.Length - length will be negative and will be < offset (which has to be positive at the time of this check)
KrzysztofCwalina
force-pushed
the
AzCopy
branch
from
b611deb to
474d53f
Compare
| @@ -212,7 +212,7 @@ static void TransferStorageFileToDirectory(ReadOnlySpan<char> storageFile, ReadO | |||
| } | |||
| index += length; | |||
| bytesLeft -= length; | |||
| if (bytesLeft == 0) break; | |||
| Debug.Assert(bytesLeft >= 0); | |||
There was a problem hiding this comment.
I don't think this Debug.Assert is necessary, given the loop condition is already stronger. Maybe a better option would be to add a Debug.Assert after the loop exits, if we know that bytesLeft should never be negative and if that signals a coding bug:
Debug.Assert(bytesLeft == 0);
There was a problem hiding this comment.
The assert ensures bytesLeft is no negative
cc: @ahsonkhan