From a22326fe01edc8788d0ae511fa3e7e8c501e7fe8 Mon Sep 17 00:00:00 2001 From: wanghuajian-6 Date: Wed, 25 Jun 2025 10:07:14 +0800 Subject: [PATCH] fix store type Signed-off-by: wanghuajian-6 --- .../framework/include/metadata/store_meta_data.h | 2 -- .../service/test/directory_manager_test.cpp | 2 +- .../service/udmf/store/runtime_store.cpp | 4 ++-- .../service/udmf/udmf_service_impl.cpp | 7 ++++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/services/distributeddataservice/framework/include/metadata/store_meta_data.h b/services/distributeddataservice/framework/include/metadata/store_meta_data.h index daa3f89c5..ae714acff 100644 --- a/services/distributeddataservice/framework/include/metadata/store_meta_data.h +++ b/services/distributeddataservice/framework/include/metadata/store_meta_data.h @@ -69,8 +69,6 @@ struct API_EXPORT StoreMetaData : public Serializable { STORE_RELATIONAL_END = 19, STORE_OBJECT_BEGIN = 20, STORE_OBJECT_END = 29, - STORE_UDMF_BEGIN = 30, - STORE_UDMF_END = 39, STORE_BUTT = 255 }; diff --git a/services/distributeddataservice/service/test/directory_manager_test.cpp b/services/distributeddataservice/service/test/directory_manager_test.cpp index a71c6df46..0ecc3fbb0 100644 --- a/services/distributeddataservice/service/test/directory_manager_test.cpp +++ b/services/distributeddataservice/service/test/directory_manager_test.cpp @@ -208,7 +208,7 @@ HWTEST_F(DirectoryManagerTest, GetUdmfStorePath, TestSize.Level0) metaData.tokenId = GetAccessTokenId(&tokenParam_); metaData.area = DistributedKv::Area::EL2; metaData.uid = static_cast(getuid()); - metaData.storeType = StoreMetaData::StoreType::STORE_UDMF_BEGIN; + metaData.storeType = DistributedKv::KvStoreType::SINGLE_VERSION; metaData.dataType = DistributedKv::DataType::TYPE_DYNAMICAL; metaData.authType = DistributedKv::AuthType::IDENTICAL_ACCOUNT; metaData.dataDir = "/data/service/el2/100/database/distributeddata/other"; diff --git a/services/distributeddataservice/service/udmf/store/runtime_store.cpp b/services/distributeddataservice/service/udmf/store/runtime_store.cpp index 9117d4027..d13e1adec 100644 --- a/services/distributeddataservice/service/udmf/store/runtime_store.cpp +++ b/services/distributeddataservice/service/udmf/store/runtime_store.cpp @@ -159,7 +159,7 @@ Status RuntimeStore::PutSummary(UnifiedKey &key, const Summary &summary) return status; } auto summaryKey = propertyKey + SUMMARY_SUFIX; - std::vector entries{{{summaryKey.begin(), summaryKey.end()}, value}};; + std::vector entries{{{summaryKey.begin(), summaryKey.end()}, value}}; return PutEntries(std::move(entries)); } @@ -479,7 +479,7 @@ bool RuntimeStore::BuildMetaDataParam(DistributedData::StoreMetaData &metaData) metaData.securityLevel = DistributedKv::SecurityLevel::S1; metaData.area = DistributedKv::Area::EL2; metaData.uid = static_cast(getuid()); - metaData.storeType = StoreMetaData::StoreType::STORE_UDMF_BEGIN; + metaData.storeType = DistributedKv::KvStoreType::SINGLE_VERSION; metaData.dataType = DistributedKv::DataType::TYPE_DYNAMICAL; metaData.authType = DistributedKv::AuthType::IDENTICAL_ACCOUNT; diff --git a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp index 1ceb45cc8..a3ea7ce7e 100644 --- a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp +++ b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp @@ -612,7 +612,8 @@ int32_t UdmfServiceImpl::StoreSync(const UnifiedKey &key, const QueryOption &que BizScene::SYNC_DATA, SyncDataStage::SYNC_END, StageRes::FAILED, E_DB_ERROR, BizState::DFX_END); } })) { - ZLOGW("bundleName:%{public}s, meta sync failed", key.bundleName.c_str()); + ZLOGE("bundleName:%{public}s, meta sync failed", key.bundleName.c_str()); + return E_DB_ERROR; } if (store->Sync(devices, callback) != E_OK) { ZLOGE("Store sync failed"); @@ -866,8 +867,8 @@ int32_t UdmfServiceImpl::ResolveAutoLaunch(const std::string &identifier, DBLaun } for (const auto &storeMeta : metaData) { - if (storeMeta.storeType < StoreMetaData::StoreType::STORE_UDMF_BEGIN || - storeMeta.storeType > StoreMetaData::StoreType::STORE_UDMF_END || + if (storeMeta.storeType < StoreMetaData::StoreType::STORE_KV_BEGIN || + storeMeta.storeType > StoreMetaData::StoreType::STORE_KV_END || storeMeta.appId != Bootstrap::GetInstance().GetProcessLabel()) { continue; } -- Gitee