pitrou commented on code in PR #41564:
URL: https://github.com/apache/arrow/pull/41564#discussion_r1603514407
##########
cpp/src/arrow/filesystem/s3fs.cc:
##########
@@ -1768,40 +1846,77 @@ class ObjectOutputStream final : public
io::OutputStream {
}
// Wait for background writes to finish
std::unique_lock<std::mutex> lock(upload_state_->mutex);
- return upload_state_->pending_parts_completed;
+ return upload_state_->pending_uploads_completed;
}
// Upload-related helpers
Status CommitCurrentPart() {
+ if (!is_multipart_created_) {
+ RETURN_NOT_OK(CreateMultipartUpload());
+ }
+
ARROW_ASSIGN_OR_RAISE(auto buf, current_part_->Finish());
current_part_.reset();
current_part_size_ = 0;
return UploadPart(buf);
}
- Status UploadPart(std::shared_ptr<Buffer> buffer) {
- return UploadPart(buffer->data(), buffer->size(), buffer);
+ Status UploadUsingSingleRequest() {
+ std::shared_ptr<Buffer> buf;
+ if (current_part_ == nullptr) {
+ // In case the stream is closed directly after it has been opened
without writing
+ // anything, we'll have to create an empty buffer.
+ buf = Buffer::FromVector<uint8_t>({});
+ } else {
+ ARROW_ASSIGN_OR_RAISE(buf, current_part_->Finish());
+ }
+
+ current_part_.reset();
+ current_part_size_ = 0;
+ return UploadUsingSingleRequest(buf);
}
- Status UploadPart(const void* data, int64_t nbytes,
- std::shared_ptr<Buffer> owned_buffer = nullptr) {
- S3Model::UploadPartRequest req;
+ template <typename RequestType, typename OutcomeType>
+ using UploadResultCallbackFunction =
+ std::function<Status(const RequestType& request,
std::shared_ptr<UploadState>,
+ int32_t, OutcomeType outcome)>;
+
+ template <typename RequestType, typename OutcomeType>
+ static Result<OutcomeType> TriggerUploadRequest(
+ const RequestType& request, const std::shared_ptr<S3ClientHolder>&
holder);
Review Comment:
I don't think this declaration is actually necessary? i.e.
`TriggerUploadRequest` doesn't need to be a template method, it can be a
regular overloaded method.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
