diff options
Diffstat (limited to 'src/buildtool/execution_api/remote')
3 files changed, 8 insertions, 6 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp index 4b89a23d..3b85198e 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -188,9 +188,11 @@ auto BazelCasClient::FindMissingBlobs( auto BazelCasClient::FindMissingBlobs( std::string const& instance_name, - BlobContainer::DigestList const& digests) noexcept + BlobContainer const& blob_container) noexcept -> std::vector<bazel_re::Digest> { - return FindMissingBlobs(instance_name, digests.begin(), digests.end()); + auto digests_range = blob_container.Digests(); + return FindMissingBlobs( + instance_name, digests_range.begin(), digests_range.end()); } auto BazelCasClient::BatchReadBlobs( diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp index 4b669ab8..b2b80a48 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp @@ -54,7 +54,7 @@ class BazelCasClient { /// \returns The digests of blobs not found in CAS [[nodiscard]] auto FindMissingBlobs( std::string const& instance_name, - BlobContainer::DigestList const& digests) noexcept + BlobContainer const& blob_container) noexcept -> std::vector<bazel_re::Digest>; /// \brief Upload multiple blobs in batch transfer diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index af0365ff..34fe49c7 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -102,12 +102,12 @@ auto BazelNetwork::DoUploadBlobs(T_Iter const& first, auto BazelNetwork::UploadBlobs(BlobContainer const& blobs, bool skip_find_missing) noexcept -> bool { if (skip_find_missing) { - return DoUploadBlobs(blobs.begin(), blobs.end()); + auto blob_range = blobs.Blobs(); + return DoUploadBlobs(blob_range.begin(), blob_range.end()); } // find digests of blobs missing in CAS - auto missing_digests = - cas_->FindMissingBlobs(instance_name_, blobs.Digests()); + auto missing_digests = cas_->FindMissingBlobs(instance_name_, blobs); if (not missing_digests.empty()) { // update missing blobs |