From cd9b1aab78186a1b9a01dbd5319cfd9faafe4662 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Fri, 24 May 2024 12:08:48 +0200
Subject: Use common interface for stream dumping

...in LocalApi and BazelApi.
---
 src/buildtool/execution_api/remote/bazel/bazel_api.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/buildtool/execution_api/remote/bazel/bazel_api.cpp')

diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index 47d024f9..0f1fdd04 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -31,6 +31,7 @@
 #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
 #include "src/buildtool/execution_api/common/common_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/remote/bazel/bazel_ac_client.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_action.hpp"
@@ -284,12 +285,13 @@ auto BazelApi::CreateAction(
     std::vector<Artifact::ObjectInfo> const& artifacts_info,
     std::vector<int> const& fds,
     bool raw_tree) noexcept -> bool {
+    auto dumper = StreamDumper<BazelNetworkReader>{*network_};
     return CommonRetrieveToFds(
         artifacts_info,
         fds,
-        [&network = network_, &raw_tree](Artifact::ObjectInfo const& info,
-                                         gsl::not_null<FILE*> const& out) {
-            return network->DumpToStream(info, out, raw_tree);
+        [&dumper, &raw_tree](Artifact::ObjectInfo const& info,
+                             gsl::not_null<FILE*> const& out) {
+            return dumper.DumpToStream(info, out, raw_tree);
         },
         std::nullopt  // remote can't fallback to Git
     );
-- 
cgit v1.2.3