From 2a2f915921f210374d44ef9a989f364af93057c3 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Tue, 4 Jun 2024 11:59:26 +0200
Subject: Use BaselCasClient in BazelNetworkReader

...bypassing BazelNetwork layer.
---
 src/buildtool/execution_api/remote/bazel/bazel_api.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 2cba30be..f539f325 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -249,7 +249,7 @@ auto BazelApi::CreateAction(
                                                ? std::make_optional(info.digest)
                                                : std::nullopt;
                 auto reader = TreeReader<BazelNetworkReader>{
-                    *network_, std::move(request_remote_tree)};
+                    network_->CreateReader(), std::move(request_remote_tree)};
                 auto const result = reader.RecursivelyReadTreeLeafs(
                     info.digest, output_paths[i]);
                 if (not result or
@@ -304,7 +304,7 @@ 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_};
+    auto dumper = StreamDumper<BazelNetworkReader>{network_->CreateReader()};
     return CommonRetrieveToFds(
         artifacts_info,
         fds,
@@ -343,7 +343,8 @@ auto BazelApi::CreateAction(
     for (auto const& dgst : missing_artifacts_info->digests) {
         auto const& info = missing_artifacts_info->back_map[dgst];
         if (IsTreeObject(info.type)) {
-            auto reader = TreeReader<BazelNetworkReader>{*network_};
+            auto reader =
+                TreeReader<BazelNetworkReader>{network_->CreateReader()};
             auto const result = reader.ReadDirectTreeEntries(
                 info.digest, std::filesystem::path{});
             if (not result or not RetrieveToCas(result->infos, api)) {
@@ -392,7 +393,8 @@ auto BazelApi::CreateAction(
         for (auto const& dgst : missing_artifacts_info->digests) {
             auto const& info = missing_artifacts_info->back_map[dgst];
             if (IsTreeObject(info.type)) {
-                auto reader = TreeReader<BazelNetworkReader>{*network_};
+                auto reader =
+                    TreeReader<BazelNetworkReader>{network_->CreateReader()};
                 auto const result = reader.ReadDirectTreeEntries(
                     info.digest, std::filesystem::path{});
                 if (not result or
-- 
cgit v1.2.3