summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/other_tools/just_mr/setup.cpp30
-rw-r--r--src/other_tools/root_maps/TARGETS1
-rw-r--r--src/other_tools/root_maps/content_git_map.cpp105
-rw-r--r--src/other_tools/root_maps/content_git_map.hpp4
4 files changed, 13 insertions, 127 deletions
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 07f74620..7626564f 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -347,23 +347,19 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
&progress,
common_args.jobs);
- auto content_git_map = CreateContentGitMap(
- &content_cas_map,
- &import_to_git_map,
- common_args.just_mr_paths,
- common_args.alternative_mirrors,
- common_args.ca_info,
- &resolve_symlinks_map,
- &critical_git_op_map,
- serve ? &*serve : nullptr,
- &native_storage_config,
- compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
- &native_storage,
- has_remote_api ? &*apis.local : nullptr, // only needed if remote given
- has_remote_api ? &*apis.remote : nullptr,
- common_args.fetch_absent,
- &progress,
- common_args.jobs);
+ auto content_git_map = CreateContentGitMap(&content_cas_map,
+ &import_to_git_map,
+ common_args.just_mr_paths,
+ common_args.alternative_mirrors,
+ common_args.ca_info,
+ &resolve_symlinks_map,
+ &critical_git_op_map,
+ serve ? &*serve : nullptr,
+ &native_storage_config,
+ &native_storage,
+ common_args.fetch_absent,
+ &progress,
+ common_args.jobs);
auto foreign_file_git_map =
CreateForeignFileGitMap(&content_cas_map,
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index 9e0c9912..8a14bf58 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -122,7 +122,6 @@
[ ["@", "gsl", "", "gsl"]
, ["@", "json", "", "json"]
, ["src/buildtool/common", "user_structs"]
- , ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
, ["src/buildtool/multithreading", "async_map_consumer"]
, ["src/buildtool/serve_api/remote", "serve_api"]
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp
index 717ce065..3e5dc3e0 100644
--- a/src/other_tools/root_maps/content_git_map.cpp
+++ b/src/other_tools/root_maps/content_git_map.cpp
@@ -68,9 +68,6 @@ void EnsureRootAsAbsent(
ArchiveRepoInfo const& key,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* /*compat_storage_config*/,
- IExecutionApi const* /*local_api*/,
- IExecutionApi const* /*remote_api*/,
bool is_cache_hit,
ContentGitMap::SetterPtr const& ws_setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -166,9 +163,6 @@ void ResolveContentTree(
bool is_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<TaskSystem*> const& ts,
@@ -194,9 +188,6 @@ void ResolveContentTree(
key,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
is_cache_hit,
ws_setter,
logger);
@@ -228,9 +219,6 @@ void ResolveContentTree(
is_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
ws_setter,
logger](auto const& hashes) {
@@ -254,9 +242,6 @@ void ResolveContentTree(
is_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
is_cache_hit,
ws_setter,
logger](auto const& values) {
@@ -283,9 +268,6 @@ void ResolveContentTree(
key,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
is_cache_hit,
ws_setter,
logger);
@@ -328,9 +310,6 @@ void ResolveContentTree(
key,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
is_cache_hit,
ws_setter,
logger);
@@ -357,9 +336,6 @@ void WriteIdFileAndSetWSRoot(
bool is_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<TaskSystem*> const& ts,
@@ -404,9 +380,6 @@ void WriteIdFileAndSetWSRoot(
is_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
resolve_symlinks_map,
ts,
@@ -424,9 +397,6 @@ void ExtractAndImportToGit(
bool is_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
gsl::not_null<ImportToGitMap*> const& import_to_git_map,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
@@ -464,9 +434,6 @@ void ExtractAndImportToGit(
is_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
resolve_symlinks_map,
ts,
@@ -488,9 +455,6 @@ void ExtractAndImportToGit(
is_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
resolve_symlinks_map,
ts,
@@ -530,11 +494,8 @@ void HandleLocallyKnownTree(
bool fetch_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
ContentGitMap::SetterPtr const& setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -565,9 +526,6 @@ void HandleLocallyKnownTree(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
resolve_symlinks_map,
ts,
@@ -610,9 +568,6 @@ void HandleLocallyKnownTree(
/*is_absent = */ (key.absent and not fetch_absent),
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
resolve_symlinks_map,
ts,
@@ -636,11 +591,8 @@ void HandleKnownInOlderGenerationAfterImport(
bool fetch_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
ContentGitMap::SetterPtr const& setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -661,11 +613,8 @@ void HandleKnownInOlderGenerationAfterImport(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -680,11 +629,8 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
bool fetch_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
ContentGitMap::SetterPtr const& setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -722,11 +668,8 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -742,11 +685,8 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -767,11 +707,8 @@ void HandleKnownInOlderGenerationAfterTagging(
bool fetch_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
ContentGitMap::SetterPtr const& setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -794,11 +731,8 @@ void HandleKnownInOlderGenerationAfterTagging(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -817,11 +751,8 @@ void HandleKnownInOlderGenerationAfterTagging(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -842,11 +773,8 @@ void HandleKnownInOlderGeneration(
bool fetch_absent,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
ContentGitMap::SetterPtr const& setter,
ContentGitMap::LoggerPtr const& logger) {
@@ -880,11 +808,8 @@ void HandleKnownInOlderGeneration(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -901,11 +826,8 @@ void HandleKnownInOlderGeneration(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -932,10 +854,7 @@ auto CreateContentGitMap(
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<Storage const*> const& native_storage,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
bool fetch_absent,
gsl::not_null<JustMRProgress*> const& progress,
std::size_t jobs) -> ContentGitMap {
@@ -948,10 +867,7 @@ auto CreateContentGitMap(
ca_info,
serve,
native_storage_config,
- compat_storage_config,
native_storage,
- local_api,
- remote_api,
fetch_absent,
progress](auto ts,
auto setter,
@@ -968,11 +884,8 @@ auto CreateContentGitMap(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -984,11 +897,8 @@ auto CreateContentGitMap(
fetch_absent,
serve,
native_storage_config,
- compat_storage_config,
resolve_symlinks_map,
critical_git_op_map,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -1040,9 +950,6 @@ auto CreateContentGitMap(
/*is_absent = */ true,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
import_to_git_map,
resolve_symlinks_map,
@@ -1079,10 +986,7 @@ auto CreateContentGitMap(
ca_info,
serve,
native_storage_config,
- compat_storage_config,
native_storage,
- local_api,
- remote_api,
progress,
ts,
setter,
@@ -1142,9 +1046,6 @@ auto CreateContentGitMap(
/*is_absent=*/true,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
import_to_git_map,
resolve_symlinks_map,
@@ -1182,9 +1083,6 @@ auto CreateContentGitMap(
/*is_absent=*/true,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
critical_git_op_map,
import_to_git_map,
resolve_symlinks_map,
@@ -1240,9 +1138,6 @@ auto CreateContentGitMap(
/*is_absent=*/false,
/*serve=*/nullptr,
native_storage_config,
- /*compat_storage_config=*/nullptr,
- /*local_api=*/nullptr,
- /*remote_api=*/nullptr,
critical_git_op_map,
import_to_git_map,
resolve_symlinks_map,
diff --git a/src/other_tools/root_maps/content_git_map.hpp b/src/other_tools/root_maps/content_git_map.hpp
index e7f6b756..091759d9 100644
--- a/src/other_tools/root_maps/content_git_map.hpp
+++ b/src/other_tools/root_maps/content_git_map.hpp
@@ -21,7 +21,6 @@
#include "gsl/gsl"
#include "nlohmann/json.hpp"
#include "src/buildtool/common/user_structs.hpp"
-#include "src/buildtool/execution_api/common/execution_api.hpp"
#include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp"
#include "src/buildtool/multithreading/async_map_consumer.hpp"
#include "src/buildtool/serve_api/remote/serve_api.hpp"
@@ -49,10 +48,7 @@ using ContentGitMap =
gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
gsl::not_null<Storage const*> const& native_storage,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
bool fetch_absent,
gsl::not_null<JustMRProgress*> const& progress,
std::size_t jobs) -> ContentGitMap;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 14:39:43 +0000