From 844b288d3fea5870099caabf3e451c6c68b4f6fd Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 25 Aug 2025 20:42:16 +0800 Subject: [PATCH 1/3] code fix Signed-off-by: z30053452 --- .../app/src/kvstore_data_service.cpp | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index 51af0c61e..cb9b50d94 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -1160,7 +1160,14 @@ void KvStoreDataService::DumpStoreInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId }), metas, true)) { + std::vector users; + int32_t user = 0; + AccountDelegate::GetInstance()->QueryForegroundUsers(users); + if (users.size() > 0) { + user = users[0]; + } + if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), + metas, true)) { ZLOGE("get full meta failed"); return; } @@ -1314,7 +1321,14 @@ void KvStoreDataService::DumpUserInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId }), metas, true)) { + std::vector users; + int32_t user = 0; + AccountDelegate::GetInstance()->QueryForegroundUsers(users); + if (users.size() > 0) { + user = users[0]; + } + if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), + metas, true)) { ZLOGE("get full meta failed"); return; } @@ -1414,7 +1428,14 @@ void KvStoreDataService::DumpBundleInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId }), metas, true)) { + std::vector users; + int32_t user = 0; + AccountDelegate::GetInstance()->QueryForegroundUsers(users); + if (users.size() > 0) { + user = users[0]; + } + if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), + metas, true)) { ZLOGE("get full meta failed"); return; } -- Gitee From 9dd2e9b28446399e9547a030f789848accf3c84a Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 25 Aug 2025 21:12:27 +0800 Subject: [PATCH 2/3] code fix Signed-off-by: z30053452 --- .../app/src/kvstore_data_service.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index cb9b50d94..fa1a78012 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -1160,11 +1160,11 @@ void KvStoreDataService::DumpStoreInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - std::vector users; - int32_t user = 0; - AccountDelegate::GetInstance()->QueryForegroundUsers(users); - if (users.size() > 0) { - user = users[0]; + int user = 0; + auto ret = AccountDelegate::GetInstance()->QueryForegroundUserId(user); + if (!ret) { + ZLOGE("get foreground userid failed"); + return; } if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), metas, true)) { @@ -1321,11 +1321,11 @@ void KvStoreDataService::DumpUserInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - std::vector users; - int32_t user = 0; - AccountDelegate::GetInstance()->QueryForegroundUsers(users); - if (users.size() > 0) { - user = users[0]; + int user = 0; + auto ret = AccountDelegate::GetInstance()->QueryForegroundUserId(user); + if (!ret) { + ZLOGE("get foreground userid failed"); + return; } if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), metas, true)) { @@ -1428,11 +1428,11 @@ void KvStoreDataService::DumpBundleInfo(int fd, std::map metas; std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - std::vector users; - int32_t user = 0; - AccountDelegate::GetInstance()->QueryForegroundUsers(users); - if (users.size() > 0) { - user = users[0]; + int user = 0; + auto ret = AccountDelegate::GetInstance()->QueryForegroundUserId(user); + if (!ret) { + ZLOGE("get foreground userid failed"); + return; } if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), metas, true)) { -- Gitee From 91e4b6ed4640e296208930dd62d9a08cc9f74f63 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 26 Aug 2025 14:47:55 +0800 Subject: [PATCH 3/3] code fix Signed-off-by: z30053452 --- .../app/src/kvstore_data_service.cpp | 40 ------------------- .../unittest/kvstore_data_service_test.cpp | 15 ------- .../service/dumper/src/dump_helper.cpp | 6 +-- 3 files changed, 3 insertions(+), 58 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index fa1a78012..a9be1e0d0 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -364,10 +364,6 @@ void KvStoreDataService::OnStart() Handler handlerStoreInfo = std::bind(&KvStoreDataService::DumpStoreInfo, this, std::placeholders::_1, std::placeholders::_2); DumpManager::GetInstance().AddHandler("STORE_INFO", uintptr_t(this), handlerStoreInfo); - RegisterUserInfo(); - Handler handlerUserInfo = std::bind(&KvStoreDataService::DumpUserInfo, this, std::placeholders::_1, - std::placeholders::_2); - DumpManager::GetInstance().AddHandler("USER_INFO", uintptr_t(this), handlerUserInfo); RegisterBundleInfo(); Handler handlerBundleInfo = std::bind(&KvStoreDataService::DumpBundleInfo, this, std::placeholders::_1, std::placeholders::_2); @@ -1253,21 +1249,6 @@ std::string KvStoreDataService::GetIndentation(int size) return indentation; } -void KvStoreDataService::RegisterUserInfo() -{ - DumpManager::Config userInfoConfig; - userInfoConfig.fullCmd = "--user-info"; - userInfoConfig.abbrCmd = "-u"; - userInfoConfig.dumpName = "USER_INFO"; - userInfoConfig.countPrintf = PRINTF_COUNT_2; - userInfoConfig.infoName = " "; - userInfoConfig.minParamsNum = 0; - userInfoConfig.maxParamsNum = MAXIMUM_PARAMETER_LIMIT; // User contains no more than three parameters - userInfoConfig.childNode = "BUNDLE_INFO"; - userInfoConfig.dumpCaption = { "| Display all the user statistics", "| Display the user statistics by UserId" }; - DumpManager::GetInstance().AddConfig(userInfoConfig.dumpName, userInfoConfig); -} - void KvStoreDataService::BuildData(std::map &datas, const std::vector &metas) { for (auto &meta : metas) { @@ -1317,27 +1298,6 @@ void KvStoreDataService::PrintfInfo(int fd, const std::map> ¶ms) -{ - std::vector metas; - std::string localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; - int user = 0; - auto ret = AccountDelegate::GetInstance()->QueryForegroundUserId(user); - if (!ret) { - ZLOGE("get foreground userid failed"); - return; - } - if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ localDeviceId, std::to_string(user) }), - metas, true)) { - ZLOGE("get full meta failed"); - return; - } - FilterData(metas, params); - std::map datas; - BuildData(datas, metas); - PrintfInfo(fd, datas); -} - void KvStoreDataService::RegisterBundleInfo() { DumpManager::Config bundleInfoConfig; diff --git a/services/distributeddataservice/app/test/unittest/kvstore_data_service_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_data_service_test.cpp index fcaec7983..18167c5da 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_data_service_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_data_service_test.cpp @@ -673,21 +673,6 @@ HWTEST_F(KvStoreDataServiceTest, BuildData002, TestSize.Level0) EXPECT_NO_FATAL_FAILURE(kvStoreDataServiceTest.BuildData(datas, metas)); } -/** -* @tc.name: DumpUserInfo001 -* @tc.desc: test DumpUserInfo function -* @tc.type: FUNC -* @tc.require: -* @tc.author: SQL -*/ -HWTEST_F(KvStoreDataServiceTest, DumpUserInfo001, TestSize.Level0) -{ - KvStoreDataService kvStoreDataServiceTest; - int fd = 0; - std::map> params = {}; - EXPECT_NO_FATAL_FAILURE(kvStoreDataServiceTest.DumpUserInfo(fd, params)); -} - /** * @tc.name: DumpBundleInfo001 * @tc.desc: test DumpBundleInfo function diff --git a/services/distributeddataservice/service/dumper/src/dump_helper.cpp b/services/distributeddataservice/service/dumper/src/dump_helper.cpp index 04c125b06..287033dbd 100644 --- a/services/distributeddataservice/service/dumper/src/dump_helper.cpp +++ b/services/distributeddataservice/service/dumper/src/dump_helper.cpp @@ -264,9 +264,9 @@ void DumpHelper::DumpHelpInfo(int fd, std::map\nwhere possible options include:\n%s\nWhen -u/-u , -b/-b " - " or -s/-s is simultaneously selected,\nwe display the lowest level statistics where -u " - "> -b > -s\nand the statistics is filterd by the upper level options\n", + "Usage: hidumper -s 1301 -a \nwhere possible options include:\n%s\nWhen -b/-b " + " or -s/-s is simultaneously selected,\nwe display the lowest level statistics where " + "-b > -s\nand the statistics is filterd by the upper level options\n", info.c_str()); } -- Gitee