Skip to content

Commit c64402d

Browse files
committed
Fix ci failures
1 parent 50cab61 commit c64402d

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

google/cloud/storage/internal/async/object_descriptor_impl.cc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ void ObjectDescriptorImpl::Cancel() {
5959
}
6060
}
6161

62-
void ObjectDescriptorImpl::CancelStream(
63-
std::shared_ptr<OpenStream> const& stream) {
64-
stream->Cancel();
65-
}
66-
6762
absl::optional<google::storage::v2::Object> ObjectDescriptorImpl::metadata()
6863
const {
6964
std::unique_lock<std::mutex> lk(mu_);
@@ -77,9 +72,8 @@ void ObjectDescriptorImpl::MakeSubsequentStream() {
7772
auto stream_result = make_stream_(std::move(request)).get();
7873

7974
std::unique_lock<std::mutex> lk(mu_);
80-
streams_.push_back(Stream{std::move(stream_result->stream),
81-
{},
82-
resume_policy_prototype_->clone()});
75+
streams_.push_back(Stream{
76+
std::move(stream_result->stream), {}, resume_policy_prototype_->clone()});
8377
lk.unlock();
8478
OnRead(std::move(stream_result->first_response));
8579
}
@@ -231,9 +225,8 @@ void ObjectDescriptorImpl::Resume(google::rpc::Status const& proto_status) {
231225
void ObjectDescriptorImpl::OnResume(StatusOr<OpenStreamResult> result) {
232226
if (!result) return OnFinish(std::move(result).status());
233227
std::unique_lock<std::mutex> lk(mu_);
234-
streams_.push_back(Stream{std::move(result->stream),
235-
{},
236-
resume_policy_prototype_->clone()});
228+
streams_.push_back(
229+
Stream{std::move(result->stream), {}, resume_policy_prototype_->clone()});
237230
// TODO(#15105) - this should be done without release the lock.
238231
Flush(std::move(lk));
239232
OnRead(std::move(result->first_response));
@@ -254,7 +247,7 @@ bool ObjectDescriptorImpl::IsResumable(
254247
return true;
255248
}
256249
return streams_.back().resume_policy->OnFinish(status) ==
257-
storage_experimental::ResumePolicy::kContinue;
250+
storage_experimental::ResumePolicy::kContinue;
258251
}
259252

260253
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/storage/internal/async/object_descriptor_impl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class ObjectDescriptorImpl
9090
return streams_.back().stream;
9191
}
9292

93-
void CancelStream(std::shared_ptr<OpenStream> const& stream);
9493
void Flush(std::unique_lock<std::mutex> lk);
9594
void OnWrite(bool ok);
9695
void DoRead(std::unique_lock<std::mutex>);

0 commit comments

Comments
 (0)