diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-04 11:59:26 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-07 16:38:35 +0200 |
| commit | 2a2f915921f210374d44ef9a989f364af93057c3 (patch) | |
| tree | cb89f43b1b43e32ed03e88563469eac79f3e9c20 /src/buildtool/execution_api/remote/bazel/bazel_api.cpp | |
| parent | 4bfede641eb80f6b190355e4f2ef1d6c7519706d (diff) | |
| download | justbuild-2a2f915921f210374d44ef9a989f364af93057c3.tar.gz | |
Use BaselCasClient in BazelNetworkReader
...bypassing BazelNetwork layer.
Diffstat (limited to 'src/buildtool/execution_api/remote/bazel/bazel_api.cpp')
| -rw-r--r-- | src/buildtool/execution_api/remote/bazel/bazel_api.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 |