diff options
Diffstat (limited to 'src/buildtool/execution_api')
11 files changed, 17 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp index d5daa3dd..f58e4893 100644 --- a/src/buildtool/execution_api/common/common_api.hpp +++ b/src/buildtool/execution_api/common/common_api.hpp @@ -84,7 +84,7 @@ template <typename TValue, typename TIterator> return std::nullopt; } } - res.digests = api.IsAvailable(digests); + res.digests = api.GetMissingDigests(digests); return res; } diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp index b868b57d..f0ea0e4e 100644 --- a/src/buildtool/execution_api/common/execution_api.hpp +++ b/src/buildtool/execution_api/common/execution_api.hpp @@ -129,7 +129,7 @@ class IExecutionApi { [[nodiscard]] virtual auto IsAvailable( ArtifactDigest const& digest) const noexcept -> bool = 0; - [[nodiscard]] virtual auto IsAvailable( + [[nodiscard]] virtual auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> = 0; diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp index 7fd21005..5defc50a 100644 --- a/src/buildtool/execution_api/git/git_api.hpp +++ b/src/buildtool/execution_api/git/git_api.hpp @@ -328,7 +328,7 @@ class GitApi final : public IExecutionApi { .has_value(); } - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> override { std::unordered_set<ArtifactDigest> result; diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index f1e448a0..a9d6b660 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -312,7 +312,7 @@ class LocalApi final : public IExecutionApi { return found; } - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> final { std::unordered_set<ArtifactDigest> result; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index 66f81d01..ae5285df 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -117,7 +117,7 @@ namespace { } // Fetch unknown chunks. - auto missing_artifact_digests = other_api.IsAvailable( + auto missing_artifact_digests = other_api.GetMissingDigests( std::unordered_set(chunk_digests->begin(), chunk_digests->end())); std::vector<ArtifactDigest> missing_digests; @@ -570,7 +570,7 @@ auto BazelApi::CreateAction( return network_->IsAvailable(ArtifactDigestFactory::ToBazel(digest)); } -[[nodiscard]] auto BazelApi::IsAvailable( +[[nodiscard]] auto BazelApi::GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> { auto const back_map = BackMap<bazel_re::Digest, ArtifactDigest>::Make( @@ -579,7 +579,7 @@ auto BazelApi::CreateAction( return digests; } - auto const bazel_result = network_->IsAvailable(back_map->GetKeys()); + auto const bazel_result = network_->FindMissingBlobs(back_map->GetKeys()); return back_map->GetValues(bazel_result); } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index de4662db..22680aac 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -102,7 +102,7 @@ class BazelApi final : public IExecutionApi { [[nodiscard]] auto IsAvailable(ArtifactDigest const& digest) const noexcept -> bool final; - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> final; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index eb18a858..3f33136a 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -47,7 +47,7 @@ auto BazelNetwork::IsAvailable(bazel_re::Digest const& digest) const noexcept return cas_->FindMissingBlobs(instance_name_, {digest}).empty(); } -auto BazelNetwork::IsAvailable( +auto BazelNetwork::FindMissingBlobs( std::unordered_set<bazel_re::Digest> const& digests) const noexcept -> std::unordered_set<bazel_re::Digest> { return cas_->FindMissingBlobs(instance_name_, digests); diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp index 0b141845..2e99de9f 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.hpp @@ -52,7 +52,7 @@ class BazelNetwork { [[nodiscard]] auto IsAvailable( bazel_re::Digest const& digest) const noexcept -> bool; - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto FindMissingBlobs( std::unordered_set<bazel_re::Digest> const& digests) const noexcept -> std::unordered_set<bazel_re::Digest>; diff --git a/src/buildtool/execution_api/serve/mr_git_api.hpp b/src/buildtool/execution_api/serve/mr_git_api.hpp index b03bfcf1..dbcedb61 100644 --- a/src/buildtool/execution_api/serve/mr_git_api.hpp +++ b/src/buildtool/execution_api/serve/mr_git_api.hpp @@ -123,7 +123,7 @@ class MRGitApi final : public IExecutionApi { } /// \brief Not implemented. - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& /*digests*/) const noexcept -> std::unordered_set<ArtifactDigest> final { // Not supported. diff --git a/src/buildtool/execution_api/serve/mr_local_api.cpp b/src/buildtool/execution_api/serve/mr_local_api.cpp index 5449b245..0e2f61e1 100644 --- a/src/buildtool/execution_api/serve/mr_local_api.cpp +++ b/src/buildtool/execution_api/serve/mr_local_api.cpp @@ -124,8 +124,9 @@ auto MRLocalApi::IsAvailable(ArtifactDigest const& digest) const noexcept return compat_local_api_->IsAvailable(digest); } -auto MRLocalApi::IsAvailable(std::unordered_set<ArtifactDigest> const& digests) - const noexcept -> std::unordered_set<ArtifactDigest> { +auto MRLocalApi::GetMissingDigests( + std::unordered_set<ArtifactDigest> const& digests) const noexcept + -> std::unordered_set<ArtifactDigest> { // This method can legitimately be called with both native and // compatible digests when in compatible mode, therefore we need to // interrogate the hash type of the input. @@ -136,7 +137,7 @@ auto MRLocalApi::IsAvailable(std::unordered_set<ArtifactDigest> const& digests) } // native digests get dispatched to native local api if (ProtocolTraits::IsNative(digests.begin()->GetHashType())) { - return native_local_api_->IsAvailable(digests); + return native_local_api_->GetMissingDigests(digests); } // compatible digests get dispatched to compatible local api if (compat_local_api_ == nullptr) { @@ -144,5 +145,5 @@ auto MRLocalApi::IsAvailable(std::unordered_set<ArtifactDigest> const& digests) "MRLocalApi: Unexpected digest type provided"); return {}; } - return compat_local_api_->IsAvailable(digests); + return compat_local_api_->GetMissingDigests(digests); } diff --git a/src/buildtool/execution_api/serve/mr_local_api.hpp b/src/buildtool/execution_api/serve/mr_local_api.hpp index c548241e..a4f6e0b1 100644 --- a/src/buildtool/execution_api/serve/mr_local_api.hpp +++ b/src/buildtool/execution_api/serve/mr_local_api.hpp @@ -126,7 +126,7 @@ class MRLocalApi final : public IExecutionApi { /// \note The caller is responsible for passing vectors with digests of the /// same type. For simplicity, this method takes the first digest of the /// vector as representative for figuring out hash function type. - [[nodiscard]] auto IsAvailable( + [[nodiscard]] auto GetMissingDigests( std::unordered_set<ArtifactDigest> const& digests) const noexcept -> std::unordered_set<ArtifactDigest> final; |