diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-05-27 11:42:59 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-05-28 16:19:19 +0200 |
| commit | 9bdd30f307b83a3901250a51780f308f5c4a0065 (patch) | |
| tree | 56b26bd1624dbdd7768791e99745331f02f8f2f1 /src/buildtool/execution_api/common/blob_tree.cpp | |
| parent | 95df0b6d1bb7d65bdf02533cb7067067000776d3 (diff) | |
| download | justbuild-9bdd30f307b83a3901250a51780f308f5c4a0065.tar.gz | |
Use ArtifactBlob in BlobTree instead of BazelBlob.
Diffstat (limited to 'src/buildtool/execution_api/common/blob_tree.cpp')
| -rw-r--r-- | src/buildtool/execution_api/common/blob_tree.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/buildtool/execution_api/common/blob_tree.cpp b/src/buildtool/execution_api/common/blob_tree.cpp index 0954220e..6e04d55f 100644 --- a/src/buildtool/execution_api/common/blob_tree.cpp +++ b/src/buildtool/execution_api/common/blob_tree.cpp @@ -18,8 +18,6 @@ #include <variant> #include "src/buildtool/common/artifact.hpp" -#include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/utils/cpp/hex_string.hpp" @@ -39,8 +37,7 @@ auto BlobTree::FromDirectoryTree(DirectoryTreePtr const& tree, if (not blob_tree) { return std::nullopt; } - auto raw_id = FromHexString(NativeSupport::Unprefix( - (*blob_tree)->Blob().digest.hash())); + auto raw_id = FromHexString((*blob_tree)->Blob().digest.hash()); if (not raw_id) { return std::nullopt; } @@ -64,14 +61,12 @@ auto BlobTree::FromDirectoryTree(DirectoryTreePtr const& tree, } } if (auto git_tree = GitRepo::CreateShallowTree(entries)) { - bazel_re::Digest digest{}; - digest.set_hash(NativeSupport::Prefix(ToHexString(git_tree->first), - /*is_tree=*/true)); - digest.set_size_bytes( - gsl::narrow<google::protobuf::int64>(git_tree->second.size())); - return std::make_shared<BlobTree>(BazelBlob{digest, - git_tree->second, - /*is_exec=*/false}, + ArtifactDigest digest{ToHexString(git_tree->first), + git_tree->second.size(), + /*is_tree=*/true}; + return std::make_shared<BlobTree>(ArtifactBlob{std::move(digest), + git_tree->second, + /*is_exec=*/false}, nodes); } } catch (...) { |