From c6221bcbefa897d9b45e2e7e6c7cd1301e3a15ca Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Tue, 11 Jan 2022 10:30:38 +0800 Subject: [PATCH 1/3] modify the constructor of KvStoreMetaManager Signed-off-by: zuojiangjiang --- .../app/src/kvstore_meta_manager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp index f72618957..9ffd34af4 100755 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp @@ -48,7 +48,17 @@ std::mutex KvStoreMetaManager::cvMutex_; KvStoreMetaManager::MetaDeviceChangeListenerImpl KvStoreMetaManager::listener_; KvStoreMetaManager::KvStoreMetaManager() - : metaDBDirectory_(Constant::Concatenate({ + : metaDelegate_(nullptr, + [this](DistributedDB::KvStoreNbDelegate *delegate) { + if (delegate == nullptr) { + return; + } + auto result = kvStoreDelegateManager_.CloseKvStore(delegate); + if (result != DistributedDB::DBStatus::OK) { + ZLOGE("CloseMetaKvstore return error status: %d", static_cast(result)); + } + }), + metaDBDirectory_(Constant::Concatenate({ Constant::ROOT_PATH_DE, "/", Constant::SERVICE_NAME, "/", Constant::META_DIR_NAME })), kvStoreDelegateManager_(META_DB_APP_ID, Constant::GetDefaultHarmonyAccountName()) { -- Gitee From d7fe084de179f6780ae1a6e36c683219279cc636 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Tue, 11 Jan 2022 04:51:12 +0000 Subject: [PATCH 2/3] update services/distributeddataservice/app/src/kvstore_meta_manager.h. --- .../distributeddataservice/app/src/kvstore_meta_manager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h index 58bf8178a..f9b2170bb 100755 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.h +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h @@ -299,7 +299,7 @@ private: static constexpr int KEY_SIZE = 32; static constexpr int HOURS_PER_YEAR = (24 * 365); - NbDelegate metaDelegate_ {}; + NbDelegate metaDelegate_; std::string metaDBDirectory_; DistributedDB::KvStoreDelegateManager kvStoreDelegateManager_; std::vector vecRootKeyAlias_ {}; @@ -312,4 +312,4 @@ private: }; } // namespace DistributedKv } // namespace OHOS -#endif // KVSTORE_META_MANAGER_H +#endif // KVSTORE_META_MANAGER_H \ No newline at end of file -- Gitee From cb064a1207564f381ee65f9d5aa23646292ab7a1 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Tue, 11 Jan 2022 04:54:45 +0000 Subject: [PATCH 3/3] update services/distributeddataservice/app/src/kvstore_meta_manager.h. --- services/distributeddataservice/app/src/kvstore_meta_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h index f9b2170bb..f4542a36c 100755 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.h +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h @@ -312,4 +312,4 @@ private: }; } // namespace DistributedKv } // namespace OHOS -#endif // KVSTORE_META_MANAGER_H \ No newline at end of file +#endif // KVSTORE_META_MANAGER_H -- Gitee