From 78158d7a372ecea29bed8b375e66703c9abaf94f Mon Sep 17 00:00:00 2001 From: archane Date: Sat, 28 Jun 2025 16:05:38 +0800 Subject: [PATCH] =?UTF-8?q?datashare=E6=9C=8D=E5=8A=A1=E7=AB=AFuri?= =?UTF-8?q?=E5=8C=BF=E5=90=8D=E5=8C=96=E7=BB=9F=E4=B8=80=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: archane Change-Id: Ia4649adea578048626025289610678b18bb6b505 --- .../data_share/common/proxy_data_manager.cpp | 2 +- .../data_share/common/rdb_delegate.cpp | 2 +- .../data_share/common/scheduler_manager.cpp | 20 +++++++++---------- .../service/data_share/common/uri_utils.cpp | 2 +- .../data_share/data_share_service_impl.cpp | 8 ++++---- .../data_share/data_share_service_stub.cpp | 12 +++++------ .../data_share/data_share_silent_config.cpp | 2 +- ...g_from_data_share_bundle_info_strategy.cpp | 2 +- .../load_config_data_info_strategy.cpp | 6 +++--- .../strategies/get_data_strategy.cpp | 4 ++-- .../strategies/publish_strategy.cpp | 6 +++--- .../strategies/rdb_notify_strategy.cpp | 4 ++-- .../strategies/subscribe_strategy.cpp | 4 ++-- .../strategies/template_strategy.cpp | 4 ++-- .../proxy_data_subscriber_manager.cpp | 4 ++-- .../published_data_subscriber_manager.cpp | 6 +++--- .../rdb_subscriber_manager.cpp | 16 +++++++-------- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/services/distributeddataservice/service/data_share/common/proxy_data_manager.cpp b/services/distributeddataservice/service/data_share/common/proxy_data_manager.cpp index 59bfbf8c9..1a87b77b2 100644 --- a/services/distributeddataservice/service/data_share/common/proxy_data_manager.cpp +++ b/services/distributeddataservice/service/data_share/common/proxy_data_manager.cpp @@ -168,7 +168,7 @@ int32_t PublishedProxyData::Upsert(const DataShareProxyData &proxyData, const Bu callerBundleInfo.appIndex, callerBundleInfo.tokenId))); if (status != E_OK) { ZLOGE("db Upsert failed, %{public}s %{public}d", - DistributedData::Anonymous::Change(proxyData.uri_).c_str(), status); + URIUtils::Anonymous(proxyData.uri_).c_str(), status); type = DataShareObserver::ChangeType::INVAILD; return INNER_ERROR; } diff --git a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp index 6fb0ed2bf..7b9dad51b 100644 --- a/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp +++ b/services/distributeddataservice/service/data_share/common/rdb_delegate.cpp @@ -157,7 +157,7 @@ void RdbDelegate::TryAndSend(int errCode) return; } ZLOGE("Database corruption. BundleName: %{public}s. StoreName: %{public}s. ExtUri: %{public}s", - bundleName_.c_str(), storeName_.c_str(), DistributedData::Anonymous::Change(extUri_).c_str()); + bundleName_.c_str(), storeName_.c_str(), URIUtils::Anonymous(extUri_).c_str()); AAFwk::WantParams params; params.SetParam("BundleName", AAFwk::String::Box(bundleName_)); params.SetParam("StoreName", AAFwk::String::Box(storeName_)); diff --git a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp index 014b6490d..3f9282e55 100644 --- a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp +++ b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp @@ -41,7 +41,7 @@ void SchedulerManager::Execute(const std::string &uri, const int32_t userId, Dis metaData.user = std::to_string(userId); auto delegate = DBDelegate::Create(metaData); if (delegate == nullptr) { - ZLOGE("malloc fail %{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("malloc fail %{public}s", URIUtils::Anonymous(uri).c_str()); return; } std::vector keys = RdbSubscriberManager::GetInstance().GetKeysByUri(uri); @@ -57,7 +57,7 @@ void SchedulerManager::Execute(const Key &key, const int32_t userId, const Distr meta.user = std::to_string(userId); auto delegate = DBDelegate::Create(meta); if (delegate == nullptr) { - ZLOGE("malloc fail %{public}s", DistributedData::Anonymous::Change(key.uri).c_str()); + ZLOGE("malloc fail %{public}s", URIUtils::Anonymous(key.uri).c_str()); return; } ExecuteSchedulerSQL(userId, meta, key, delegate); @@ -195,14 +195,14 @@ void SchedulerManager::SetTimer( auto it = timerCache_.find(key); if (it != timerCache_.end()) { ZLOGD_MACRO("has current taskId: %{private}s, subscriberId is %{public}" PRId64 ", bundleName is %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); auto timerId = it->second; ResetTimerTask(timerId, reminderTime); return; } auto callback = [key, metaData, userId, this]() { ZLOGI("schedule notify start, uri is %{private}s, subscriberId is %{public}" PRId64 ", bundleName is " - "%{public}s", DistributedData::Anonymous::Change(key.uri).c_str(), + "%{public}s", URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); int64_t timerId = EraseTimerTaskId(key); DestoryTimerTask(timerId); @@ -217,7 +217,7 @@ void SchedulerManager::SetTimer( return; } ZLOGI("create new task success, uri is %{public}s, subscriberId is %{public}" PRId64 ", bundleName is %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); timerCache_.emplace(key, timerId); } @@ -227,19 +227,19 @@ void SchedulerManager::ExecuteSchedulerSQL(const int32_t userId, DistributedData Template tpl; if (!TemplateManager::GetInstance().Get(key, userId, tpl)) { ZLOGE("template undefined, %{public}s, %{public}" PRId64 ", %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); return; } if (tpl.scheduler_.empty()) { ZLOGW("template scheduler_ empty, %{public}s, %{public}" PRId64 ", %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); return; } GenRemindTimerFuncParams(userId, metaData, key, tpl.scheduler_); auto resultSet = delegate->QuerySql(tpl.scheduler_); if (resultSet == nullptr) { ZLOGE("resultSet is nullptr, %{public}s, %{public}" PRId64 ", %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); return; } int count; @@ -247,7 +247,7 @@ void SchedulerManager::ExecuteSchedulerSQL(const int32_t userId, DistributedData if (errCode != E_OK || count == 0) { ZLOGE("GetRowCount error, %{public}s, %{public}" PRId64 ", %{public}s, errorCode is %{public}d, count is " "%{public}d", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str(), errCode, + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str(), errCode, count); return; } @@ -278,7 +278,7 @@ void SchedulerManager::RemoveTimer(const Key &key) auto it = timerCache_.find(key); if (it != timerCache_.end()) { ZLOGW("RemoveTimer %{public}s %{public}s %{public}" PRId64, - DistributedData::Anonymous::Change(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); + URIUtils::Anonymous(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); DestoryTimerTask(it->second); timerCache_.erase(key); } diff --git a/services/distributeddataservice/service/data_share/common/uri_utils.cpp b/services/distributeddataservice/service/data_share/common/uri_utils.cpp index 1953824c4..065dfd75e 100644 --- a/services/distributeddataservice/service/data_share/common/uri_utils.cpp +++ b/services/distributeddataservice/service/data_share/common/uri_utils.cpp @@ -36,7 +36,7 @@ bool URIUtils::GetInfoFromURI(const std::string &uri, UriInfo &uriInfo) if (splitUri[BUNDLE_NAME].empty() || splitUri[MODULE_NAME].empty() || splitUri[STORE_NAME].empty() || splitUri[TABLE_NAME].empty()) { ZLOGE("Uri has empty field! bundleName: %{public}s uri: %{public}s", splitUri[BUNDLE_NAME].c_str(), - DistributedData::Anonymous::Change(uri).c_str()); + URIUtils::Anonymous(uri).c_str()); return false; } diff --git a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp index 3c1a3ded3..0c19fffe2 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp @@ -256,7 +256,7 @@ int32_t DataShareServiceImpl::AddTemplate(const std::string &uri, const int64_t TemplateId tpltId; tpltId.subscriberId_ = subscriberId; if (!GetCallerBundleName(tpltId.bundleName_)) { - ZLOGE("get bundleName error, %{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("get bundleName error, %{public}s", URIUtils::Anonymous(uri).c_str()); return ERROR; } ZLOGI("Add template, uri %{private}s, subscriberId %{public}" PRIi64 ", bundleName %{public}s," @@ -276,11 +276,11 @@ int32_t DataShareServiceImpl::DelTemplate(const std::string &uri, const int64_t TemplateId tpltId; tpltId.subscriberId_ = subscriberId; if (!GetCallerBundleName(tpltId.bundleName_)) { - ZLOGE("get bundleName error, %{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("get bundleName error, %{public}s", URIUtils::Anonymous(uri).c_str()); return ERROR; } ZLOGI("Delete template, uri %{private}s, subscriberId %{public}" PRIi64 ", bundleName %{public}s.", - DistributedData::Anonymous::Change(uri).c_str(), subscriberId, tpltId.bundleName_.c_str()); + URIUtils::Anonymous(uri).c_str(), subscriberId, tpltId.bundleName_.c_str()); return templateStrategy_.Execute(context, [&uri, &tpltId, &context]() -> int32_t { return TemplateManager::GetInstance().Delete( Key(uri, tpltId.subscriberId_, tpltId.bundleName_), context->visitedUserId); @@ -348,7 +348,7 @@ std::vector DataShareServiceImpl::Publish(const Data &data, con int32_t result = publishStrategy_.Execute(context, item); results.emplace_back(item.key_, result); if (result != E_OK) { - ZLOGE("publish error, key is %{public}s", DistributedData::Anonymous::Change(item.key_).c_str()); + ZLOGE("publish error, key is %{public}s", URIUtils::Anonymous(item.key_).c_str()); continue; } publishedData.emplace_back(context->uri, context->calledBundleName, item.subscriberId_); diff --git a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp index 7ebf32f0e..a1548b4f6 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp @@ -69,7 +69,7 @@ int32_t DataShareServiceStub::OnInsertEx(MessageParcel &data, MessageParcel &rep std::string extUri; DataShareValuesBucket bucket; if (!ITypesUtil::Unmarshal(data, uri, extUri, bucket.valuesMap)) { - ZLOGE("Unmarshal uri:%{public}s bucket size:%{public}zu", DistributedData::Anonymous::Change(uri).c_str(), + ZLOGE("Unmarshal uri:%{public}s bucket size:%{public}zu", URIUtils::Anonymous(uri).c_str(), bucket.valuesMap.size()); return IPC_STUB_INVALID_DATA_ERR; } @@ -90,7 +90,7 @@ int32_t DataShareServiceStub::OnUpdateEx(MessageParcel &data, MessageParcel &rep DataSharePredicates predicate; DataShareValuesBucket bucket; if (!ITypesUtil::Unmarshal(data, uri, extUri, predicate, bucket.valuesMap)) { - ZLOGE("Unmarshal uri:%{public}s bucket size:%{public}zu", DistributedData::Anonymous::Change(uri).c_str(), + ZLOGE("Unmarshal uri:%{public}s bucket size:%{public}zu", URIUtils::Anonymous(uri).c_str(), bucket.valuesMap.size()); return IPC_STUB_INVALID_DATA_ERR; } @@ -110,7 +110,7 @@ int32_t DataShareServiceStub::OnDeleteEx(MessageParcel &data, MessageParcel &rep std::string extUri; DataSharePredicates predicate; if (!ITypesUtil::Unmarshal(data, uri, extUri, predicate)) { - ZLOGE("Unmarshal uri:%{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("Unmarshal uri:%{public}s", URIUtils::Anonymous(uri).c_str()); return IPC_STUB_INVALID_DATA_ERR; } auto [errCode, status] = DeleteEx(uri, extUri, predicate); @@ -130,7 +130,7 @@ int32_t DataShareServiceStub::OnQuery(MessageParcel &data, MessageParcel &reply) DataSharePredicates predicate; std::vector columns; if (!ITypesUtil::Unmarshal(data, uri, extUri, predicate, columns)) { - ZLOGE("Unmarshal uri:%{public}s columns size:%{public}zu", DistributedData::Anonymous::Change(uri).c_str(), + ZLOGE("Unmarshal uri:%{public}s columns size:%{public}zu", URIUtils::Anonymous(uri).c_str(), columns.size()); return IPC_STUB_INVALID_DATA_ERR; } @@ -419,7 +419,7 @@ int32_t DataShareServiceStub::OnSetSilentSwitch(MessageParcel &data, MessageParc std::string uri; bool enable = false; if (!ITypesUtil::Unmarshal(data, uri, enable)) { - ZLOGE("Unmarshal set silent switch failed. uri: %{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("Unmarshal set silent switch failed. uri: %{public}s", URIUtils::Anonymous(uri).c_str()); return IPC_STUB_INVALID_DATA_ERR; } int32_t status = EnableSilentProxy(uri, enable); @@ -434,7 +434,7 @@ int32_t DataShareServiceStub::OnGetSilentProxyStatus(MessageParcel &data, Messag { std::string uri; if (!ITypesUtil::Unmarshal(data, uri)) { - ZLOGE("Unmarshal silent enable failed. uri: %{public}s", DistributedData::Anonymous::Change(uri).c_str()); + ZLOGE("Unmarshal silent enable failed. uri: %{public}s", URIUtils::Anonymous(uri).c_str()); return IPC_STUB_INVALID_DATA_ERR; } int32_t enable = GetSilentProxyStatus(uri); diff --git a/services/distributeddataservice/service/data_share/data_share_silent_config.cpp b/services/distributeddataservice/service/data_share/data_share_silent_config.cpp index 18b221acb..2f71fd3ac 100644 --- a/services/distributeddataservice/service/data_share/data_share_silent_config.cpp +++ b/services/distributeddataservice/service/data_share/data_share_silent_config.cpp @@ -59,7 +59,7 @@ bool DataShareSilentConfig::EnableSilentProxy(uint32_t callerTokenId, const std: uri = std::string(ALL_URI); } ZLOGI("Enable silent proxy, callerTokenId:%{public}u, enable:%{public}d, uri:%{public}s", - callerTokenId, enable, DistributedData::Anonymous::Change(uri).c_str()); + callerTokenId, enable, URIUtils::Anonymous(uri).c_str()); enableSilentUris_.Compute(callerTokenId, [&enable, &uri](const uint32_t &key, std::map &uris) { uris[uri] = enable; diff --git a/services/distributeddataservice/service/data_share/strategies/data_share/load_config_from_data_share_bundle_info_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/data_share/load_config_from_data_share_bundle_info_strategy.cpp index cb4b331ac..e5f3f5337 100644 --- a/services/distributeddataservice/service/data_share/strategies/data_share/load_config_from_data_share_bundle_info_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/data_share/load_config_from_data_share_bundle_info_strategy.cpp @@ -107,7 +107,7 @@ bool LoadConfigFromDataShareBundleInfoStrategy::LoadConfigFromUri(std::shared_pt { UriInfo uriInfo; if (!URIUtils::GetInfoFromURI(context->uri, uriInfo)) { - ZLOGE("Invalid uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("Invalid uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); return false; } context->calledBundleName = std::move(uriInfo.bundleName); diff --git a/services/distributeddataservice/service/data_share/strategies/general/load_config_data_info_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/general/load_config_data_info_strategy.cpp index 978a67165..bbd1bd332 100644 --- a/services/distributeddataservice/service/data_share/strategies/general/load_config_data_info_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/general/load_config_data_info_strategy.cpp @@ -22,7 +22,7 @@ #include "metadata/meta_data_manager.h" #include "metadata/store_meta_data.h" #include "rdb_errno.h" -#include "utils/anonymous.h" +#include "uri_utils.h" namespace OHOS::DataShare { LoadConfigDataInfoStrategy::LoadConfigDataInfoStrategy() @@ -61,7 +61,7 @@ bool LoadConfigNormalDataInfoStrategy::operator()(std::shared_ptr conte ExtensionConnectAdaptor::TryAndWait(context->uri, context->calledBundleName, wantParams); if (!QueryMetaData( context->calledBundleName, context->calledStoreName, metaData, context->visitedUserId, context->appIndex)) { - ZLOGE("QueryMetaData fail, %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("QueryMetaData fail, %{public}s", URIUtils::Anonymous(context->uri).c_str()); context->errCode = NativeRdb::E_DB_NOT_EXIST; return false; } @@ -85,7 +85,7 @@ bool LoadConfigSingleDataInfoStrategy::operator()(std::shared_ptr conte AAFwk::WantParams wantParams; ExtensionConnectAdaptor::TryAndWait(context->uri, context->calledBundleName, wantParams); if (!QueryMetaData(context->calledBundleName, context->calledStoreName, metaData, 0, context->appIndex)) { - ZLOGE("QueryMetaData fail, %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("QueryMetaData fail, %{public}s", URIUtils::Anonymous(context->uri).c_str()); context->errCode = NativeRdb::E_DB_NOT_EXIST; return false; } diff --git a/services/distributeddataservice/service/data_share/strategies/get_data_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/get_data_strategy.cpp index b02436915..1b8307812 100644 --- a/services/distributeddataservice/service/data_share/strategies/get_data_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/get_data_strategy.cpp @@ -20,7 +20,7 @@ #include "data_proxy/load_config_from_data_proxy_node_strategy.h" #include "general/load_config_common_strategy.h" #include "log_print.h" -#include "utils/anonymous.h" +#include "uri_utils.h" namespace OHOS::DataShare { Data GetDataStrategy::Execute(std::shared_ptr context, int &errorCode) @@ -32,7 +32,7 @@ Data GetDataStrategy::Execute(std::shared_ptr context, int &errorCode) return Data(); } if (!preProcess(context)) { - ZLOGE("pre process fail, uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("pre process fail, uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); errorCode = context->errCode; return Data(); } diff --git a/services/distributeddataservice/service/data_share/strategies/publish_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/publish_strategy.cpp index a23d516b0..fd277bd4a 100644 --- a/services/distributeddataservice/service/data_share/strategies/publish_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/publish_strategy.cpp @@ -22,7 +22,7 @@ #include "general/permission_strategy.h" #include "log_print.h" #include "published_data.h" -#include "utils/anonymous.h" +#include "uri_utils.h" namespace OHOS::DataShare { int32_t PublishStrategy::Execute(std::shared_ptr context, const PublishedDataItem &item) @@ -33,7 +33,7 @@ int32_t PublishStrategy::Execute(std::shared_ptr context, const Publish return -1; } if (!preProcess(context)) { - ZLOGE("pre process fail, uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("pre process fail, uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); return context->errCode; } auto delegate = KvDBDelegate::GetInstance(); @@ -48,7 +48,7 @@ int32_t PublishStrategy::Execute(std::shared_ptr context, const Publish auto [status, count] = delegate->Upsert(KvDBDelegate::DATA_TABLE, data); if (status != E_OK) { ZLOGE("db Upsert failed, %{public}s %{public}s %{public}d", context->calledBundleName.c_str(), - DistributedData::Anonymous::Change(context->uri).c_str(), status); + URIUtils::Anonymous(context->uri).c_str(), status); return status; } return E_OK; diff --git a/services/distributeddataservice/service/data_share/strategies/rdb_notify_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/rdb_notify_strategy.cpp index a979a9d00..be4d1c548 100644 --- a/services/distributeddataservice/service/data_share/strategies/rdb_notify_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/rdb_notify_strategy.cpp @@ -20,7 +20,7 @@ #include "general/load_config_data_info_strategy.h" #include "general/load_config_from_bundle_info_strategy.h" #include "log_print.h" -#include "utils/anonymous.h" +#include "uri_utils.h" #include "log_debug.h" namespace OHOS::DataShare { @@ -32,7 +32,7 @@ bool RdbNotifyStrategy::Execute(std::shared_ptr context) return false; } if (!preProcess(context)) { - ZLOGE("pre process fail, uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("pre process fail, uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); return false; } if (context->callerBundleName != context->calledBundleName) { diff --git a/services/distributeddataservice/service/data_share/strategies/subscribe_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/subscribe_strategy.cpp index 4b7314c88..376756243 100644 --- a/services/distributeddataservice/service/data_share/strategies/subscribe_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/subscribe_strategy.cpp @@ -21,7 +21,7 @@ #include "general/load_config_data_info_strategy.h" #include "general/permission_strategy.h" #include "log_print.h" -#include "utils/anonymous.h" +#include "uri_utils.h" namespace OHOS::DataShare { int32_t SubscribeStrategy::Execute(std::shared_ptr context, std::function process) @@ -34,7 +34,7 @@ int32_t SubscribeStrategy::Execute(std::shared_ptr context, std::functi context->isRead = true; context->needAutoLoadCallerBundleName = true; if (!preProcess(context)) { - ZLOGE("pre process fail, uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("pre process fail, uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); return context->errCode; } return process(); diff --git a/services/distributeddataservice/service/data_share/strategies/template_strategy.cpp b/services/distributeddataservice/service/data_share/strategies/template_strategy.cpp index fd33112a7..7c3439e5c 100644 --- a/services/distributeddataservice/service/data_share/strategies/template_strategy.cpp +++ b/services/distributeddataservice/service/data_share/strategies/template_strategy.cpp @@ -20,7 +20,7 @@ #include "datashare_errno.h" #include "general/load_config_common_strategy.h" #include "log_print.h" -#include "utils/anonymous.h" +#include "uri_utils.h" namespace OHOS::DataShare { int32_t TemplateStrategy::Execute(std::shared_ptr context, std::function process) @@ -32,7 +32,7 @@ int32_t TemplateStrategy::Execute(std::shared_ptr context, std::functio } if (!preProcess(context)) { - ZLOGE("pre process fail, uri: %{public}s", DistributedData::Anonymous::Change(context->uri).c_str()); + ZLOGE("pre process fail, uri: %{public}s", URIUtils::Anonymous(context->uri).c_str()); return context->errCode; } return process(); diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/proxy_data_subscriber_manager.cpp b/services/distributeddataservice/service/data_share/subscriber_managers/proxy_data_subscriber_manager.cpp index 85a854797..85bdd0dd9 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/proxy_data_subscriber_manager.cpp +++ b/services/distributeddataservice/service/data_share/subscriber_managers/proxy_data_subscriber_manager.cpp @@ -38,7 +38,7 @@ DataProxyErrorCode ProxyDataSubscriberManager::Add(const ProxyDataKey &key, cons key, [&observer, bundleName, callerAppIdentifier, userId](const ProxyDataKey &key, std::vector &value) { ZLOGI("add proxy data subscriber, uri %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str()); + URIUtils::Anonymous(key.uri).c_str()); value.emplace_back(observer, IPCSkeleton::GetCallingTokenID(), bundleName, callerAppIdentifier, userId); return true; }); @@ -53,7 +53,7 @@ DataProxyErrorCode ProxyDataSubscriberManager::Delete(const ProxyDataKey &key, c for (auto it = value.begin(); it != value.end();) { if (it->callerTokenId == IPCSkeleton::GetCallingTokenID() && it->userId == userId) { ZLOGI("delete proxy data subscriber, uri %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str()); + URIUtils::Anonymous(key.uri).c_str()); it = value.erase(it); } } diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp b/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp index a7c7aa87d..466fd0545 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp +++ b/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp @@ -39,7 +39,7 @@ int PublishedDataSubscriberManager::Add(const PublishedDataKey &key, key, [&observer, &firstCallerTokenId, userId, this](const PublishedDataKey &key, std::vector &value) { ZLOGI("add publish subscriber, uri %{public}s tokenId 0x%{public}x", - DistributedData::Anonymous::Change(key.key).c_str(), firstCallerTokenId); + URIUtils::Anonymous(key.key).c_str(), firstCallerTokenId); value.emplace_back(observer, firstCallerTokenId, IPCSkeleton::GetCallingTokenID(), IPCSkeleton::GetCallingPid(), userId); return true; @@ -55,7 +55,7 @@ int PublishedDataSubscriberManager::Delete(const PublishedDataKey &key, uint32_t for (auto it = value.begin(); it != value.end();) { if (it->firstCallerTokenId == firstCallerTokenId) { ZLOGI("delete publish subscriber, uri %{public}s tokenId 0x%{public}x", - DistributedData::Anonymous::Change(key.key).c_str(), firstCallerTokenId); + URIUtils::Anonymous(key.key).c_str(), firstCallerTokenId); it = value.erase(it); } else { it++; @@ -72,7 +72,7 @@ void PublishedDataSubscriberManager::Delete(uint32_t callerTokenId, uint32_t cal for (auto it = value.begin(); it != value.end();) { if (it->callerTokenId == callerTokenId && it->callerPid == callerPid) { ZLOGI("erase start, uri is %{public}s, tokenId is 0x%{public}x, pid is %{public}d", - DistributedData::Anonymous::Change(key.key).c_str(), callerTokenId, callerPid); + URIUtils::Anonymous(key.key).c_str(), callerTokenId, callerPid); it = value.erase(it); } else { it++; diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp index 1fb04a571..6c33d72e0 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp +++ b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp @@ -126,7 +126,7 @@ int RdbSubscriberManager::Add(const Key &key, const sptr LoadConfigDataInfoStrategy loadDataInfo; if (!loadDataInfo(context)) { ZLOGE("loadDataInfo failed, uri %{public}s tokenId 0x%{public}x", - DistributedData::Anonymous::Change(key.uri).c_str(), context->callerTokenId); + URIUtils::Anonymous(key.uri).c_str(), context->callerTokenId); return; } DistributedData::StoreMetaData metaData = RdbSubscriberManager::GenMetaDataFromContext(context); @@ -147,7 +147,7 @@ int RdbSubscriberManager::Delete(const Key &key, uint32_t firstCallerTokenId) rdbCache_.ComputeIfPresent(key, [&firstCallerTokenId, this](const auto &key, std::vector &value) { ZLOGI("delete subscriber, uri %{public}s tokenId 0x%{public}x", - DistributedData::Anonymous::Change(key.uri).c_str(), firstCallerTokenId); + URIUtils::Anonymous(key.uri).c_str(), firstCallerTokenId); for (auto it = value.begin(); it != value.end();) { if (it->firstCallerTokenId == firstCallerTokenId) { ZLOGI("erase start"); @@ -177,7 +177,7 @@ void RdbSubscriberManager::Delete(uint32_t callerTokenId, uint32_t callerPid) if (value.empty()) { ZLOGI("delete timer, subId %{public}" PRId64 ", bundleName %{public}s, tokenId %{public}x, uri %{public}s.", key.subscriberId, key.bundleName.c_str(), callerTokenId, - DistributedData::Anonymous::Change(key.uri).c_str()); + URIUtils::Anonymous(key.uri).c_str()); SchedulerManager::GetInstance().Stop(key); } return value.empty(); @@ -346,14 +346,14 @@ int RdbSubscriberManager::Notify(const Key &key, int32_t userId, const std::vect Template tpl; if (!TemplateManager::GetInstance().Get(key, userId, tpl)) { ZLOGE("template undefined, %{public}s, %{public}" PRId64 ", %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); return E_TEMPLATE_NOT_EXIST; } DistributedData::StoreMetaData meta = metaData; meta.user = std::to_string(userId); auto delegate = DBDelegate::Create(meta, key.uri); if (delegate == nullptr) { - ZLOGE("Create fail %{public}s %{public}s", DistributedData::Anonymous::Change(key.uri).c_str(), + ZLOGE("Create fail %{public}s %{public}s", URIUtils::Anonymous(key.uri).c_str(), key.bundleName.c_str()); return E_ERROR; } @@ -372,17 +372,17 @@ int RdbSubscriberManager::Notify(const Key &key, int32_t userId, const std::vect auto [errCode, rowCount] = delegate->UpdateSql(tpl.update_); if (errCode != E_OK) { ZLOGE("Update failed, err:%{public}d, %{public}s, %{public}" PRId64 ", %{public}s", - errCode, DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + errCode, URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); } } ZLOGI("emit, valSize: %{public}zu, dataSize:%{public}zu, uri:%{public}s,", - val.size(), changeNode.data_.size(), DistributedData::Anonymous::Change(changeNode.uri_).c_str()); + val.size(), changeNode.data_.size(), URIUtils::Anonymous(changeNode.uri_).c_str()); for (const auto &callback : val) { // not notify across user if (callback.userId != userId && userId != 0 && callback.userId != 0) { ZLOGI("Not allow across notify, uri:%{public}s, from %{public}d to %{public}d.", - DistributedData::Anonymous::Change(changeNode.uri_).c_str(), userId, callback.userId); + URIUtils::Anonymous(changeNode.uri_).c_str(), userId, callback.userId); continue; } if (callback.enabled && callback.observer != nullptr) { -- Gitee