From 7c0a2228867912f5513b48e99adb02fa65aacc7c Mon Sep 17 00:00:00 2001 From: Hollokin Date: Fri, 4 Jul 2025 10:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- .../framework/utils/corrupt_reporter.cpp | 6 +++--- .../rust/connect_adapter/src/connect.cpp | 1 - .../service/cloud/sync_manager.cpp | 5 ++--- .../service/object/src/object_asset_loader.cpp | 5 +++-- .../service/object/src/object_asset_machine.cpp | 8 ++++---- .../service/object/src/object_callback_proxy.cpp | 16 ++++++++-------- .../service/object/src/object_data_listener.cpp | 2 +- .../service/object/src/object_manager.cpp | 2 +- .../service/object/src/object_service_impl.cpp | 2 +- .../service/object/src/object_service_stub.cpp | 7 ++++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/services/distributeddataservice/framework/utils/corrupt_reporter.cpp b/services/distributeddataservice/framework/utils/corrupt_reporter.cpp index 405e29913..37e02ddb5 100644 --- a/services/distributeddataservice/framework/utils/corrupt_reporter.cpp +++ b/services/distributeddataservice/framework/utils/corrupt_reporter.cpp @@ -27,7 +27,7 @@ constexpr const char *DB_CORRUPTED_POSTFIX = ".corruptedflg"; bool CorruptReporter::CreateCorruptedFlag(const std::string &path, const std::string &dbName) { if (path.empty() || dbName.empty()) { - ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", path.c_str(), + ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", Anonymous::Change(path).c_str(), Anonymous::Change(dbName).c_str()); return false; } @@ -48,7 +48,7 @@ bool CorruptReporter::CreateCorruptedFlag(const std::string &path, const std::st bool CorruptReporter::HasCorruptedFlag(const std::string &path, const std::string &dbName) { if (path.empty() || dbName.empty()) { - ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", path.c_str(), + ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", Anonymous::Change(path).c_str(), Anonymous::Change(dbName).c_str()); return false; } @@ -59,7 +59,7 @@ bool CorruptReporter::HasCorruptedFlag(const std::string &path, const std::strin bool CorruptReporter::DeleteCorruptedFlag(const std::string &path, const std::string &dbName) { if (path.empty() || dbName.empty()) { - ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", path.c_str(), + ZLOGW("The path or dbName is empty, path:%{public}s, dbName:%{public}s", Anonymous::Change(path).c_str(), Anonymous::Change(dbName).c_str()); return false; } diff --git a/services/distributeddataservice/rust/connect_adapter/src/connect.cpp b/services/distributeddataservice/rust/connect_adapter/src/connect.cpp index a61a79391..9ec682c1d 100644 --- a/services/distributeddataservice/rust/connect_adapter/src/connect.cpp +++ b/services/distributeddataservice/rust/connect_adapter/src/connect.cpp @@ -68,7 +68,6 @@ void Connect::WaitConnect() cv_.wait_for(lock, std::chrono::seconds(CONNECT_TIMEOUT), [this] { return flag_; }); - cv_.notify_one(); } namespace ConnectInner { diff --git a/services/distributeddataservice/service/cloud/sync_manager.cpp b/services/distributeddataservice/service/cloud/sync_manager.cpp index 035002582..0eb1e8f45 100644 --- a/services/distributeddataservice/service/cloud/sync_manager.cpp +++ b/services/distributeddataservice/service/cloud/sync_manager.cpp @@ -807,8 +807,7 @@ void SyncManager::UpdateFinishSyncInfo(const QueryKey &queryKey, uint64_t syncId if (!NeedSaveSyncInfo(queryKey)) { return; } - lastSyncInfos_.ComputeIfPresent(queryKey, [syncId, code](auto &key, - std::map &val) { + lastSyncInfos_.ComputeIfPresent(queryKey, [syncId, code](auto &key, std::map &val) { auto now = duration_cast(system_clock::now().time_since_epoch()).count(); for (auto iter = val.begin(); iter != val.end();) { bool isExpired = ((now - iter->second.startTime) >= EXPIRATION_TIME) && iter->second.code == -1; @@ -860,7 +859,7 @@ std::function SyncManager::GetCallback(const Gen return; } int32_t code = result.begin()->second.code; - UpdateFinishSyncInfo({ user, id, storeInfo.bundleName, storeInfo.storeName}, storeInfo.syncId, code); + UpdateFinishSyncInfo({ user, id, storeInfo.bundleName, storeInfo.storeName }, storeInfo.syncId, code); }; } diff --git a/services/distributeddataservice/service/object/src/object_asset_loader.cpp b/services/distributeddataservice/service/object/src/object_asset_loader.cpp index 76343e829..46aa4498b 100644 --- a/services/distributeddataservice/service/object/src/object_asset_loader.cpp +++ b/services/distributeddataservice/service/object/src/object_asset_loader.cpp @@ -170,8 +170,9 @@ int32_t ObjectAssetLoader::PushAsset(int32_t userId, const sptr &asset { ObjectStore::RadarReporter::ReportStage(std::string(__FUNCTION__), ObjectStore::SAVE, ObjectStore::PUSH_ASSETS, ObjectStore::IDLE); - ZLOGI("PushAsset start, asset size:%{public}zu, bundleName:%{public}s, sessionId:%{public}s", - assetObj->uris_.size(), assetObj->dstBundleName_.c_str(), Anonymous::Change(assetObj->sessionId_).c_str()); + ZLOGI("PushAsset start, userId:%{public}d, asset size:%{public}zu, bundleName:%{public}s, sessionId:%{public}s", + userId, assetObj->uris_.size(), assetObj->dstBundleName_.c_str(), + Anonymous::Change(assetObj->sessionId_).c_str()); auto status = Storage::DistributedFile::DistributedFileDaemonManager::GetInstance().PushAsset(userId, assetObj, sendCallback); if (status != OBJECT_SUCCESS) { diff --git a/services/distributeddataservice/service/object/src/object_asset_machine.cpp b/services/distributeddataservice/service/object/src/object_asset_machine.cpp index 2401303a4..73aeba2a0 100644 --- a/services/distributeddataservice/service/object/src/object_asset_machine.cpp +++ b/services/distributeddataservice/service/object/src/object_asset_machine.cpp @@ -172,9 +172,9 @@ static int32_t DoTransfer(int32_t eventId, ChangedAssetInfo& changedAsset, Asset if (status != E_OK) { ZLOGE("UpdateStore error, error:%{public}d, assetName:%{public}s, store:%{public}s, " "table:%{public}s", - status, changedAsset.asset.name.c_str(), + status, Anonymous::Change(changedAsset.asset.name).c_str(), Anonymous::Change(changedAsset.bindInfo.storeName).c_str(), - changedAsset.bindInfo.tableName.c_str()); + Anonymous::Change(changedAsset.bindInfo.tableName).c_str()); } } ObjectAssetMachine::DFAPostEvent(TRANSFER_FINISHED, changedAsset, changedAsset.asset); @@ -338,8 +338,8 @@ static int32_t ChangeAssetToNormal(int32_t eventId, ChangedAssetInfo& changedAss static int32_t Recover(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset, const std::pair& newAsset) { - ZLOGE("An abnormal event has occurred, eventId:%{public}d, status:%{public}d, assetName:%{public}s", eventId, - changedAsset.status, changedAsset.asset.name.c_str()); + ZLOGI("An abnormal event has occurred, eventId:%{public}d, status:%{public}d, assetName:%{public}s", eventId, + changedAsset.status, Anonymous::Change(changedAsset.asset.name).c_str()); BindEvent::BindEventInfo bindEventInfo = MakeBindInfo(changedAsset); changedAsset.status = TransferStatus::STATUS_STABLE; diff --git a/services/distributeddataservice/service/object/src/object_callback_proxy.cpp b/services/distributeddataservice/service/object/src/object_callback_proxy.cpp index ddf0e956e..32fdda715 100644 --- a/services/distributeddataservice/service/object/src/object_callback_proxy.cpp +++ b/services/distributeddataservice/service/object/src/object_callback_proxy.cpp @@ -62,7 +62,7 @@ void ObjectSaveCallbackProxy::Completed(const std::map &re MessageOption mo { MessageOption::TF_SYNC }; int error = Remote()->SendRequest(COMPLETED, data, reply, mo); if (error != 0) { - ZLOGW("SendRequest failed, error %d", error); + ZLOGW("SendRequest failed, error %{public}d", error); } } @@ -75,13 +75,13 @@ void ObjectRevokeSaveCallbackProxy::Completed(int32_t status) return; } if (!ITypesUtil::Marshal(data, status)) { - ZLOGE("write descriptor failed"); + ZLOGE("Marshalling failed, status:%{public}d", status); return; } MessageOption mo { MessageOption::TF_SYNC }; int error = Remote()->SendRequest(COMPLETED, data, reply, mo); if (error != 0) { - ZLOGW("SendRequest failed, error %d", error); + ZLOGW("SendRequest failed, error %{public}d", error); } } @@ -94,13 +94,13 @@ void ObjectRetrieveCallbackProxy::Completed(const std::mapSendRequest(COMPLETED, data, reply, mo); if (error != 0) { - ZLOGW("SendRequest failed, error %d", error); + ZLOGW("SendRequest failed, error %{public}d", error); } } @@ -113,13 +113,13 @@ void ObjectChangeCallbackProxy::Completed(const std::mapSendRequest(COMPLETED, data, reply, mo); if (error != 0) { - ZLOGW("SendRequest failed, error %d", error); + ZLOGW("SendRequest failed, error %{public}d", error); } } @@ -138,7 +138,7 @@ void ObjectProgressCallbackProxy::Completed(int32_t progress) MessageOption mo { MessageOption::TF_ASYNC }; int error = Remote()->SendRequest(COMPLETED, data, reply, mo); if (error != 0) { - ZLOGW("SendRequest failed, error %d", error); + ZLOGW("SendRequest failed, error %{public}d", error); } } } // namespace DistributedObject diff --git a/services/distributeddataservice/service/object/src/object_data_listener.cpp b/services/distributeddataservice/service/object/src/object_data_listener.cpp index 22bb0ce8a..75839c874 100644 --- a/services/distributeddataservice/service/object/src/object_data_listener.cpp +++ b/services/distributeddataservice/service/object/src/object_data_listener.cpp @@ -68,7 +68,7 @@ int32_t ObjectAssetsRecvListener::OnFinished(const std::string &srcNetworkId, co ObjectStore::ASSETS_RECV, ObjectStore::RADAR_FAILED, result); return result; } - auto objectKey = assetObj->dstBundleName_+assetObj->sessionId_; + auto objectKey = assetObj->dstBundleName_ + assetObj->sessionId_; ZLOGI("OnFinished, status:%{public}d objectKey:%{public}s, asset size:%{public}zu", result, DistributedData::Anonymous::Change(objectKey).c_str(), assetObj->uris_.size()); ObjectStoreManager::GetInstance()->NotifyAssetsReady(objectKey, assetObj->dstBundleName_, srcNetworkId); diff --git a/services/distributeddataservice/service/object/src/object_manager.cpp b/services/distributeddataservice/service/object/src/object_manager.cpp index a09bdce43..aa8afd16b 100644 --- a/services/distributeddataservice/service/object/src/object_manager.cpp +++ b/services/distributeddataservice/service/object/src/object_manager.cpp @@ -166,7 +166,7 @@ int32_t ObjectStoreManager::Save(const std::string &appId, const std::string &se ProcessSyncCallback(results, dstBundleName, sessionId, deviceId); proxy->Completed(results); }; - result = SyncOnStore(GetPropertyPrefix(dstBundleName, sessionId, deviceId), {deviceId}, syncCallback); + result = SyncOnStore(GetPropertyPrefix(dstBundleName, sessionId, deviceId), { deviceId }, syncCallback); if (result != OBJECT_SUCCESS) { ZLOGE("Sync data failed, result: %{public}d", result); ObjectStore::RadarReporter::ReportStateError(std::string(__FUNCTION__), ObjectStore::SAVE, diff --git a/services/distributeddataservice/service/object/src/object_service_impl.cpp b/services/distributeddataservice/service/object/src/object_service_impl.cpp index 35056671f..f6fcd49e7 100644 --- a/services/distributeddataservice/service/object/src/object_service_impl.cpp +++ b/services/distributeddataservice/service/object/src/object_service_impl.cpp @@ -108,7 +108,7 @@ int32_t ObjectServiceImpl::BindAssetStore(const std::string &bundleName, const s status = ObjectStoreManager::GetInstance()->BindAsset(tokenId, bundleName, sessionId, asset, bindInfo); if (status != OBJECT_SUCCESS) { ZLOGE("bind asset fail %{public}d, bundleName:%{public}s, sessionId:%{public}s, assetName:%{public}s", status, - bundleName.c_str(), sessionId.c_str(), asset.name.c_str()); + bundleName.c_str(), Anonymous::Change(sessionId).c_str(), Anonymous::Change(asset.name).c_str()); } return status; } diff --git a/services/distributeddataservice/service/object/src/object_service_stub.cpp b/services/distributeddataservice/service/object/src/object_service_stub.cpp index fb2ba99e4..a5d521a39 100644 --- a/services/distributeddataservice/service/object/src/object_service_stub.cpp +++ b/services/distributeddataservice/service/object/src/object_service_stub.cpp @@ -26,6 +26,7 @@ namespace OHOS::DistributedObject { using namespace DistributedKv; +using Anonymous = DistributedData::Anonymous; int32_t ObjectServiceStub::ObjectStoreSaveOnRemote(MessageParcel &data, MessageParcel &reply) { std::string sessionId; @@ -61,7 +62,7 @@ int32_t ObjectServiceStub::OnAssetChangedOnRemote(MessageParcel &data, MessagePa } ObjectStore::Asset assetValue; if (!ITypesUtil::Unmarshalling(assetValue, data)) { - ZLOGE("Unmarshal assetValue fail, asset name: %{public}s", assetValue.name.c_str()); + ZLOGE("Unmarshal assetValue fail, asset name: %{public}s", Anonymous::Change(assetValue.name).c_str()); return IPC_STUB_INVALID_DATA_ERR; } int32_t status = OnAssetChanged(bundleName, sessionId, deviceId, assetValue); @@ -80,8 +81,8 @@ int32_t ObjectServiceStub::ObjectStoreBindAssetOnRemote(MessageParcel &data, Mes ObjectStore::AssetBindInfo bindInfo; if (!ITypesUtil::Unmarshal(data, bundleName, sessionId, asset, bindInfo)) { ZLOGE("Unmarshal sessionId:%{public}s bundleName:%{public}s assetName:%{public}s bindStore:%{public}s", - DistributedData::Anonymous::Change(sessionId).c_str(), bundleName.c_str(), - asset.name.c_str(), bindInfo.storeName.c_str()); + Anonymous::Change(sessionId).c_str(), bundleName.c_str(), Anonymous::Change(asset.name).c_str(), + Anonymous::Change(bindInfo.storeName).c_str()); return IPC_STUB_INVALID_DATA_ERR; } -- Gitee