diff --git a/services/distributeddataservice/adapter/test/BUILD.gn b/services/distributeddataservice/adapter/test/BUILD.gn
index 6f6f3b435e02812d2ab6e46a46646c7a8683218b..db76543ebbd899d5b75d161a247082010672fa19 100755
--- a/services/distributeddataservice/adapter/test/BUILD.gn
+++ b/services/distributeddataservice/adapter/test/BUILD.gn
@@ -22,9 +22,12 @@ group("unittest") {
     "../account/test:unittest",
     "../communicator/test:unittest",
     "../dfx/test:unittest",
-    "../screenlock/test:unittest",
   ]
 
+  if (defined(global_parts_info) && defined(global_parts_info.theme_screenlock_mgr)) {
+    deps += [ "${data_service_path}/adapter/screenlock/test:unittest" ]
+  }
+
   if (datamgr_service_cloud) {
     deps += [ "../network/test:unittest" ]
   }
diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
index 61bff0d7681858adc3ccef8ecbb863a16e5348ee..a060d5df3738b9dd6de649f6ffc010f7608cf6bc 100644
--- a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
@@ -231,12 +231,23 @@ bool RdbServiceImpl::CheckAccess(const std::string& bundleName, const std::strin
     return !CheckerManager::GetInstance().GetAppId(storeInfo).empty();
 }
 
