Skip to content

Commit 8ac9d84

Browse files
committed
resolving comments
1 parent f995ff3 commit 8ac9d84

5 files changed

Lines changed: 35 additions & 14 deletions

File tree

google/cloud/opentelemetry/quickstart/quickstart.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ int main(int argc, char* argv[]) {
6363

6464
return 0;
6565
}
66-
//! [all] [END storage_enable_otel_tracing]
66+
//! [all] [END storage_enable_otel_tracing]

google/cloud/storage/client.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,21 @@ bool Client::UseSimpleUpload(std::string const& file_name, std::size_t& size) {
127127
return false;
128128
}
129129

130+
StatusOr<ObjectMetadata> Client::UploadFileSimple(
131+
std::string const& file_name, std::size_t file_size,
132+
internal::InsertObjectMediaRequest& request) {
133+
auto status = connection_->UploadFileSimple(file_name, file_size, request);
134+
if (!status) return status.status();
135+
return connection_->InsertObjectMedia(request);
136+
}
137+
138+
StatusOr<ObjectMetadata> Client::UploadFileResumable(
139+
std::string const& file_name, internal::ResumableUploadRequest& request) {
140+
auto source = connection_->UploadFileResumable(file_name, request);
141+
if (!source) return source.status();
142+
return UploadStreamResumable(*source.value(), request);
143+
}
144+
130145
StatusOr<ObjectMetadata> Client::UploadStreamResumable(
131146
std::istream& source,
132147
internal::ResumableUploadRequest const& request) const {

google/cloud/storage/client.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3511,9 +3511,7 @@ class Client {
35113511
SpanOptions(std::forward<Options>(options)...));
35123512
internal::ResumableUploadRequest request(bucket_name, object_name);
35133513
request.set_multiple_options(std::forward<Options>(options)...);
3514-
auto source = connection_->UploadFileResumable(file_name, request);
3515-
if (!source) return source.status();
3516-
return UploadStreamResumable(*source.value(), request);
3514+
return UploadFileResumable(file_name, request);
35173515
}
35183516

35193517
// The version of UploadFile() where UseResumableUploadSession is *not* one of
@@ -3532,19 +3530,22 @@ class Client {
35323530
internal::InsertObjectMediaRequest request(bucket_name, object_name,
35333531
std::string{});
35343532
request.set_multiple_options(std::forward<Options>(options)...);
3535-
auto status = connection_->UploadFileSimple(file_name, file_size, request);
3536-
if (!status) return status.status();
3537-
return connection_->InsertObjectMedia(request);
3533+
return UploadFileSimple(file_name, file_size, request);
35383534
}
35393535
internal::ResumableUploadRequest request(bucket_name, object_name);
35403536
request.set_multiple_options(std::forward<Options>(options)...);
3541-
auto source = connection_->UploadFileResumable(file_name, request);
3542-
if (!source) return source.status();
3543-
return UploadStreamResumable(*source.value(), request);
3537+
return UploadFileResumable(file_name, request);
35443538
}
35453539

35463540
static bool UseSimpleUpload(std::string const& file_name, std::size_t& size);
35473541

3542+
StatusOr<ObjectMetadata> UploadFileSimple(
3543+
std::string const& file_name, std::size_t file_size,
3544+
internal::InsertObjectMediaRequest request);
3545+
3546+
StatusOr<ObjectMetadata> UploadFileResumable(
3547+
std::string const& file_name, internal::ResumableUploadRequest request);
3548+
35483549
StatusOr<ObjectMetadata> UploadStreamResumable(
35493550
std::istream& source,
35503551
internal::ResumableUploadRequest const& request) const;

google/cloud/storage/internal/connection_impl.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,9 @@ StatusOr<EmptyResponse> StorageConnectionImpl::UploadFileSimple(
801801
return EmptyResponse();
802802
}
803803

804-
StatusOr<std::unique_ptr<std::istream>> StorageConnectionImpl::UploadFileResumable(
805-
std::string const& file_name, ResumableUploadRequest& request) {
804+
StatusOr<std::unique_ptr<std::istream>>
805+
StorageConnectionImpl::UploadFileResumable(std::string const& file_name,
806+
ResumableUploadRequest& request) {
806807
auto upload_offset = request.GetOption<UploadFromOffset>().value_or(0);
807808
auto status = google::cloud::internal::status(file_name);
808809
if (!is_regular(status)) {

google/cloud/storage/internal/storage_connection.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,14 @@ class StorageConnection {
112112
UploadChunkRequest const& request) = 0;
113113
virtual StatusOr<EmptyResponse> UploadFileSimple(
114114
std::string const& file_name, std::size_t file_size,
115-
InsertObjectMediaRequest& request) = 0;
115+
InsertObjectMediaRequest& request) {
116+
return Status(StatusCode::kUnimplemented, "unimplemented");
117+
}
116118
virtual StatusOr<std::unique_ptr<std::istream>> UploadFileResumable(
117119
std::string const& file_name,
118-
ResumableUploadRequest& request) = 0;
120+
ResumableUploadRequest& request) {
121+
return Status(StatusCode::kUnimplemented, "unimplemented");
122+
}
119123
///@}
120124

121125
///@{

0 commit comments

Comments
 (0)