From 4e0523c5a79733ca8a3773130c36cd25296d62c2 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Thu, 26 Jun 2025 11:12:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?dataobject=E6=95=8F=E6=84=9F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8C=BF=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 --- .../object/src/object_asset_loader.cpp | 16 +++++++++------- .../object/src/object_data_listener.cpp | 6 +++--- .../service/object/src/object_manager.cpp | 19 +++++++++++-------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/services/distributeddataservice/service/object/src/object_asset_loader.cpp b/services/distributeddataservice/service/object/src/object_asset_loader.cpp index c3d582e6a..00991e5f3 100644 --- a/services/distributeddataservice/service/object/src/object_asset_loader.cpp +++ b/services/distributeddataservice/service/object/src/object_asset_loader.cpp @@ -24,6 +24,7 @@ #include "distributed_file_daemon_manager.h" namespace OHOS::DistributedObject { using namespace OHOS::FileManagement::CloudSync; +using namespace OHOS::DistributedData; ObjectAssetLoader *ObjectAssetLoader::GetInstance() { static ObjectAssetLoader *loader = new ObjectAssetLoader(); @@ -42,7 +43,7 @@ bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string& bundle assetInfo.uri = asset.uri; assetInfo.assetName = asset.name; ZLOGI("Start transfer, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(), - DistributedData::Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); + Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); auto block = std::make_shared>>(WAIT_TIME, std::tuple{ true, OBJECT_SUCCESS }); auto res = CloudSyncAssetManager::GetInstance().DownloadFile(userId, bundleName, deviceId, assetInfo, [block](const std::string& uri, int32_t status) { @@ -50,17 +51,17 @@ bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string& bundle }); if (res != OBJECT_SUCCESS) { ZLOGE("fail, res: %{public}d, name: %{public}s, deviceId: %{public}s, bundleName: %{public}s", res, - asset.name.c_str(), DistributedData::Anonymous::Change(deviceId).c_str(), bundleName.c_str()); + asset.name.c_str(), Anonymous::Change(deviceId).c_str(), bundleName.c_str()); return false; } auto [timeout, status] = block->GetValue(); if (timeout || status != OBJECT_SUCCESS) { ZLOGE("fail, timeout: %{public}d, status: %{public}d, name: %{public}s, deviceId: %{public}s ", timeout, - status, asset.name.c_str(), DistributedData::Anonymous::Change(deviceId).c_str()); + status, asset.name.c_str(), Anonymous::Change(deviceId).c_str()); return false; } ZLOGD("Transfer end, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(), - DistributedData::Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); + Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); return true; } @@ -69,7 +70,7 @@ void ObjectAssetLoader::TransferAssetsAsync(const int32_t userId, const std::str { if (executors_ == nullptr) { ZLOGE("executors is null, bundleName: %{public}s, deviceId: %{public}s, userId: %{public}d", - bundleName.c_str(), DistributedData::Anonymous::Change(deviceId).c_str(), userId); + bundleName.c_str(), Anonymous::Change(deviceId).c_str(), userId); callback(false); return; } @@ -170,12 +171,13 @@ 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(), assetObj->sessionId_.c_str()); + 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) { ZLOGE("PushAsset err status: %{public}d, asset size:%{public}zu, bundleName:%{public}s, sessionId:%{public}s", - status, assetObj->uris_.size(), assetObj->dstBundleName_.c_str(), assetObj->sessionId_.c_str()); + status, assetObj->uris_.size(), assetObj->dstBundleName_.c_str(), + Anonymous::Change(assetObj->sessionId_).c_str()); ObjectStore::RadarReporter::ReportStateError(std::string(__FUNCTION__), ObjectStore::SAVE, ObjectStore::PUSH_ASSETS, ObjectStore::RADAR_FAILED, status, ObjectStore::FINISHED); } diff --git a/services/distributeddataservice/service/object/src/object_data_listener.cpp b/services/distributeddataservice/service/object/src/object_data_listener.cpp index 33d03df1a..22bb0ce8a 100644 --- a/services/distributeddataservice/service/object/src/object_data_listener.cpp +++ b/services/distributeddataservice/service/object/src/object_data_listener.cpp @@ -52,7 +52,7 @@ int32_t ObjectAssetsRecvListener::OnStart(const std::string &srcNetworkId, const const std::string &sessionId, const std::string &dstBundleName) { auto objectKey = dstBundleName + sessionId; - ZLOGI("OnStart, objectKey:%{public}s", objectKey.c_str()); + ZLOGI("OnStart, objectKey:%{public}s", DistributedData::Anonymous::Change(objectKey).c_str()); ObjectStoreManager::GetInstance()->NotifyAssetsStart(objectKey, srcNetworkId); ObjectStoreManager::GetInstance()->NotifyAssetsRecvProgress(objectKey, 0); return OBJECT_SUCCESS; @@ -69,8 +69,8 @@ int32_t ObjectAssetsRecvListener::OnFinished(const std::string &srcNetworkId, co return result; } auto objectKey = assetObj->dstBundleName_+assetObj->sessionId_; - ZLOGI("OnFinished, status:%{public}d objectKey:%{public}s, asset size:%{public}zu", result, objectKey.c_str(), - assetObj->uris_.size()); + 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); if (result != OBJECT_SUCCESS) { ObjectStoreManager::GetInstance()->NotifyAssetsRecvProgress(objectKey, PROGRESS_INVALID); diff --git a/services/distributeddataservice/service/object/src/object_manager.cpp b/services/distributeddataservice/service/object/src/object_manager.cpp index cc7f041ae..a09bdce43 100644 --- a/services/distributeddataservice/service/object/src/object_manager.cpp +++ b/services/distributeddataservice/service/object/src/object_manager.cpp @@ -135,7 +135,8 @@ int32_t ObjectStoreManager::Save(const std::string &appId, const std::string &se { auto proxy = iface_cast(callback); if (deviceId.size() == 0) { - ZLOGE("DeviceId empty, appId: %{public}s, sessionId: %{public}s", appId.c_str(), sessionId.c_str()); + ZLOGE("DeviceId empty, appId: %{public}s, sessionId: %{public}s", appId.c_str(), + Anonymous::Change(sessionId).c_str()); proxy->Completed(std::map()); return INVALID_ARGUMENT; } @@ -159,7 +160,7 @@ int32_t ObjectStoreManager::Save(const std::string &appId, const std::string &se return result; } ZLOGI("Sync data, bundleName: %{public}s, sessionId: %{public}s, deviceId: %{public}s", dstBundleName.c_str(), - sessionId.c_str(), Anonymous::Change(deviceId).c_str()); + Anonymous::Change(sessionId).c_str(), Anonymous::Change(deviceId).c_str()); SyncCallBack syncCallback = [proxy, dstBundleName, sessionId, deviceId, this](const std::map &results) { ProcessSyncCallback(results, dstBundleName, sessionId, deviceId); @@ -984,11 +985,13 @@ int32_t ObjectStoreManager::SaveToStore(const std::string &appId, const std::str auto status = delegate_->PutBatch(entries); if (status != DistributedDB::DBStatus::OK) { ZLOGE("PutBatch failed, bundleName: %{public}s, sessionId: %{public}s, dstNetworkId: %{public}s, " - "status: %{public}d", appId.c_str(), sessionId.c_str(), Anonymous::Change(toDeviceId).c_str(), status); + "status: %{public}d", + appId.c_str(), Anonymous::Change(sessionId).c_str(), Anonymous::Change(toDeviceId).c_str(), status); return status; } ZLOGI("PutBatch success, bundleName: %{public}s, sessionId: %{public}s, dstNetworkId: %{public}s, " - "count: %{public}zu", appId.c_str(), sessionId.c_str(), Anonymous::Change(toDeviceId).c_str(), entries.size()); + "count: %{public}zu", + appId.c_str(), Anonymous::Change(sessionId).c_str(), Anonymous::Change(toDeviceId).c_str(), entries.size()); return OBJECT_SUCCESS; } @@ -998,7 +1001,7 @@ int32_t ObjectStoreManager::SyncOnStore( std::vector syncDevices; for (auto const &device : deviceList) { if (device == LOCAL_DEVICE) { - ZLOGI("Save to local, do not need sync, prefix: %{public}s", prefix.c_str()); + ZLOGI("Save to local, do not need sync, prefix: %{public}s", Anonymous::Change(prefix).c_str()); callback({{LOCAL_DEVICE, OBJECT_SUCCESS}}); return OBJECT_SUCCESS; } @@ -1077,14 +1080,14 @@ int32_t ObjectStoreManager::RetrieveFromStore(const std::string &appId, const st std::string prefix = GetPrefixWithoutDeviceId(appId, sessionId); auto status = delegate_->GetEntries(std::vector(prefix.begin(), prefix.end()), entries); if (status == DistributedDB::DBStatus::NOT_FOUND) { - ZLOGI("Get entries empty, prefix: %{public}s, status: %{public}d", prefix.c_str(), status); + ZLOGI("Get entries empty, prefix: %{public}s, status: %{public}d", Anonymous::Change(prefix).c_str(), status); return KEY_NOT_FOUND; } if (status != DistributedDB::DBStatus::OK) { - ZLOGE("Get entries failed, prefix: %{public}s, status: %{public}d", prefix.c_str(), status); + ZLOGE("Get entries failed, prefix: %{public}s, status: %{public}d", Anonymous::Change(prefix).c_str(), status); return DB_ERROR; } - ZLOGI("Get entries success, prefix: %{public}s, count: %{public}zu", prefix.c_str(), entries.size()); + ZLOGI("GetEntries success,prefix:%{public}s,count:%{public}zu", Anonymous::Change(prefix).c_str(), entries.size()); for (const auto &entry : entries) { std::string key(entry.key.begin(), entry.key.end()); if (key.find(SAVE_INFO) != std::string::npos) { -- Gitee From e4e3b600dd5a8cb9d68a452be8d0c4c34e6eed72 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Thu, 26 Jun 2025 15:52:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E5=8C=BF=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 --- .../service/object/src/object_asset_loader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/distributeddataservice/service/object/src/object_asset_loader.cpp b/services/distributeddataservice/service/object/src/object_asset_loader.cpp index 00991e5f3..76343e829 100644 --- a/services/distributeddataservice/service/object/src/object_asset_loader.cpp +++ b/services/distributeddataservice/service/object/src/object_asset_loader.cpp @@ -43,7 +43,7 @@ bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string& bundle assetInfo.uri = asset.uri; assetInfo.assetName = asset.name; ZLOGI("Start transfer, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(), - Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); + Anonymous::Change(deviceId).c_str(), Anonymous::Change(assetInfo.assetName).c_str()); auto block = std::make_shared>>(WAIT_TIME, std::tuple{ true, OBJECT_SUCCESS }); auto res = CloudSyncAssetManager::GetInstance().DownloadFile(userId, bundleName, deviceId, assetInfo, [block](const std::string& uri, int32_t status) { @@ -51,17 +51,17 @@ bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string& bundle }); if (res != OBJECT_SUCCESS) { ZLOGE("fail, res: %{public}d, name: %{public}s, deviceId: %{public}s, bundleName: %{public}s", res, - asset.name.c_str(), Anonymous::Change(deviceId).c_str(), bundleName.c_str()); + Anonymous::Change(asset.name).c_str(), Anonymous::Change(deviceId).c_str(), bundleName.c_str()); return false; } auto [timeout, status] = block->GetValue(); if (timeout || status != OBJECT_SUCCESS) { ZLOGE("fail, timeout: %{public}d, status: %{public}d, name: %{public}s, deviceId: %{public}s ", timeout, - status, asset.name.c_str(), Anonymous::Change(deviceId).c_str()); + status, Anonymous::Change(asset.name).c_str(), Anonymous::Change(deviceId).c_str()); return false; } ZLOGD("Transfer end, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(), - Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str()); + Anonymous::Change(deviceId).c_str(), Anonymous::Change(assetInfo.assetName).c_str()); return true; } @@ -149,7 +149,7 @@ bool ObjectAssetLoader::IsDownloading(const DistributedData::Asset& asset) { auto [success, hash] = downloading_.Find(asset.uri); if (success && hash == asset.hash) { - ZLOGD("asset is downloading. assetName:%{public}s", asset.name.c_str()); + ZLOGD("asset is downloading. assetName:%{public}s", Anonymous::Change(asset.name).c_str()); return true; } return false; @@ -159,7 +159,7 @@ bool ObjectAssetLoader::IsDownloaded(const DistributedData::Asset& asset) { auto [success, hash] = downloaded_.Find(asset.uri); if (success && hash == asset.hash) { - ZLOGD("asset is downloaded. assetName:%{public}s", asset.name.c_str()); + ZLOGD("asset is downloaded. assetName:%{public}s", Anonymous::Change(asset.name).c_str()); return true; } return false; -- Gitee