openharmony/distributed_hardware_fwk
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_hardware_fwk.git synced 2026-07-21 00:55:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

!121 回退 'Pull Request !120 : 初始化删除不存在的数据'

Browse Source 
Merge pull request !121 from zhangchuang/revert-merge-120-master
This commit is contained in:
openharmony_ci
2022-07-05 09:38:18 +00:00
committed by Gitee
parent 4553bd3528 1366766da6
commit bbce4b8a58
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h
-1
View File
@@ -43,7 +43,6 @@ public:
private:
void QueryLocalHardware(const DHType dhType, IHardwareHandler *hardwareHandler);
void AddLocalCapabilityInfo(const std::vector<DHItem> &dhItems, const DHType dhType);
void RemoveNonExistCapabilityInfo();
private:
std::map<DHType, IHardwareHandler*> compToolFuncsMap_;
services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp
-29
View File
@@ -64,9 +64,6 @@ void LocalHardwareManager::Init()
hardwareHandler->RegisterPluginListener(listener);
}
}
// Remove the non-exist data in database when device restart or other exception situation
RemoveNonExistCapabilityInfo();
}
void LocalHardwareManager::UnInit()
@@ -109,31 +106,5 @@ void LocalHardwareManager::AddLocalCapabilityInfo(const std::vector<DHItem> &dhI
}
CapabilityInfoManager::GetInstance()->AddCapability(capabilityInfos);
}
void LocalHardwareManager::RemoveNonExistCapabilityInfo()
{
DHLOGI("start");
CapabilityInfoMap allCapabilityInfoMap;
CapabilityInfoManager::GetInstance()->GetDataByKeyPrefix("", allCapabilityInfoMap);
if (allCapabilityInfoMap.empty()) {
DHLOGE("allDataMap from DB is empty");
return;
}
for (auto capabilityInfo : allCapabilityInfoMap) {
std::shared_ptr<CapabilityInfo> capabilityValue = capabilityInfo.second;
if (capabilityValue == nullptr) {
DHLOGE("capabilityInfo value is nullptr, key: %s", capabilityValue->GetAnonymousKey().c_str());
return;
}
DHLOGI("The key in allCapabilityInfoMap is %s", capabilityValue->GetAnonymousKey().c_str());
if (!CapabilityInfoManager::GetInstance()->HasCapability(capabilityValue->GetDeviceId(),
capabilityValue->GetDHId())) {
DHLOGI("AllCapabilityInfoMap is not found this key, so it is previous data. It should be removed, key: %s",
capabilityValue->GetAnonymousKey().c_str());
CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoByKey(capabilityValue->GetKey());
}
}
DHLOGI("end");
}
} // namespace DistributedHardware
} // namespace OHOS