diff options
Diffstat (limited to 'src/buildtool/execution_api/remote')
10 files changed, 15 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp index 7247b2c5..c46de66b 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp @@ -16,7 +16,7 @@ #include <utility> // std::move -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" #include "src/buildtool/execution_api/utils/outputscheck.hpp" @@ -45,7 +45,7 @@ BazelAction::BazelAction( auto BazelAction::Execute(Logger const* logger) noexcept -> IExecutionResponse::Ptr { - BlobContainer blobs{}; + BazelBlobContainer blobs{}; auto do_cache = CacheEnabled(cache_flag_); auto action = CreateBundlesForAction(&blobs, root_digest_, not do_cache); @@ -90,7 +90,7 @@ auto BazelAction::Execute(Logger const* logger) noexcept return nullptr; } -auto BazelAction::CreateBundlesForAction(BlobContainer* blobs, +auto BazelAction::CreateBundlesForAction(BazelBlobContainer* blobs, bazel_re::Digest const& exec_dir, bool do_not_cache) const noexcept -> bazel_re::Digest { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.hpp b/src/buildtool/execution_api/remote/bazel/bazel_action.hpp index a01a1695..5abfe57b 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_action.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_action.hpp @@ -58,7 +58,7 @@ class BazelAction final : public IExecutionAction { std::map<std::string, std::string> const& env_vars, std::map<std::string, std::string> const& properties) noexcept; - [[nodiscard]] auto CreateBundlesForAction(BlobContainer* blobs, + [[nodiscard]] auto CreateBundlesForAction(BazelBlobContainer* blobs, bazel_re::Digest const& exec_dir, bool do_not_cache) const noexcept -> bazel_re::Digest; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index 042478c4..33561e91 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -26,7 +26,7 @@ #include "fmt/core.h" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/compatibility/compatibility.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/common_api.hpp" @@ -60,7 +60,7 @@ namespace { auto reader = network->ReadBlobs(digests); auto blobs = reader.Next(); std::size_t count{}; - BlobContainer container{}; + BazelBlobContainer container{}; while (not blobs.empty()) { if (count + blobs.size() > size) { Logger::Log(LogLevel::Warning, @@ -422,7 +422,7 @@ auto BazelApi::CreateAction( return std::nullopt; } -[[nodiscard]] auto BazelApi::Upload(BlobContainer const& blobs, +[[nodiscard]] auto BazelApi::Upload(BazelBlobContainer const& blobs, bool skip_find_missing) noexcept -> bool { return network_->UploadBlobs(blobs, skip_find_missing); } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index 3411b6b7..49827922 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -80,7 +80,7 @@ class BazelApi final : public IExecutionApi { std::vector<Artifact::ObjectInfo> const& artifacts_info, gsl::not_null<IExecutionApi*> const& api) noexcept -> bool final; - [[nodiscard]] auto Upload(BlobContainer const& blobs, + [[nodiscard]] auto Upload(BazelBlobContainer const& blobs, bool skip_find_missing) noexcept -> bool final; [[nodiscard]] auto UploadTree( 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 3b85198e..5feabb57 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -188,7 +188,7 @@ auto BazelCasClient::FindMissingBlobs( auto BazelCasClient::FindMissingBlobs( std::string const& instance_name, - BlobContainer const& blob_container) noexcept + BazelBlobContainer const& blob_container) noexcept -> std::vector<bazel_re::Digest> { auto digests_range = blob_container.Digests(); return FindMissingBlobs( 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 8239107b..92c4a019 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp @@ -27,7 +27,7 @@ #include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/port.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bytestream_client.hpp" #include "src/buildtool/execution_api/remote/config.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 const& blob_container) noexcept + BazelBlobContainer 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 34fe49c7..a537dcdc 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -99,7 +99,7 @@ auto BazelNetwork::DoUploadBlobs(T_Iter const& first, } } -auto BazelNetwork::UploadBlobs(BlobContainer const& blobs, +auto BazelNetwork::UploadBlobs(BazelBlobContainer const& blobs, bool skip_find_missing) noexcept -> bool { if (skip_find_missing) { auto blob_range = blobs.Blobs(); diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp index 2eb7a243..3e2c03fe 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp @@ -25,7 +25,7 @@ #include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/port.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp" @@ -90,7 +90,7 @@ class BazelNetwork { /// \param blobs The blobs to upload /// \param skip_find_missing Skip finding missing blobs, just upload all /// \returns True if upload was successful, false otherwise - [[nodiscard]] auto UploadBlobs(BlobContainer const& blobs, + [[nodiscard]] auto UploadBlobs(BazelBlobContainer const& blobs, bool skip_find_missing = false) noexcept -> bool; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp index a0e96237..90790ef4 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -17,7 +17,6 @@ #include <algorithm> #include "src/buildtool/crypto/hash_function.hpp" -#include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index 3ea82219..9db3bb94 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -212,7 +212,7 @@ auto BazelResponse::Populate() noexcept -> bool { auto BazelResponse::UploadTreeMessageDirectories( bazel_re::Tree const& tree) const -> std::optional<ArtifactDigest> { - BlobContainer dir_blobs{}; + BazelBlobContainer dir_blobs{}; auto rootdir_blob = ProcessDirectoryMessage(tree.root()); if (not rootdir_blob) { |