From f8994e1f48f0c8200cdd7963e80e28594af65480 Mon Sep 17 00:00:00 2001 From: zhangdi Date: Tue, 1 Apr 2025 20:33:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0sync=E5=85=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdi --- .../service/rdb/rdb_service_impl.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp index c4123e299..482f3a958 100644 --- a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp +++ b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp @@ -1231,8 +1231,20 @@ int32_t RdbServiceImpl::RdbStatic::OnAppUpdate(const std::string &bundleName, in std::string prefix = Database::GetPrefix({std::to_string(user), "default", bundleName}); std::vector dataBase; if (MetaDataManager::GetInstance().LoadMeta(prefix, dataBase, true)) { - for (const auto &dataBase : dataBase) { - MetaDataManager::GetInstance().DelMeta(dataBase.GetKey(), true); + for (const auto &database : dataBase) { + ZLOGD("Delete matedata store is :%{public}s", database.name.c_str()); + MetaDataManager::GetInstance().DelMeta(database.GetKey(), true); + StoreMetaData meta; + meta.user = database.user; + meta.deviceId = database.deviceId; + meta.storeId = database.name; + meta.bundleName = bundleName; + Database base; + if (RdbSchemaConfig::GetDistributedSchema(meta, base) && !base.name.empty() && + !base.bundleName.empty()) { + ZLOGD("save metadata store is :%{public}s", base.name.c_str()); + MetaDataManager::GetInstance().SaveMeta(base.GetKey(), base, true); + } } } return CloseStore(bundleName, user, index); -- Gitee From 7d78023d1b7b2605066257a10d1122b76a5535a2 Mon Sep 17 00:00:00 2001 From: zhangdi Date: Sun, 6 Apr 2025 03:42:07 +0000 Subject: [PATCH 2/2] update services/distributeddataservice/service/rdb/rdb_service_impl.cpp. Signed-off-by: zhangdi --- .../service/rdb/rdb_service_impl.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp index 482f3a958..baaff4ef0 100644 --- a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp +++ b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp @@ -1232,18 +1232,19 @@ int32_t RdbServiceImpl::RdbStatic::OnAppUpdate(const std::string &bundleName, in std::vector dataBase; if (MetaDataManager::GetInstance().LoadMeta(prefix, dataBase, true)) { for (const auto &database : dataBase) { - ZLOGD("Delete matedata store is :%{public}s", database.name.c_str()); MetaDataManager::GetInstance().DelMeta(database.GetKey(), true); + ZLOGD("del metadata store is: %{public}s; user is: %{public}s; bundleName is: %{public}s", + Anonymous::Change(database.name).c_str(), database.user.c_str(), database.bundleName.c_str()); StoreMetaData meta; meta.user = database.user; meta.deviceId = database.deviceId; meta.storeId = database.name; meta.bundleName = bundleName; Database base; - if (RdbSchemaConfig::GetDistributedSchema(meta, base) && !base.name.empty() && - !base.bundleName.empty()) { - ZLOGD("save metadata store is :%{public}s", base.name.c_str()); + if (RdbSchemaConfig::GetDistributedSchema(meta, base) && !base.name.empty() && !base.bundleName.empty()) { MetaDataManager::GetInstance().SaveMeta(base.GetKey(), base, true); + ZLOGD("save metadata store is: %{public}s; user is: %{public}s; bundleName is: %{public}s", + Anonymous::Change(base.name).c_str(), base.user.c_str(), base.bundleName.c_str()); } } } -- Gitee