From 2ad759136ae9f39e1842ef80779dfe127a19beba Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Mon, 24 Jun 2024 17:36:49 +0200 Subject: Use constant IExecutionApi in just-mr maps --- src/other_tools/ops_maps/archive_fetch_map.cpp | 8 ++++---- src/other_tools/ops_maps/archive_fetch_map.hpp | 4 ++-- src/other_tools/ops_maps/content_cas_map.cpp | 4 ++-- src/other_tools/ops_maps/content_cas_map.hpp | 4 ++-- src/other_tools/ops_maps/git_tree_fetch_map.cpp | 10 +++++----- src/other_tools/ops_maps/git_tree_fetch_map.hpp | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/other_tools/ops_maps') diff --git a/src/other_tools/ops_maps/archive_fetch_map.cpp b/src/other_tools/ops_maps/archive_fetch_map.cpp index bf655dfd..883ffa76 100644 --- a/src/other_tools/ops_maps/archive_fetch_map.cpp +++ b/src/other_tools/ops_maps/archive_fetch_map.cpp @@ -29,8 +29,8 @@ namespace { void ProcessContent( std::filesystem::path const& content_path, std::filesystem::path const& target_name, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, std::string const& content, ArchiveFetchMap::SetterPtr const& setter, ArchiveFetchMap::LoggerPtr const& logger) { @@ -71,8 +71,8 @@ void ProcessContent( auto CreateArchiveFetchMap( gsl::not_null const& content_cas_map, std::filesystem::path const& fetch_dir, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, std::size_t jobs) -> ArchiveFetchMap { auto fetch_archive = [content_cas_map, fetch_dir, local_api, remote_api]( auto ts, diff --git a/src/other_tools/ops_maps/archive_fetch_map.hpp b/src/other_tools/ops_maps/archive_fetch_map.hpp index 7a676592..f6e3d987 100644 --- a/src/other_tools/ops_maps/archive_fetch_map.hpp +++ b/src/other_tools/ops_maps/archive_fetch_map.hpp @@ -29,8 +29,8 @@ using ArchiveFetchMap = AsyncMapConsumer; [[nodiscard]] auto CreateArchiveFetchMap( gsl::not_null const& content_cas_map, std::filesystem::path const& fetch_dir, // should exist! - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, std::size_t jobs) -> ArchiveFetchMap; #endif // INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP diff --git a/src/other_tools/ops_maps/content_cas_map.cpp b/src/other_tools/ops_maps/content_cas_map.cpp index 190c9611..4d1ca013 100644 --- a/src/other_tools/ops_maps/content_cas_map.cpp +++ b/src/other_tools/ops_maps/content_cas_map.cpp @@ -109,8 +109,8 @@ auto CreateContentCASMap( CAInfoPtr const& ca_info, gsl::not_null const& critical_git_op_map, std::optional const& serve, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, std::size_t jobs) -> ContentCASMap { auto ensure_in_cas = [just_mr_paths, additional_mirrors, diff --git a/src/other_tools/ops_maps/content_cas_map.hpp b/src/other_tools/ops_maps/content_cas_map.hpp index 0fb66970..25facd07 100644 --- a/src/other_tools/ops_maps/content_cas_map.hpp +++ b/src/other_tools/ops_maps/content_cas_map.hpp @@ -85,8 +85,8 @@ using ContentCASMap = AsyncMapConsumer; CAInfoPtr const& ca_info, gsl::not_null const& critical_git_op_map, std::optional const& serve, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, std::size_t jobs) -> ContentCASMap; namespace std { diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp index 844aad31..c518c9e9 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp @@ -35,7 +35,7 @@ namespace { void BackupToRemote(std::string const& tree_id, - gsl::not_null const& remote_api, + gsl::not_null const& remote_api, GitTreeFetchMap::LoggerPtr const& logger) { // try to back up to remote CAS auto repo = RepositoryConfig{}; @@ -67,8 +67,8 @@ void MoveCASTreeToGit( std::string const& tree_id, ArtifactDigest const& digest, gsl::not_null const& import_to_git_map, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, bool backup_to_remote, gsl::not_null const& ts, GitTreeFetchMap::SetterPtr const& setter, @@ -130,8 +130,8 @@ auto CreateGitTreeFetchMap( std::string const& git_bin, std::vector const& launcher, std::optional const& serve, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, bool backup_to_remote, std::size_t jobs) -> GitTreeFetchMap { auto tree_to_cache = [critical_git_op_map, diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.hpp b/src/other_tools/ops_maps/git_tree_fetch_map.hpp index 93ca450f..82c858d5 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.hpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.hpp @@ -61,8 +61,8 @@ using GitTreeFetchMap = AsyncMapConsumer; std::string const& git_bin, std::vector const& launcher, std::optional const& serve, - gsl::not_null const& local_api, - std::optional> const& remote_api, + gsl::not_null const& local_api, + std::optional> const& remote_api, bool backup_to_remote, std::size_t jobs) -> GitTreeFetchMap; -- cgit v1.2.3