From cd9b1aab78186a1b9a01dbd5319cfd9faafe4662 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Fri, 24 May 2024 12:08:48 +0200 Subject: Use common interface for stream dumping ...in LocalApi and BazelApi. --- src/buildtool/execution_api/local/local_api.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/buildtool/execution_api/local/local_api.hpp') diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index c81b75c1..b9be5aed 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -37,6 +37,7 @@ #include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp" #include "src/buildtool/execution_api/common/common_api.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/execution_api/common/stream_dumper.hpp" #include "src/buildtool/execution_api/common/tree_reader.hpp" #include "src/buildtool/execution_api/execution_service/cas_utils.hpp" #include "src/buildtool/execution_api/git/git_api.hpp" @@ -141,13 +142,13 @@ class LocalApi final : public IExecutionApi { std::vector const& artifacts_info, std::vector const& fds, bool raw_tree) noexcept -> bool final { + auto dumper = StreamDumper{storage_->CAS()}; return CommonRetrieveToFds( artifacts_info, fds, - [&cas = storage_->CAS(), &raw_tree]( - Artifact::ObjectInfo const& info, - gsl::not_null const& out) { - return cas.DumpToStream(info, out, raw_tree); + [&dumper, &raw_tree](Artifact::ObjectInfo const& info, + gsl::not_null const& out) { + return dumper.DumpToStream(info, out, raw_tree); }, [&repo_config = repo_config_, &raw_tree]( Artifact::ObjectInfo const& info, int fd) { -- cgit v1.2.3