From 87e19a3ad2df7ec3195cac1a38f8ee23121330fe Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 18 Dec 2023 10:57:26 +0100 Subject: just-mr fetch content: Check for blob also in Git cache Now we look for the content blob also in the local Git cache, not just in local CAS. If found, we store the blob read from Git cache into local CAS and continue as usual. --- src/other_tools/just_mr/fetch.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/other_tools/just_mr/fetch.cpp') diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp index 56c5fdec..d5e72f28 100644 --- a/src/other_tools/just_mr/fetch.cpp +++ b/src/other_tools/just_mr/fetch.cpp @@ -415,10 +415,13 @@ auto MultiRepoFetch(std::shared_ptr const& config, common_args.remote_serve_address, auth_args); // create async maps + auto crit_git_op_ptr = std::make_shared(); + auto critical_git_op_map = CreateCriticalGitOpMap(crit_git_op_ptr); auto content_cas_map = CreateContentCASMap(common_args.just_mr_paths, common_args.alternative_mirrors, common_args.ca_info, + &critical_git_op_map, serve_api_exists, local_api ? &(*local_api) : nullptr, remote_api ? &(*remote_api) : nullptr, @@ -429,8 +432,6 @@ auto MultiRepoFetch(std::shared_ptr const& config, (fetch_args.backup_to_remote and local_api) ? &(*local_api) : nullptr, (fetch_args.backup_to_remote and remote_api) ? &(*remote_api) : nullptr, common_args.jobs); - auto crit_git_op_ptr = std::make_shared(); - auto critical_git_op_map = CreateCriticalGitOpMap(crit_git_op_ptr); auto import_to_git_map = CreateImportToGitMap(&critical_git_op_map, common_args.git_path->string(), -- cgit v1.2.3