-std::string RdbServiceImpl::ObtainDistributedTableName(const std::string &device, const std::string &table)
+std::string RdbServiceImpl::ObtainDistributedTableName(const RdbSyncerParam &param, const std::string &device,
+    const std::string &table)
 {
-    ZLOGI("device=%{public}s table=%{public}s", Anonymous::Change(device).c_str(), table.c_str());
-    auto uuid = DmAdapter::GetInstance().GetUuidByNetworkId(device);
+    if (!CheckAccess(param.bundleName_, "")) {
+        ZLOGE("bundleName:%{public}s. Permission error", param.bundleName_.c_str());
+        return "";
+    }
+    auto tokenId = IPCSkeleton::GetCallingTokenID();
+    std::string appId = " ";
+    if (AccessTokenKit::GetTokenTypeFlag(tokenId) == Security::AccessToken::TOKEN_HAP) {
+        auto uid = IPCSkeleton::GetCallingUid();
+        appId = CheckerManager::GetInstance().GetAppId({ uid, tokenId, param.bundleName_ });
+    }
+    auto uuid = DmAdapter::GetInstance().CalcClientUuid(appId, DmAdapter::GetInstance().ToUUID(device));
     if (uuid.empty()) {
-        ZLOGE("get uuid failed");
+        ZLOGE("get uuid failed, bundle:%{public}s, deviceId:%{public}s, table:%{public}s", param.bundleName_.c_str(),
+            Anonymous::Change(device).c_str(), Anonymous::Change(table).c_str());
         return "";
     }
     return DistributedDB::RelationalStoreManager::GetDistributedTableName(uuid, table);
diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.h b/services/distributeddataservice/service/rdb/rdb_service_impl.h
index b876a2f403730240ffb39a261c1d80babd0d7cd6..ee9cc076a07a46a0bce27e65cb910a4f340a9e8b 100755
--- a/services/distributeddataservice/service/rdb/rdb_service_impl.h
+++ b/services/distributeddataservice/service/rdb/rdb_service_impl.h
@@ -53,7 +53,8 @@ public:
     virtual ~RdbServiceImpl();
 
     /* IPC interface */
-    std::string ObtainDistributedTableName(const std::string& device, const std::string& table) override;
+    std::string ObtainDistributedTableName(const RdbSyncerParam &param, const std::string &device,
+        const std::string &table) override;
 
     int32_t InitNotifier(const RdbSyncerParam &param, sptr<IRemoteObject> notifier) override;
 
diff --git a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
index 737b216bbe98d95f4e4363bb8181c2174c909dbe..f52549c1f7aee6a8e0bcd8f23b604a9ec7585fca 100755
--- a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
@@ -28,15 +28,17 @@ namespace OHOS::DistributedRdb {
 using Anonymous = DistributedData::Anonymous;
 int32_t RdbServiceStub::OnRemoteObtainDistributedTableName(MessageParcel &data, MessageParcel &reply)
 {
+    RdbSyncerParam param;
     std::string device;
     std::string table;
-    if (!ITypesUtil::Unmarshal(data, device, table)) {
+    if (!ITypesUtil::Unmarshal(data, param, device, table)) {
         ZLOGE("Unmarshal device:%{public}s table:%{public}s", Anonymous::Change(device).c_str(), table.c_str());
         return IPC_STUB_INVALID_DATA_ERR;
     }
 
-    std::string distributedTableName = ObtainDistributedTableName(device, table);
-    if (!ITypesUtil::Marshal(reply, distributedTableName)) {
+    std::string distributedTableName = ObtainDistributedTableName(param, device, table);
+    int32_t status = distributedTableName.empty() ? RDB_ERROR : RDB_OK;
+    if (!ITypesUtil::Marshal(reply, status, distributedTableName)) {
         ZLOGE("Marshal distributedTableName:%{public}s", distributedTableName.c_str());
         return IPC_STUB_WRITE_PARCEL_ERR;
     }
diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn
index b2f90d849d23e376d6cc49cad915980eaec560d3..ef922b621965cfc869cf64f12b4f7270b907e679 100755
--- a/services/distributeddataservice/service/test/BUILD.gn
+++ b/services/distributeddataservice/service/test/BUILD.gn
@@ -67,8 +67,6 @@ ohos_unittest("CloudDataTest") {
   }
   module_out_path = module_output_path
   sources = [
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
     "${data_service_path}/service/cloud/cloud_data_translate.cpp",
     "${data_service_path}/service/cloud/cloud_service_impl.cpp",
     "${data_service_path}/service/cloud/cloud_service_stub.cpp",
@@ -76,40 +74,6 @@ ohos_unittest("CloudDataTest") {
     "${data_service_path}/service/cloud/cloud_value_util.cpp",
     "${data_service_path}/service/cloud/sync_manager.cpp",
     "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/matrix/src/device_matrix.cpp",
-    "${data_service_path}/service/matrix/src/matrix_event.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "${data_service_path}/service/test/mock/checker_mock.cpp",
     "cloud_data_test.cpp",
   ]
@@ -117,33 +81,26 @@ ohos_unittest("CloudDataTest") {
   configs = [ ":module_private_config" ]
 
   external_deps = [
-    "ability_base:base",
-    "ability_base:want",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "device_manager:devicemanagersdk",
     "hicollie:libhicollie",
-    "hilog:libhilog",
-    "hisysevent:libhisysevent",
-    "huks:libhukssdk",
-    "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddb",
-    "netmanager_base:net_conn_manager_if",
     "relational_store:native_rdb",
-    "resource_management:global_resmgr",
-    "samgr:samgr_proxy",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/communicator:distributeddata_communicator",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
-    "../../framework:distributeddatasvcfwk",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
+    "${data_service_path}/framework:distributeddatasvcfwk",
     "mock:distributeddata_mock_static",
     "//third_party/googletest:gtest_main",
   ]
@@ -163,8 +120,6 @@ ohos_unittest("CloudServiceImplTest") {
   }
   module_out_path = module_output_path
   sources = [
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
     "${data_service_path}/service/cloud/cloud_data_translate.cpp",
     "${data_service_path}/service/cloud/cloud_service_impl.cpp",
     "${data_service_path}/service/cloud/cloud_service_stub.cpp",
@@ -172,40 +127,6 @@ ohos_unittest("CloudServiceImplTest") {
     "${data_service_path}/service/cloud/cloud_value_util.cpp",
     "${data_service_path}/service/cloud/sync_manager.cpp",
     "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/matrix/src/device_matrix.cpp",
-    "${data_service_path}/service/matrix/src/matrix_event.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "${data_service_path}/service/test/mock/checker_mock.cpp",
     "cloud_service_impl_test.cpp",
   ]
@@ -213,33 +134,25 @@ ohos_unittest("CloudServiceImplTest") {
   configs = [ ":module_private_config" ]
 
   external_deps = [
-    "ability_base:base",
-    "ability_base:want",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
-    "access_token:libtokenid_sdk",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "device_manager:devicemanagersdk",
     "hicollie:libhicollie",
-    "hilog:libhilog",
-    "hisysevent:libhisysevent",
-    "huks:libhukssdk",
-    "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddb",
-    "netmanager_base:net_conn_manager_if",
     "relational_store:native_rdb",
-    "resource_management:global_resmgr",
-    "samgr:samgr_proxy",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/communicator:distributeddata_communicator",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
-    "../../framework:distributeddatasvcfwk",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
+    "${data_service_path}/framework:distributeddatasvcfwk",
     "mock:distributeddata_mock_static",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
index 3cb8f10bdf4a4f02757ff2f3dbfc594e0248ee1b..809567f62fdc22e3e61d018785f04adebb77cf37 100644
--- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
@@ -64,65 +64,24 @@ ohos_fuzztest("CloudServiceStubFuzzTest") {
   sources = [
     "${data_service_path}/app/src/checker/bundle_checker.cpp",
     "${data_service_path}/app/src/checker/system_checker.cpp",
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
-    "${data_service_path}/service/cloud/cloud_data_translate.cpp",
-    "${data_service_path}/service/cloud/cloud_service_impl.cpp",
-    "${data_service_path}/service/cloud/cloud_service_stub.cpp",
-    "${data_service_path}/service/cloud/cloud_types_util.cpp",
-    "${data_service_path}/service/cloud/cloud_value_util.cpp",
-    "${data_service_path}/service/cloud/sync_manager.cpp",
-    "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "cloudservicestub_fuzzer.cpp",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/network:distributeddata_network",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${data_service_path}/service:distributeddatasvc",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/cloud:distributeddata_cloud",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
     "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
-    "ability_base:want",
-    "ability_base:zuri",
-    "ability_runtime:ability_manager",
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
index e51d78511f3f6e31e68cc9494dc0133b8bcf9d50..8201727060871b9676b90e7cf8a75065a4832e27 100644
--- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
@@ -64,46 +64,19 @@ ohos_fuzztest("RdbServiceStubFuzzTest") {
   sources = [
     "${data_service_path}/app/src/checker/bundle_checker.cpp",
     "${data_service_path}/app/src/checker/system_checker.cpp",
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "rdbservicestub_fuzzer.cpp",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${data_service_path}/service:distributeddatasvc",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/cloud:distributeddata_cloud",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
     "${kv_store_distributeddb_path}:distributeddb",
-    "${relational_store_inner_api_path}:native_rdb_static",
   ]
 
   external_deps = [