Allow streaming uploads to S3. #1813
Merged
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
Currently the interface in the `s3` crate accepts the contents of an upload as a byte slice, which so far isn't much of a problem, since crate uploads are generally below 10MB. When uploading public database dumps to S3 (rust-lang#1800), however, we don't want to keep the whole dump in memory at once. This change basically changes the type of the uploaded content from `&[u8]` to a generic type implementing `std::io::Read + Send + 'static`, which are the trait bounds `reqwest` requires for the request body. The PUT request to S3 needs to include a Content-Length header. Since a `std::io::Read` does not have a length, we need to add another parameter for the content length, and pass it on to `reqwest`.
|
r? @jtgeibel (rust_highfive has picked a reviewer for you, use r? to override) |
smarnach
commented
Aug 27, 2019
| /// It returns a a tuple containing the path of the uploaded file | ||
| /// and its checksum. | ||
| pub fn upload( | ||
| /// It returns the path of the uploaded file. |
There was a problem hiding this comment.
As far as I can tell, the return value is never used, so we could completely get rid of it, but I conservatively kept it for now.
|
@bors: r+ |
|
📌 Commit 44c93be has been approved by |
bors
added a commit
that referenced
this pull request
Aug 29, 2019
Allow streaming uploads to S3. Currently the interface in the `s3` crate accepts the contents of an upload as a byte slice, which so far isn't much of a problem, since crate uploads are generally below 10MB. When uploading public database dumps to S3 (#1800), however, we don't want to keep the whole dump in memory at once. This change basically changes the type of the uploaded content from `&[u8]` to a generic type implementing `std::io::Read + Send + 'static`, which are the trait bounds `reqwest` requires for the request body. The PUT request to S3 needs to include a Content-Length header. Since a `std::io::Read` does not have a length, we need to add another parameter for the content length, and pass it on to `reqwest`.
|
☀️ Test successful - checks-travis |
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.
Currently the interface in the
s3crate accepts the contents of an upload as a byte slice, whichso far isn't much of a problem, since crate uploads are generally below 10MB. When uploading public
database dumps to S3 (#1800), however, we don't want to keep the whole dump in memory at once.
This change basically changes the type of the uploaded content from
&[u8]to a generic typeimplementing
std::io::Read + Send + 'static, which are the trait boundsreqwestrequires for therequest body.
The PUT request to S3 needs to include a Content-Length header. Since a
std::io::Readdoes nothave a length, we need to add another parameter for the content length, and pass it on to
reqwest.