diff --git a/services/distributeddataservice/service/data_share/common/kv_delegate.cpp b/services/distributeddataservice/service/data_share/common/kv_delegate.cpp index 06f8cc6a2f803af9f0b12b1318ff9445ddc3e7ed..ffa0b1320e70e051aa74d1d940ca8cb6a05c4fe7 100644 --- a/services/distributeddataservice/service/data_share/common/kv_delegate.cpp +++ b/services/distributeddataservice/service/data_share/common/kv_delegate.cpp @@ -60,7 +60,7 @@ void KvDelegate::RemoveDbFile(bool isBackUp) const } } -bool KvDelegate::CopyFile(bool isBackup) +bool KvDelegate::CopyFile(bool isBackup) const { std::filesystem::copy_options options = std::filesystem::copy_options::overwrite_existing; std::error_code code; diff --git a/services/distributeddataservice/service/data_share/common/kv_delegate.h b/services/distributeddataservice/service/data_share/common/kv_delegate.h index 3ec92c7cdf01e3fb8c1c79dda4c4bf859e1541f2..770c4a935ef0e824b887acf43b768b6a153fa9ca 100644 --- a/services/distributeddataservice/service/data_share/common/kv_delegate.h +++ b/services/distributeddataservice/service/data_share/common/kv_delegate.h @@ -47,7 +47,7 @@ private: void Backup(); void Restore(); void RemoveDbFile(bool isBackUp) const; - bool CopyFile(bool isBackup); + bool CopyFile(bool isBackup) const; std::recursive_mutex mutex_; std::string path_; GRD_DB *db_ = nullptr; diff --git a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp index 79ca80155a6e32bfd36ac2af3417040ab57d13b1..bcf5820494839d2c0a0cddace6f274a8c62f8b86 100644 --- a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp +++ b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp @@ -247,7 +247,7 @@ void SchedulerManager::ExecuteSchedulerSQL(const int32_t userId, DistributedData } void SchedulerManager::GenRemindTimerFuncParams( - const int32_t userId, DistributedData::StoreMetaData &metaData, const Key &key, std::string &schedulerSQL) + const int32_t userId, const DistributedData::StoreMetaData &metaData, const Key &key, std::string &schedulerSQL) { auto index = schedulerSQL.find(REMIND_TIMER_FUNC); if (index == std::string::npos) { diff --git a/services/distributeddataservice/service/data_share/data/template_data.cpp b/services/distributeddataservice/service/data_share/data/template_data.cpp index baf5dc4d5dda77ae2d5773dba7ec7c9410ec25f7..83ba5b88820c0fe7147ec41d519f24cd9c0d7264 100644 --- a/services/distributeddataservice/service/data_share/data/template_data.cpp +++ b/services/distributeddataservice/service/data_share/data/template_data.cpp @@ -18,16 +18,16 @@ namespace OHOS::DataShare { bool TemplateNode::Marshal(DistributedData::Serializable::json &node) const { - bool ret = SetValue(node[GET_NAME(update)], update); - ret = SetValue(node[GET_NAME(predicates)], predicates); + SetValue(node[GET_NAME(update)], update); + bool ret = SetValue(node[GET_NAME(predicates)], predicates); ret = ret && SetValue(node[GET_NAME(scheduler)], scheduler); return ret; } bool TemplateNode::Unmarshal(const DistributedData::Serializable::json &node) { - bool ret = GetValue(node, GET_NAME(update), update); - ret = GetValue(node, GET_NAME(predicates), predicates); + GetValue(node, GET_NAME(update), update); + bool ret = GetValue(node, GET_NAME(predicates), predicates); return ret && GetValue(node, GET_NAME(scheduler), scheduler); } diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h index 5bb2e82d86195c066a2f781e8e1ef69a55306182..79df3f8bf4443745ad3df36e1bac89e86c19df5b 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h +++ b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h @@ -66,7 +66,7 @@ public: void Emit(const std::string &uri, std::shared_ptr context); void Emit(const std::string &uri, int32_t userId, DistributedData::StoreMetaData &metaData); void EmitByKey(const Key &key, int32_t userId, const DistributedData::StoreMetaData &metaData); - DistributedData::StoreMetaData GenMetaDataFromContext(const std::shared_ptr context); + static DistributedData::StoreMetaData GenMetaDataFromContext(const std::shared_ptr context); std::vector GetKeysByUri(const std::string &uri); void Clear();