openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2025-02-17 04:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

细粒度删除冗余数据

Browse Source 
Signed-off-by: m30043719 <maxiaodong25@huawei.com>
This commit is contained in:
m30043719 2024-06-09 19:11:24 +08:00
parent 7555e4ae39
commit bc618243d2
3 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/dtbschedmgr/include/mission/distributed_bm_storage.h
View File

@ -85,7 +85,7 @@ private:
std::promise<OHOS::DistributedKv::Status> &resultStatusSignal,
std::vector<OHOS::DistributedKv::Entry> &allEntries);
OHOS::DistributedKv::Status GetResultSatus(std::promise<OHOS::DistributedKv::Status> &resultStatusSignal);
bool DelReduData(const std::string &networkId, const std::vector<OHOS::DistributedKv::Entry> &allEntries);
bool DelReduData(const std::string &networkId, const std::vector<OHOS::DistributedKv::Entry> &reduRiskEntries);
private:
static std::mutex mutex_;

46
services/dtbschedmgr/src/mission/distributed_bm_storage.cpp
View File

@ -240,7 +240,7 @@ bool DmsBmStorage::DealGetBundleName(const std::string &networkId, const uint16_
HILOGE("GetEntries error: %{public}d", status);
return false;
}
uint8_t recordData = 0;
std::vector<Entry> reduRiskEntries;
for (auto entry : allEntries) {
std::string key = entry.key.ToString();
std::string value = entry.value.ToString();
@ -250,24 +250,24 @@ bool DmsBmStorage::DealGetBundleName(const std::string &networkId, const uint16_
DmsBundleInfo distributedBundleInfo;
if (distributedBundleInfo.FromJsonString(value) && distributedBundleInfo.bundleNameId == bundleNameId) {
bundleName = distributedBundleInfo.bundleName;
++recordData;
if (recordData > 1) {
HILOGE("Redundant data needs to be deleted.");
DelReduData(networkId, allEntries);
bundleName = "";
return false;
}
reduRiskEntries.push_back(entry);
}
}
if (bundleName != "") {
HILOGI("end.");
return true;
if (reduRiskEntries.size() > 1) {
HILOGE("Redundant data needs to be deleted.");
DelReduData(networkId, reduRiskEntries);
bundleName = "";
return false;
}
HILOGE("get bundleName failed");
return false;
if (bundleName.empty()) {
HILOGI("get bundleName failed.");
return false;
}
HILOGE("end.");
return true;
}
bool DmsBmStorage::DelReduData(const std::string &networkId, const std::vector<DistributedKv::Entry> &allEntries)
bool DmsBmStorage::DelReduData(const std::string &networkId, const std::vector<DistributedKv::Entry> &reduRiskEntries)
{
if (!CheckKvStore()) {
HILOGE("kvStore is nullptr");
@ -279,9 +279,12 @@ bool DmsBmStorage::DelReduData(const std::string &networkId, const std::vector<D
HILOGE("can not get udid or uuid by networkId");
return false;
}
HILOGE("uuid: %{public}s", GetAnonymStr(uuid).c_str());
std::vector<Entry> newEntries;
Status status = kvStorePtr_->GetDeviceEntries(uuid, newEntries);
if (status != Status::SUCCESS) {
HILOGI("newEntries.size: %{public}u", newEntries.size());
if (newEntries.empty() || status != Status::SUCCESS) {
HILOGE("GetEntries error: %{public}d", status);
return false;
}
@ -291,14 +294,11 @@ bool DmsBmStorage::DelReduData(const std::string &networkId, const std::vector<D
newKeyArr.push_back(entry.key.ToString());
HILOGI("newKey: %{public}s", GetAnonymStr(entry.key.ToString()).c_str());
}
for (auto entry : allEntries) {
std::string key = entry.key.ToString();
if (key.find(udid) == std::string::npos) {
continue;
}
if (find(newKeyArr.begin(), newKeyArr.end(), entry.key.ToString()) == newKeyArr.end()) {
HILOGE("Redundant data needs to be deleted: %{public}s", GetAnonymStr(entry.key.ToString()).c_str());
reduKeyArr.push_back(entry.key);
for (auto reduRiskEntry : reduRiskEntries) {
std::string key = reduRiskEntry.key.ToString();
if (find(newKeyArr.begin(), newKeyArr.end(), reduRiskEntry.key.ToString()) == newKeyArr.end()) {
HILOGE("Needs to be deleted: %{public}s", GetAnonymStr(reduRiskEntry.key.ToString()).c_str());
reduKeyArr.push_back(reduRiskEntry.key);
}
}
status = kvStorePtr_->DeleteBatch(reduKeyArr);

20
services/dtbschedmgr/test/unittest/mission/distributed_bm_storage_test.cpp
View File

@ -142,6 +142,26 @@ HWTEST_F(DistributedBmStorageTest, GetDistributedBundleNameTest_001, TestSize.Le
DTEST_LOG << "DistributedBmStorageTest GetDistributedBundleNameTest_001 end" << std::endl;
}
/**
* @tc.name: GetDistributedBundleNameTest_002
* @tc.desc: test insert DistributedBmStorage
* @tc.type: FUNC
*/
HWTEST_F(DistributedBmStorageTest, GetDistributedBundleNameTest_002, TestSize.Level1)
{
DTEST_LOG << "DistributedBmStorageTest GetDistributedBundleNameTest_002 start" << std::endl;
auto distributedDataStorage = GetDmsBmStorage();
EXPECT_NE(distributedDataStorage, nullptr);
if (distributedDataStorage != nullptr) {
std::string networkId = "";
std::string bundleName = "";
uint16_t bundleNameId = 0;
bool ret = dmsBmStorage_->GetInstance()->GetDistributedBundleName(networkId, bundleNameId, bundleName);
EXPECT_EQ(ret, false);
}
DTEST_LOG << "DistributedBmStorageTest GetDistributedBundleNameTest_002 end" << std::endl;
}
/**
* @tc.name: GetBundleIdTest_001
* @tc.desc: test delete DistributedBmStorage