diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-11-18 16:36:30 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-12-04 18:03:44 +0100 |
| commit | a8112042b57b7a1be8b37cce46d279fd0ff9e861 (patch) | |
| tree | 8d6cd5607b70a9471ae22425e224c0fef5df18d6 /src/other_tools/root_maps | |
| parent | 8c15fbdd149fd34ddc024f2ba93e650dab81098b (diff) | |
| download | justbuild-a8112042b57b7a1be8b37cce46d279fd0ff9e861.tar.gz | |
Rename MRApiUtils to RehashUtils
Diffstat (limited to 'src/other_tools/root_maps')
| -rw-r--r-- | src/other_tools/root_maps/TARGETS | 2 | ||||
| -rw-r--r-- | src/other_tools/root_maps/root_utils.cpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS index 11f6b4e6..81c72d1c 100644 --- a/src/other_tools/root_maps/TARGETS +++ b/src/other_tools/root_maps/TARGETS @@ -240,7 +240,7 @@ , ["src/buildtool/common", "config"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/serve", "mr_git_api"] - , ["src/buildtool/execution_api/serve", "utils"] + , ["src/buildtool/execution_api/utils", "rehash_utils"] , ["src/buildtool/file_system", "object_type"] , ["src/utils/cpp", "expected"] ] diff --git a/src/other_tools/root_maps/root_utils.cpp b/src/other_tools/root_maps/root_utils.cpp index 85c0ee62..13e18d06 100644 --- a/src/other_tools/root_maps/root_utils.cpp +++ b/src/other_tools/root_maps/root_utils.cpp @@ -25,7 +25,7 @@ #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/serve/mr_git_api.hpp" -#include "src/buildtool/execution_api/serve/utils.hpp" +#include "src/buildtool/execution_api/utils/rehash_utils.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/utils/cpp/expected.hpp" @@ -92,10 +92,11 @@ auto EnsureAbsentRootOnServe( ArtifactDigest remote_digest = *native_digest; if (compat_storage_config != nullptr) { // in compatible mode, get compatible digest from mapping, if exists - auto cached_obj = MRApiUtils::ReadRehashedDigest(*native_digest, - *native_storage_config, - *compat_storage_config, - /*from_git=*/true); + auto cached_obj = + RehashUtils::ReadRehashedDigest(*native_digest, + *native_storage_config, + *compat_storage_config, + /*from_git=*/true); if (not cached_obj) { (*logger)(cached_obj.error(), /*fatal=*/true); return false; |