From c7f0cfa06bc052ed9ee7e3f5d0424a12f40cb087 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Thu, 24 Mar 2022 16:51:00 +0800 Subject: [PATCH 1/5] Signed-off-by: wufengshan Changes to be committed: --- LICENSE | 1 - .../distributeddatafwk/src/delegate_mgr_callback.h | 1 + services/distributeddataservice/service/rdb/rdb_syncer.cpp | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 4947287f7..2bb9ad240 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h b/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h index 02c28f3e5..ccacf669a 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h @@ -37,6 +37,7 @@ public: void GetKvStoreKeys(std::vector &entries) override { + } bool IsDestruct() diff --git a/services/distributeddataservice/service/rdb/rdb_syncer.cpp b/services/distributeddataservice/service/rdb/rdb_syncer.cpp index 3731e28a0..693baeb14 100644 --- a/services/distributeddataservice/service/rdb/rdb_syncer.cpp +++ b/services/distributeddataservice/service/rdb/rdb_syncer.cpp @@ -42,8 +42,10 @@ RdbSyncer::~RdbSyncer() noexcept manager_->CloseStore(delegate_); } delete manager_; + manager_ = nullptr; if (observer_ != nullptr) { delete observer_; + observer_ = nullptr; } } -- Gitee From d52174cdcfcf64be51ffb6225a23b16fff31f390 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Thu, 24 Mar 2022 16:56:47 +0800 Subject: [PATCH 2/5] Signed-off-by: wufengshan Changes to be committed: --- .../distributeddatafwk/src/delegate_mgr_callback.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h b/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h index ccacf669a..a878100d2 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/delegate_mgr_callback.h @@ -37,7 +37,7 @@ public: void GetKvStoreKeys(std::vector &entries) override { - + (void) entries; } bool IsDestruct() -- Gitee From 06a2c13bc80122bc6787e16ae67f74a806f2684c Mon Sep 17 00:00:00 2001 From: wufengshan Date: Thu, 24 Mar 2022 20:40:25 +0800 Subject: [PATCH 3/5] Signed-off-by: wufengshan Changes to be committed: --- services/distributeddataservice/service/rdb/rdb_syncer.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/distributeddataservice/service/rdb/rdb_syncer.cpp b/services/distributeddataservice/service/rdb/rdb_syncer.cpp index 693baeb14..3731e28a0 100644 --- a/services/distributeddataservice/service/rdb/rdb_syncer.cpp +++ b/services/distributeddataservice/service/rdb/rdb_syncer.cpp @@ -42,10 +42,8 @@ RdbSyncer::~RdbSyncer() noexcept manager_->CloseStore(delegate_); } delete manager_; - manager_ = nullptr; if (observer_ != nullptr) { delete observer_; - observer_ = nullptr; } } -- Gitee From 0dbc14d4cbf507b0681b69b35ff1ca11c9fe1e6d Mon Sep 17 00:00:00 2001 From: wufengshan Date: Fri, 25 Mar 2022 09:32:42 +0800 Subject: [PATCH 4/5] Signed-off-by: wufengshan Changes to be committed: --- services/distributeddataservice/app/src/backup_handler.cpp | 2 -- services/distributeddataservice/app/src/query_helper.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/services/distributeddataservice/app/src/backup_handler.cpp b/services/distributeddataservice/app/src/backup_handler.cpp index 9551a2bdc..1add4ec49 100644 --- a/services/distributeddataservice/app/src/backup_handler.cpp +++ b/services/distributeddataservice/app/src/backup_handler.cpp @@ -89,14 +89,12 @@ void BackupHandler::SingleKvStoreBackup(const MetaData &metaData) if (!initPara) { return; } - DistributedDB::KvStoreNbDelegate::Option dbOption; dbOption.createIfNecessary = false; dbOption.isEncryptedDb = backupPara.password.GetSize() > 0; dbOption.passwd = backupPara.password; dbOption.createDirByStoreIdOnly = true; dbOption.secOption = KvStoreAppManager::ConvertSecurity(metaData.kvStoreMetaData.securityLevel); - auto *delegateMgr = new DistributedDB::KvStoreDelegateManager(metaData.kvStoreMetaData.appId, AccountDelegate::GetInstance()->GetCurrentAccountId(metaData.kvStoreMetaData.bundleName)); std::string appDataStoragePath = KvStoreAppManager::GetDataStoragePath(metaData.kvStoreMetaData.deviceAccountId, diff --git a/services/distributeddataservice/app/src/query_helper.cpp b/services/distributeddataservice/app/src/query_helper.cpp index cb56bf8a5..c11c417e9 100644 --- a/services/distributeddataservice/app/src/query_helper.cpp +++ b/services/distributeddataservice/app/src/query_helper.cpp @@ -36,7 +36,7 @@ DistributedDB::Query QueryHelper::StringToDbQuery(const std::string &query, bool { ZLOGI("query string length:%{public}zu", query.length()); DistributedDB::Query dbQuery = DistributedDB::Query::Select(); - if (query.size() == 0) { + if (query.empty()) { ZLOGI("Query string is empty."); isSuccess = true; return dbQuery; -- Gitee From 42ab29e6bfdd36ad576d636212886c8781b965b5 Mon Sep 17 00:00:00 2001 From: wufengshan Date: Fri, 25 Mar 2022 09:40:29 +0800 Subject: [PATCH 5/5] Signed-off-by: wufengshan Changes to be committed: --- services/distributeddataservice/app/src/backup_handler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/app/src/backup_handler.cpp b/services/distributeddataservice/app/src/backup_handler.cpp index 1add4ec49..f94dd1e55 100644 --- a/services/distributeddataservice/app/src/backup_handler.cpp +++ b/services/distributeddataservice/app/src/backup_handler.cpp @@ -95,6 +95,7 @@ void BackupHandler::SingleKvStoreBackup(const MetaData &metaData) dbOption.passwd = backupPara.password; dbOption.createDirByStoreIdOnly = true; dbOption.secOption = KvStoreAppManager::ConvertSecurity(metaData.kvStoreMetaData.securityLevel); + auto *delegateMgr = new DistributedDB::KvStoreDelegateManager(metaData.kvStoreMetaData.appId, AccountDelegate::GetInstance()->GetCurrentAccountId(metaData.kvStoreMetaData.bundleName)); std::string appDataStoragePath = KvStoreAppManager::GetDataStoragePath(metaData.kvStoreMetaData.deviceAccountId, -- Gitee