diff --git a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h index 65f8fb16552d4ec03f843e27956aa327a2b82d4c..69336f8336d041bea9aa0b0484907fc7fe9d07d9 100644 --- a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h +++ b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h @@ -30,8 +30,6 @@ public: // when the anonymous string is shorter than 9, the anonymous is "******" KVSTORE_API static std::string ToBeAnonymous(const std::string &name); - KVSTORE_API static AppDistributedKv::CommunicationProvider &GetProviderInstance(); - KVSTORE_API static uint64_t GenerateSequenceId(); private: static constexpr int MAIN_USER_ID = 0; diff --git a/services/distributeddataservice/adapter/utils/BUILD.gn b/services/distributeddataservice/adapter/utils/BUILD.gn index ede838c775fe19dae1ff746e03be0095a6d6eefe..696db951a9007619feea4390e5099ee35b97f367 100755 --- a/services/distributeddataservice/adapter/utils/BUILD.gn +++ b/services/distributeddataservice/adapter/utils/BUILD.gn @@ -25,16 +25,14 @@ ohos_static_library("distributeddata_utils_static") { "../include/permission", "../include/utils", "../include/log", + "../include/communicator", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", "//utils/native/base/include", "../include/dfx", "//foundation/distributeddatamgr/distributeddatamgr/frameworks/common", ] ldflags = [ "-Wl,--exclude-libs,ALL" ] - deps = [ - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter", - "//utils/native/base:utils", - ] + deps = [ "//utils/native/base:utils" ] external_deps = [ "ability_base:base", diff --git a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp index 097aaf0433d1210ffdbf4d6701d4e6dd2cf99023..bfb23ba2e9bd24be32ab5484c190b0843838df93 100644 --- a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp +++ b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp @@ -39,15 +39,6 @@ std::string KvStoreUtils::ToBeAnonymous(const std::string &name) return (name.substr(0, HEAD_SIZE) + REPLACE_CHAIN + name.substr(name.length() - END_SIZE, END_SIZE)); } -AppDistributedKv::CommunicationProvider &KvStoreUtils::GetProviderInstance() -{ -#ifdef CONFIG_PUBLIC_VERSION - return AppDistributedKv::CommunicationProvider::GetInstance(); -#else - return *(AppDistributedKv::CommunicationProvider::MakeCommunicationProvider().get()); -#endif -} - uint64_t KvStoreUtils::GenerateSequenceId() { return ++sequenceId_; diff --git a/services/distributeddataservice/app/src/device_change_listener_impl.cpp b/services/distributeddataservice/app/src/device_change_listener_impl.cpp index 6f39d5d633ffc7759942d01c14484b0f670a361e..44af19ba85ca3406794c4516eac22f264501eb76 100644 --- a/services/distributeddataservice/app/src/device_change_listener_impl.cpp +++ b/services/distributeddataservice/app/src/device_change_listener_impl.cpp @@ -30,7 +30,7 @@ void DeviceChangeListenerImpl::OnDeviceChanged(const AppDistributedKv::DeviceInf { DeviceChangeType deviceType = type == AppDistributedKv::DeviceChangeType::DEVICE_ONLINE ? DeviceChangeType::DEVICE_ONLINE : DeviceChangeType::DEVICE_OFFLINE; - auto nodeid = KvStoreUtils::GetProviderInstance().ToNodeId(info.deviceId); + auto nodeid = AppDistributedKv::CommunicationProvider::GetInstance().ToNodeId(info.deviceId); ZLOGD("networkid:%s", nodeid.c_str()); ZLOGD("uuid:%s", KvStoreUtils::ToBeAnonymous(info.deviceId).c_str()); for (auto const &observer : observers_) { diff --git a/services/distributeddataservice/app/src/device_kvstore_impl.cpp b/services/distributeddataservice/app/src/device_kvstore_impl.cpp index 2b8a80236d7c9610857b345b6b8d1657dc985836..3f5e321296f3b505e6f41f834bd9d8063c30ce75 100644 --- a/services/distributeddataservice/app/src/device_kvstore_impl.cpp +++ b/services/distributeddataservice/app/src/device_kvstore_impl.cpp @@ -162,7 +162,7 @@ std::string DeviceKvStoreImpl::GetLocalDeviceId() return localDeviceId_; } - localDeviceId_ = KvStoreUtils::GetProviderInstance().GetLocalDevice().deviceId; + localDeviceId_ = AppDistributedKv::CommunicationProvider::GetInstance().GetLocalDevice().deviceId; return localDeviceId_; } @@ -185,7 +185,7 @@ Status DeviceKvStoreImpl::DeleteKeyPrefix(const Key &in, std::vector &o return Status::ERROR; } std::string nodeid(inData.begin() + deviceIdPrefixLen, inData.begin() + deviceIdPrefixLen + localDeviceId_.size()); - std::string deviceUuID = KvStoreUtils::GetProviderInstance().GetUuidByNodeId(nodeid); + std::string deviceUuID = AppDistributedKv::CommunicationProvider::GetInstance().GetUuidByNodeId(nodeid); if (deviceUuID.empty()) { ZLOGE("device uuid is empty."); return Status::KEY_NOT_FOUND; diff --git a/services/distributeddataservice/app/src/device_kvstore_observer_impl.cpp b/services/distributeddataservice/app/src/device_kvstore_observer_impl.cpp index 27c7d9c01927765223aeafc7bf48bf9f8c84718f..6f47d0fe56635cfdc51582bda029d6a6a8f882d1 100644 --- a/services/distributeddataservice/app/src/device_kvstore_observer_impl.cpp +++ b/services/distributeddataservice/app/src/device_kvstore_observer_impl.cpp @@ -54,7 +54,7 @@ void DeviceKvStoreObserverImpl::Transfer(const std::list & std::string &deviceId) { if (localDeviceId_.empty()) { - auto localDevId = KvStoreUtils::GetProviderInstance().GetLocalDevice().deviceId; + auto localDevId = AppDistributedKv::CommunicationProvider::GetInstance().GetLocalDevice().deviceId; if (localDevId.empty()) { return; } @@ -69,9 +69,9 @@ void DeviceKvStoreObserverImpl::Transfer(const std::list & ZLOGI("Get deviceId from Entry."); auto uuid = std::string(entry.key.begin(), entry.key.begin() + localDeviceId_.length()); if (localDeviceId_.compare(uuid) == 0) { - deviceId = KvStoreUtils::GetProviderInstance().GetLocalBasicInfo().deviceId; + deviceId = AppDistributedKv::CommunicationProvider::GetInstance().GetLocalBasicInfo().deviceId; } else { - deviceId = KvStoreUtils::GetProviderInstance().ToNodeId(uuid); + deviceId = AppDistributedKv::CommunicationProvider::GetInstance().ToNodeId(uuid); } } std::vector decorateKey(entry.key.begin() + localDeviceId_.length(), entry.key.end() - sizeof(int)); diff --git a/services/distributeddataservice/app/src/device_kvstore_resultset_impl.cpp b/services/distributeddataservice/app/src/device_kvstore_resultset_impl.cpp index d267f9390410be88826fa7191d31d7c5065976c9..1e1bb8a63c3061118b4cb3b4a7f4b3f4891efcef 100644 --- a/services/distributeddataservice/app/src/device_kvstore_resultset_impl.cpp +++ b/services/distributeddataservice/app/src/device_kvstore_resultset_impl.cpp @@ -36,7 +36,7 @@ Status DeviceKvStoreResultSetImpl::GetEntry(Entry &entry) return ret; } - auto localDevId = KvStoreUtils::GetProviderInstance().GetLocalDevice().deviceId; + auto localDevId = AppDistributedKv::CommunicationProvider::GetInstance().GetLocalDevice().deviceId; if (localDevId.empty()) { ZLOGI("RS: localDevId empty"); return Status::ILLEGAL_STATE; diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index 56d28ebdc7711813dd28e77ea43f6e630535bd74..99d106632a4a707734b32f4e599b3721d4e1f6a4 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -134,7 +134,8 @@ void KvStoreDataService::Initialize() accountEventObserver_ = std::make_shared(*this); AccountDelegate::GetInstance()->Subscribe(accountEventObserver_); deviceInnerListener_ = std::make_unique(*this); - KvStoreUtils::GetProviderInstance().StartWatchDeviceChange(deviceInnerListener_.get(), { "innerListener" }); + AppDistributedKv::CommunicationProvider::GetInstance().StartWatchDeviceChange( + deviceInnerListener_.get(), { "innerListener" }); } Status KvStoreDataService::GetKvStore(const Options &options, const AppId &appId, const StoreId &storeId, @@ -1221,14 +1222,14 @@ void KvStoreDataService::AccountEventChanged(const AccountEventInfo &eventInfo) Status KvStoreDataService::GetLocalDevice(DeviceInfo &device) { - auto tmpDevice = KvStoreUtils::GetProviderInstance().GetLocalBasicInfo(); + auto tmpDevice = AppDistributedKv::CommunicationProvider::GetInstance().GetLocalBasicInfo(); device = {tmpDevice.deviceId, tmpDevice.deviceName, tmpDevice.deviceType}; return Status::SUCCESS; } Status KvStoreDataService::GetDeviceList(std::vector &deviceInfoList, DeviceFilterStrategy strategy) { - auto devices = KvStoreUtils::GetProviderInstance().GetRemoteNodesBasicInfo(); + auto devices = AppDistributedKv::CommunicationProvider::GetInstance().GetRemoteNodesBasicInfo(); for (auto const &device : devices) { DeviceInfo deviceInfo = {device.deviceId, device.deviceName, device.deviceType}; deviceInfoList.push_back(deviceInfo); @@ -1250,7 +1251,8 @@ void KvStoreDataService::InitSecurityAdapter() auto dbStatus = DistributedDB::KvStoreDelegateManager::SetProcessSystemAPIAdapter(security_); ZLOGD("set distributed db system api adapter: %d.", static_cast(dbStatus)); - auto status = KvStoreUtils::GetProviderInstance().StartWatchDeviceChange(security_.get(), {"security"}); + auto status = AppDistributedKv::CommunicationProvider::GetInstance().StartWatchDeviceChange( + security_.get(), {"security"}); if (status != AppDistributedKv::Status::SUCCESS) { ZLOGD("security register device change failed, status:%d", static_cast(status)); } @@ -1266,7 +1268,8 @@ Status KvStoreDataService::StartWatchDeviceChange(sptr lck(deviceListenerMutex_); if (deviceListener_ == nullptr) { deviceListener_ = std::make_shared(deviceListeners_); - KvStoreUtils::GetProviderInstance().StartWatchDeviceChange(deviceListener_.get(), {"serviceWatcher"}); + AppDistributedKv::CommunicationProvider::GetInstance().StartWatchDeviceChange( + deviceListener_.get(), {"serviceWatcher"}); } IRemoteObject *objectPtr = observer->AsObject().GetRefPtr(); auto listenerPair = std::make_pair(objectPtr, observer); diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp index aec8a152c67fc281f57b93beca06c340f02291bb..36f33e19c8d88322189903aa497fc337423db650 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp @@ -95,7 +95,8 @@ void KvStoreMetaManager::SubscribeMeta(const std::string &keyPrefix, const Chang void KvStoreMetaManager::InitMetaListener() { InitMetaData(); - auto status = KvStoreUtils::GetProviderInstance().StartWatchDeviceChange(&listener_, { "metaMgr" }); + auto status = AppDistributedKv::CommunicationProvider::GetInstance().StartWatchDeviceChange( + &listener_, { "metaMgr" }); if (status != AppDistributedKv::Status::SUCCESS) { ZLOGW("register failed."); return; @@ -816,7 +817,7 @@ Status KvStoreMetaManager::DeleteStrategyMeta(const std::string &bundleName, con void KvStoreMetaManager::SyncMeta() { std::vector devs; - auto deviceList = KvStoreUtils::GetProviderInstance().GetDeviceList(); + auto deviceList = AppDistributedKv::CommunicationProvider::GetInstance().GetDeviceList(); for (auto const &dev : deviceList) { devs.push_back(dev.deviceId); } diff --git a/services/distributeddataservice/app/src/query_helper.cpp b/services/distributeddataservice/app/src/query_helper.cpp index c11c417e93c45b418d7147a2170de8be6f487158..56114bfb3a5ea2218ddeb335d591c1fc0bb6fba8 100644 --- a/services/distributeddataservice/app/src/query_helper.cpp +++ b/services/distributeddataservice/app/src/query_helper.cpp @@ -549,7 +549,7 @@ void QueryHelper::HandleDeviceId(const std::vector &words, int &poi } deviceId_ = StringToString(words.at(pointer + 1)); // deviceId ZLOGI("query devId string length:%zu", deviceId_.length()); - deviceId_ = KvStoreUtils::GetProviderInstance().GetUuidByNodeId(deviceId_); // convert to UUId + deviceId_ = AppDistributedKv::CommunicationProvider::GetInstance().GetUuidByNodeId(deviceId_); // convert to UUId ZLOGI("query converted devId string length:%zu", deviceId_.length()); if (!hasPrefixKey_) { ZLOGD("DeviceId as the only prefixKey."); diff --git a/services/distributeddataservice/app/src/single_kvstore_impl.cpp b/services/distributeddataservice/app/src/single_kvstore_impl.cpp index 3fd7506153f690c87d1ca01f04db33e0b6300cf9..5ff7dbfb09403f12ac368469593961349596081a 100644 --- a/services/distributeddataservice/app/src/single_kvstore_impl.cpp +++ b/services/distributeddataservice/app/src/single_kvstore_impl.cpp @@ -685,7 +685,7 @@ Status SingleKvStoreImpl::RemoveDeviceData(const std::string &device) return Status::EXCEED_MAX_ACCESS_RATE; } // map UUID to UDID - std::string deviceUDID = KvStoreUtils::GetProviderInstance().GetUuidByNodeId(device); + std::string deviceUDID = AppDistributedKv::CommunicationProvider::GetInstance().GetUuidByNodeId(device); if (deviceUDID.empty()) { ZLOGE("can't get nodeid"); return Status::ERROR; @@ -898,7 +898,7 @@ std::vector SingleKvStoreImpl::MapNodeIdToUuids(const std::vector deviceUuids; for (auto const &nodeId : deviceIds) { - std::string uuid = KvStoreUtils::GetProviderInstance().GetUuidByNodeId(nodeId); + std::string uuid = AppDistributedKv::CommunicationProvider::GetInstance().GetUuidByNodeId(nodeId); if (!uuid.empty()) { deviceUuids.push_back(uuid); }