diff --git a/services/distributeddataservice/adapter/communicator/src/device_manager_adapter.cpp b/services/distributeddataservice/adapter/communicator/src/device_manager_adapter.cpp index ea4915cf92b30b23b56078c8ecced2ade3fd2c5a..198e8c3d4c1371098cec5667a6a574131e5cc0a5 100644 --- a/services/distributeddataservice/adapter/communicator/src/device_manager_adapter.cpp +++ b/services/distributeddataservice/adapter/communicator/src/device_manager_adapter.cpp @@ -309,7 +309,7 @@ bool DeviceManagerAdapter::GetDeviceInfo(const DmDeviceInfo &dmInfo, DeviceInfo } DeviceExtraInfo deviceExtraInfo; if (!DistributedData::Serializable::Unmarshall(dmInfo.extraData, deviceExtraInfo)) { - ZLOGE("Unmarshall failed, deviceExtraInfo:%{public}s", dmInfo.extraData.c_str()); + ZLOGE("Unmarshall extraData failed. uuid:%{public}s", Anonymous::Change(uuid).c_str()); return false; } dvInfo = { uuid, udid, networkId, std::string(dmInfo.deviceName), dmInfo.deviceTypeId, deviceExtraInfo.OS_TYPE, @@ -380,7 +380,7 @@ std::vector DeviceManagerAdapter::GetRemoteDevices() auto udid = GetUdidByNetworkId(networkId); DeviceExtraInfo deviceExtraInfo; if (!DistributedData::Serializable::Unmarshall(dmInfo.extraData, deviceExtraInfo)) { - ZLOGE("Unmarshall failed, deviceExtraInfo:%{public}s", dmInfo.extraData.c_str()); + ZLOGE("Unmarshall extraData failed. uuid:%{public}s", Anonymous::Change(uuid).c_str()); continue; } DeviceInfo dvInfo = { std::move(uuid), std::move(udid), std::move(networkId), @@ -495,7 +495,7 @@ DeviceInfo DeviceManagerAdapter::GetLocalDeviceInfo() } DeviceExtraInfo deviceExtraInfo; if (!DistributedData::Serializable::Unmarshall(info.extraData, deviceExtraInfo)) { - ZLOGE("Unmarshall failed, deviceExtraInfo:%{public}s", info.extraData.c_str()); + ZLOGE("Unmarshall extraData failed. uuid:%{public}s", Anonymous::Change(uuid).c_str()); return {}; } ZLOGI("[LocalDevice] uuid:%{public}s, name:%{public}s, type:%{public}d, osType:%{public}d", diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp index f18d59547fa5cbb3b8d3605abf5c8d9c1dba174c..ec09a29e3525f5f53f6a9e955c3f14ff9361bbf6 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp @@ -443,8 +443,8 @@ std::pair KVDBGeneralStore::Sync(const Devices &devices, GenQu dbStatus = delegate_->UnSubscribeRemoteQuery(devices, GetDBSyncCompleteCB(std::move(async)), dbQuery, false); } else if (syncMode < NEARBY_END) { - DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .isQuery = !kvQuery->IsEmpty(), - .query = dbQuery, .isWait = false, .isRetry = syncParam.isRetry }; + DeviceSyncOption syncOption = { .devices = devices, .mode = dbMode, .query = dbQuery, + .isQuery = !kvQuery->IsEmpty(), .isWait = false, .isRetry = syncParam.isRetry }; dbStatus = delegate_->Sync(syncOption, GetDBSyncCompleteCB(std::move(async))); } else { ZLOGE("Err sync mode! sync mode:%{public}d", syncMode);