diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-08-29 10:48:04 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-08-30 17:17:09 +0200 |
| commit | 8520a8fe2b2fc20940ed6457971a8de179343449 (patch) | |
| tree | d5bc38ba250aa1b08d151a8e38e774b08743cbc0 /src/buildtool/serve_api/serve_service/source_tree.cpp | |
| parent | d9ff1b6073330c304fecdf77a16702a0df5faeac (diff) | |
| download | justbuild-8520a8fe2b2fc20940ed6457971a8de179343449.tar.gz | |
Return ArtifactDigest from LocalCAS::Store
Diffstat (limited to 'src/buildtool/serve_api/serve_service/source_tree.cpp')
| -rw-r--r-- | src/buildtool/serve_api/serve_service/source_tree.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index 8b049691..d2ba33f6 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -24,7 +24,6 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/compatibility/compatibility.hpp" -#include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" @@ -986,7 +985,7 @@ auto SourceTreeService::ServeDistdirTree( return ::grpc::Status::OK; } blob_found = true; - blob_digest = NativeSupport::Unprefix(stored_blob->hash()); + blob_digest = stored_blob->hash(); } else { if (res.error() == GitLookupError::Fatal) { @@ -1016,8 +1015,7 @@ auto SourceTreeService::ServeDistdirTree( return ::grpc::Status::OK; } blob_found = true; - blob_digest = - NativeSupport::Unprefix(stored_blob->hash()); + blob_digest = stored_blob->hash(); break; } if (res.error() == GitLookupError::Fatal) { @@ -1103,8 +1101,7 @@ auto SourceTreeService::ServeDistdirTree( // get hash from raw_id auto tree_id = ToHexString(tree->first); // add tree to local CAS - auto tree_digest = cas.StoreTree(tree->second); - if (not tree_digest) { + if (not cas.StoreTree(tree->second)) { logger_->Emit(LogLevel::Error, "Failed to store distdir tree {} to local CAS", tree_id); |