diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2025-01-29 09:46:58 +0100 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2025-02-07 14:58:04 +0100 |
| commit | 95792fb717bd84d500037b62c77a4949274e670d (patch) | |
| tree | 9bb1765a57e4d6d42941a33aff7e9721dec8068e /src/buildtool/execution_api/git/git_api.hpp | |
| parent | ea2291d24d531a1ea221f1035636303ac0da787d (diff) | |
| download | justbuild-95792fb717bd84d500037b62c77a4949274e670d.tar.gz | |
Replace ArtifactBlobContainer and BazelBlobContainer
...with explicit std::unordered_set.
Diffstat (limited to 'src/buildtool/execution_api/git/git_api.hpp')
| -rw-r--r-- | src/buildtool/execution_api/git/git_api.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp index 5defc50a..55bdaabe 100644 --- a/src/buildtool/execution_api/git/git_api.hpp +++ b/src/buildtool/execution_api/git/git_api.hpp @@ -214,7 +214,7 @@ class GitApi final : public IExecutionApi { // Collect blobs of missing artifacts from local CAS. Trees are // processed recursively before any blob is uploaded. - ArtifactBlobContainer container{}; + std::unordered_set<ArtifactBlob> container; for (auto const& dgst : missing_artifacts_info->digests) { auto const& info = missing_artifacts_info->back_map[dgst]; std::optional<std::string> content; @@ -225,7 +225,7 @@ class GitApi final : public IExecutionApi { if (not tree) { return false; } - ArtifactBlobContainer tree_deps_only_blobs{}; + std::unordered_set<ArtifactBlob> tree_deps_only_blobs; for (auto const& [path, entry] : *tree) { if (entry->IsTree()) { auto digest = ToArtifactDigest(*entry); @@ -254,7 +254,8 @@ class GitApi final : public IExecutionApi { *entry_content, IsExecutableObject(entry->Type())}, /*exception_is_fatal=*/true, - [&api](ArtifactBlobContainer&& blobs) -> bool { + [&api](std::unordered_set<ArtifactBlob>&& blobs) + -> bool { return api.Upload(std::move(blobs)); })) { return false; @@ -288,7 +289,7 @@ class GitApi final : public IExecutionApi { std::move(*content), IsExecutableObject(info.type)}, /*exception_is_fatal=*/true, - [&api](ArtifactBlobContainer&& blobs) { + [&api](std::unordered_set<ArtifactBlob>&& blobs) { return api.Upload(std::move(blobs), /*skip_find_missing=*/true); })) { @@ -307,7 +308,7 @@ class GitApi final : public IExecutionApi { } /// NOLINTNEXTLINE(google-default-arguments) - [[nodiscard]] auto Upload(ArtifactBlobContainer&& /*blobs*/, + [[nodiscard]] auto Upload(std::unordered_set<ArtifactBlob>&& /*blobs*/, bool /*skip_find_missing*/ = false) const noexcept -> bool override { // Upload to git cas not supported |