From 86a5cb81acc412ea99e39b2914afa33487d33983 Mon Sep 17 00:00:00 2001 From: yangliu Date: Thu, 11 Sep 2025 14:38:53 +0800 Subject: [PATCH 1/3] update Signed-off-by: yangliu --- .../distributeddataservice/service/kvdb/kvdb_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp index cde27ab22..b6552557b 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp @@ -205,7 +205,7 @@ Status KVDBServiceImpl::Delete(const AppId &appId, const StoreId &storeId, int32 MetaDataManager::GetInstance().DelMeta(metaData.GetDebugInfoKey(), true); MetaDataManager::GetInstance().DelMeta(metaData.GetCloneSecretKey(), true); PermitDelegate::GetInstance().DelCache(metaData.GetKeyWithoutPath()); - AutoCache::GetInstance().CloseStore(metaData.tokenId, metaData.dataDir); + AutoCache::GetInstance().CloseStore(metaData.tokenId, metaData.dataDir, storeId); ZLOGD("appId:%{public}s storeId:%{public}s instanceId:%{public}d", appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(), metaData.instanceId); return SUCCESS; -- Gitee From a9a71132ed23a014dc35082cf6315f50ce8891e1 Mon Sep 17 00:00:00 2001 From: yangliu Date: Thu, 11 Sep 2025 16:20:16 +0800 Subject: [PATCH 2/3] update Signed-off-by: yangliu --- .../service/kvdb/kvdb_general_store.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp index f18d59547..ec09a29e3 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp @@ -443,8 +443,8 @@ std::pair KVDBGeneralStore::Sync(const Devices &devices, GenQu dbStatus = delegate_->UnSubscribeRemoteQuery(devices, GetDBSyncCompleteCB(std::move(async)), dbQuery, false); } else if (syncMode < NEARBY_END) { - DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .isQuery = !kvQuery->IsEmpty(), - .query = dbQuery, .isWait = false, .isRetry = syncParam.isRetry }; + DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .query = dbQuery, + .isQuery = !kvQuery->IsEmpty(), .isWait = false, .isRetry = syncParam.isRetry }; dbStatus = delegate_->Sync(syncOption, GetDBSyncCompleteCB(std::move(async))); } else { ZLOGE("Err sync mode! sync mode:%{public}d", syncMode); -- Gitee From 8df6fca601e8f4bad42941c6a9fe750c1377cbb9 Mon Sep 17 00:00:00 2001 From: yangliu Date: Thu, 11 Sep 2025 16:20:55 +0800 Subject: [PATCH 3/3] update Signed-off-by: yangliu --- .../service/kvdb/kvdb_general_store.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp index ec09a29e3..f18d59547 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp @@ -443,8 +443,8 @@ std::pair KVDBGeneralStore::Sync(const Devices &devices, GenQu dbStatus = delegate_->UnSubscribeRemoteQuery(devices, GetDBSyncCompleteCB(std::move(async)), dbQuery, false); } else if (syncMode < NEARBY_END) { - DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .query = dbQuery, - .isQuery = !kvQuery->IsEmpty(), .isWait = false, .isRetry = syncParam.isRetry }; + DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .isQuery = !kvQuery->IsEmpty(), + .query = dbQuery, .isWait = false, .isRetry = syncParam.isRetry }; dbStatus = delegate_->Sync(syncOption, GetDBSyncCompleteCB(std::move(async))); } else { ZLOGE("Err sync mode! sync mode:%{public}d", syncMode); -- Gitee