From 638c78323360b70cbef0e68e570ae940c1e05ccb Mon Sep 17 00:00:00 2001 From: zph Date: Fri, 13 Jun 2025 11:59:00 +0800 Subject: [PATCH 1/4] update Signed-off-by: zph --- services/distributeddataservice/service/udmf/BUILD.gn | 1 + .../service/udmf/preprocess/preprocess_utils.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/udmf/BUILD.gn b/services/distributeddataservice/service/udmf/BUILD.gn index 6180f01b6..f8a62d82c 100644 --- a/services/distributeddataservice/service/udmf/BUILD.gn +++ b/services/distributeddataservice/service/udmf/BUILD.gn @@ -74,6 +74,7 @@ ohos_source_set("udmf_server") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp index 8141886ba..bdfe55bb9 100644 --- a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp +++ b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp @@ -23,6 +23,7 @@ #include "udmf_radar_reporter.h" #include "accesstoken_kit.h" #include "device_manager_adapter.h" +#include "file_mount_manager.h" #include "iservice_registry.h" #include "log_print.h" #include "system_ability_definition.h" @@ -240,7 +241,7 @@ int32_t PreProcessUtils::GetDfsUrisFromLocal(const std::vector &uri RadarReporterAdapter::ReportNormal(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::IDLE); std::unordered_map dfsUris; - int ret = RemoteFileShare::GetDfsUrisFromLocal(uris, userId, dfsUris); + int ret = Storage::DistributedFile::FileMountManager::GetDfsUrisDirFromLocal(uris, userId, dfsUris); if (ret != 0 || dfsUris.empty()) { RadarReporterAdapter::ReportFail(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::FAILED, E_FS_ERROR, BizState::DFX_END); -- Gitee From 0540fb889a91f6db228e433fba3bb0b41896e35b Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 18 Jun 2025 17:10:18 +0800 Subject: [PATCH 2/4] update Signed-off-by: zph --- services/distributeddataservice/service/test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 6aeafae06..710d0bcee 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -1373,6 +1373,7 @@ ohos_unittest("UdmfServiceStubMockTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", @@ -1461,6 +1462,7 @@ ohos_unittest("UdmfPreProcessUtilsMockTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "device_manager:devicemanagersdk", + "dfs_service:distributed_file_daemon_kit_inner", "googletest:gmock_main", "googletest:gtest_main", "hisysevent:libhisysevent", -- Gitee From 86fdc68b0b75c3f07e34751bf2d5b08e84c42d8e Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 18 Jun 2025 17:11:11 +0800 Subject: [PATCH 3/4] update Signed-off-by: zph --- .../service/udmf/preprocess/preprocess_utils.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp index bdfe55bb9..ba8634e78 100644 --- a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp +++ b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp @@ -29,7 +29,6 @@ #include "system_ability_definition.h" #include "udmf_radar_reporter.h" #include "udmf_utils.h" -#include "remote_file_share.h" #include "utils/crypto.h" #include "uri_permission_manager_client.h" namespace OHOS { -- Gitee From 51effe215311b900f001be7b1ce154550c1cd5ce Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 18 Jun 2025 17:15:53 +0800 Subject: [PATCH 4/4] update Signed-off-by: zph --- .../service/udmf/preprocess/preprocess_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp index ba8634e78..93840dd7d 100644 --- a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp +++ b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp @@ -240,7 +240,7 @@ int32_t PreProcessUtils::GetDfsUrisFromLocal(const std::vector &uri RadarReporterAdapter::ReportNormal(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::IDLE); std::unordered_map dfsUris; - int ret = Storage::DistributedFile::FileMountManager::GetDfsUrisDirFromLocal(uris, userId, dfsUris); + int32_t ret = Storage::DistributedFile::FileMountManager::GetDfsUrisDirFromLocal(uris, userId, dfsUris); if (ret != 0 || dfsUris.empty()) { RadarReporterAdapter::ReportFail(std::string(__FUNCTION__), BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::FAILED, E_FS_ERROR, BizState::DFX_END); -- Gitee