From 0d1223d10057c563f019fd4699a82e0af9da9111 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Mon, 16 Dec 2024 13:37:08 +0100 Subject: Remove unneeded compat_storage --- src/other_tools/root_maps/content_git_map.cpp | 40 +-------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'src/other_tools/root_maps/content_git_map.cpp') diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index a6968f79..8a903943 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -66,7 +66,6 @@ void EnsureRootAsAbsent( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, IExecutionApi const* local_api, IExecutionApi const* remote_api, bool is_cache_hit, @@ -131,7 +130,6 @@ void EnsureRootAsAbsent( native_storage_config->GitRoot(), /*repo_path*/ native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, logger, @@ -161,7 +159,6 @@ void EnsureRootAsAbsent( native_storage_config->GitRoot(), /*repo_root*/ native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, logger, @@ -196,7 +193,6 @@ void ResolveContentTree( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, IExecutionApi const* local_api, IExecutionApi const* remote_api, gsl::not_null const& critical_git_op_map, @@ -225,7 +221,6 @@ void ResolveContentTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, is_cache_hit, @@ -251,8 +246,7 @@ void ResolveContentTree( /*known_info=*/std::nullopt, just_git_cas, just_git_cas)}, - [resolve_symlinks_map, - critical_git_op_map, + [critical_git_op_map, tree_hash, tree_id_file, is_cache_hit, @@ -261,7 +255,6 @@ void ResolveContentTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, ts, @@ -288,7 +281,6 @@ void ResolveContentTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, is_cache_hit, @@ -318,7 +310,6 @@ void ResolveContentTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, is_cache_hit, @@ -364,7 +355,6 @@ void ResolveContentTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, is_cache_hit, @@ -394,7 +384,6 @@ void WriteIdFileAndSetWSRoot( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, IExecutionApi const* local_api, IExecutionApi const* remote_api, gsl::not_null const& critical_git_op_map, @@ -442,7 +431,6 @@ void WriteIdFileAndSetWSRoot( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -463,7 +451,6 @@ void ExtractAndImportToGit( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, IExecutionApi const* local_api, IExecutionApi const* remote_api, gsl::not_null const& critical_git_op_map, @@ -504,7 +491,6 @@ void ExtractAndImportToGit( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -529,7 +515,6 @@ void ExtractAndImportToGit( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -572,7 +557,6 @@ void HandleLocallyKnownTree( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, gsl::not_null const& resolve_symlinks_map, gsl::not_null const& critical_git_op_map, IExecutionApi const* local_api, @@ -608,7 +592,6 @@ void HandleLocallyKnownTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -654,7 +637,6 @@ void HandleLocallyKnownTree( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -681,7 +663,6 @@ void HandleKnownInOlderGenerationAfterImport( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, gsl::not_null const& resolve_symlinks_map, gsl::not_null const& critical_git_op_map, IExecutionApi const* local_api, @@ -707,7 +688,6 @@ void HandleKnownInOlderGenerationAfterImport( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -727,7 +707,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, gsl::not_null const& resolve_symlinks_map, gsl::not_null const& critical_git_op_map, IExecutionApi const* local_api, @@ -770,7 +749,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -791,7 +769,6 @@ void HandleKnownInOlderGenerationAfterTaggingAndInit( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -817,7 +794,6 @@ void HandleKnownInOlderGenerationAfterTagging( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, gsl::not_null const& resolve_symlinks_map, gsl::not_null const& critical_git_op_map, IExecutionApi const* local_api, @@ -845,7 +821,6 @@ void HandleKnownInOlderGenerationAfterTagging( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -869,7 +844,6 @@ void HandleKnownInOlderGenerationAfterTagging( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -895,7 +869,6 @@ void HandleKnownInOlderGeneration( ServeApi const* serve, gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, - Storage const* compat_storage, gsl::not_null const& resolve_symlinks_map, gsl::not_null const& critical_git_op_map, IExecutionApi const* local_api, @@ -934,7 +907,6 @@ void HandleKnownInOlderGeneration( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -956,7 +928,6 @@ void HandleKnownInOlderGeneration( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -989,7 +960,6 @@ auto CreateContentGitMap( gsl::not_null const& native_storage_config, StorageConfig const* compat_storage_config, gsl::not_null const& native_storage, - Storage const* compat_storage, IExecutionApi const* local_api, IExecutionApi const* remote_api, bool fetch_absent, @@ -1006,7 +976,6 @@ auto CreateContentGitMap( native_storage_config, compat_storage_config, native_storage, - compat_storage, local_api, remote_api, fetch_absent, @@ -1026,7 +995,6 @@ auto CreateContentGitMap( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -1043,7 +1011,6 @@ auto CreateContentGitMap( serve, native_storage_config, compat_storage_config, - compat_storage, resolve_symlinks_map, critical_git_op_map, local_api, @@ -1100,7 +1067,6 @@ auto CreateContentGitMap( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -1141,7 +1107,6 @@ auto CreateContentGitMap( native_storage_config, compat_storage_config, native_storage, - compat_storage, local_api, remote_api, progress, @@ -1204,7 +1169,6 @@ auto CreateContentGitMap( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -1245,7 +1209,6 @@ auto CreateContentGitMap( serve, native_storage_config, compat_storage_config, - compat_storage, local_api, remote_api, critical_git_op_map, @@ -1304,7 +1267,6 @@ auto CreateContentGitMap( /*serve=*/nullptr, native_storage_config, /*compat_storage_config=*/nullptr, - /*compat_storage=*/nullptr, /*local_api=*/nullptr, /*remote_api=*/nullptr, critical_git_op_map, -- cgit v1.2.3