From 8228eaa9059f4c55071aa46e0271743994b7aa4e Mon Sep 17 00:00:00 2001 From: gecheng Date: Tue, 22 Apr 2025 17:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=BB=84=E8=93=9D=E5=B7=AE?= =?UTF-8?q?=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gecheng --- .../adapter/network/src/network_delegate_normal_impl.cpp | 2 +- services/distributeddataservice/framework/cloud/cloud_db.cpp | 1 + .../framework/include/changeevent/remote_change_event.h | 2 +- services/distributeddataservice/service/cloud/BUILD.gn | 1 + .../distributeddataservice/service/cloud/cloud_service_impl.h | 1 - .../distributeddataservice/service/rdb/rdb_general_store.cpp | 1 + services/distributeddataservice/service/rdb/rdb_query.h | 4 ++-- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services/distributeddataservice/adapter/network/src/network_delegate_normal_impl.cpp b/services/distributeddataservice/adapter/network/src/network_delegate_normal_impl.cpp index 5f6d25db0..1edda0333 100644 --- a/services/distributeddataservice/adapter/network/src/network_delegate_normal_impl.cpp +++ b/services/distributeddataservice/adapter/network/src/network_delegate_normal_impl.cpp @@ -121,7 +121,7 @@ void NetworkDelegateNormalImpl::RegOnNetworkChange() void NetworkDelegateNormalImpl::BindExecutor(std::shared_ptr executors) { - executors_ = std::move(executors); + executors_ = executors; } ExecutorPool::Task NetworkDelegateNormalImpl::GetTask(uint32_t retry) diff --git a/services/distributeddataservice/framework/cloud/cloud_db.cpp b/services/distributeddataservice/framework/cloud/cloud_db.cpp index 863475888..1ae61b205 100644 --- a/services/distributeddataservice/framework/cloud/cloud_db.cpp +++ b/services/distributeddataservice/framework/cloud/cloud_db.cpp @@ -103,5 +103,6 @@ std::pair CloudDB::GetEmptyCursor(const std::string &table void CloudDB::SetPrepareTraceId(const std::string &prepareTraceId) { (void)prepareTraceId; + return; } } // namespace OHOS::DistributedData \ No newline at end of file diff --git a/services/distributeddataservice/framework/include/changeevent/remote_change_event.h b/services/distributeddataservice/framework/include/changeevent/remote_change_event.h index bf58f4328..aa6ca90dc 100644 --- a/services/distributeddataservice/framework/include/changeevent/remote_change_event.h +++ b/services/distributeddataservice/framework/include/changeevent/remote_change_event.h @@ -33,8 +33,8 @@ public: std::string storeId; std::string deviceId; std::string bundleName; - int changeType = 0; // 0 means CLOUD_DATA_CHANGE std::vector tables; + int changeType = 0; // 0 means CLOUD_DATA_CHANGE }; RemoteChangeEvent(int32_t evtId, DataInfo&& info); diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index 8253551ed..baa04db86 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -67,6 +67,7 @@ ohos_source_set("distributeddata_cloud") { "access_token:libtokenid_sdk", "device_manager:devicemanagersdk", "hicollie:libhicollie", + "hilog:libhilog", "json:nlohmann_json_static", "kv_store:datamgr_common", "kv_store:distributeddb", diff --git a/services/distributeddataservice/service/cloud/cloud_service_impl.h b/services/distributeddataservice/service/cloud/cloud_service_impl.h index 1c50f2f15..6025cbce7 100644 --- a/services/distributeddataservice/service/cloud/cloud_service_impl.h +++ b/services/distributeddataservice/service/cloud/cloud_service_impl.h @@ -184,7 +184,6 @@ private: static int32_t SaveNetworkStrategy(const std::vector &values, const HapInfo &hapInfo); void Report(const std::string &faultType, DistributedDataDfx::Fault errCode, const std::string &bundleName, const std::string &appendix); - QueryLastResults AssembleLastResults(const std::vector &databases, const std::map &lastSyncInfos); diff --git a/services/distributeddataservice/service/rdb/rdb_general_store.cpp b/services/distributeddataservice/service/rdb/rdb_general_store.cpp index 73d5c01de..afcb4cfd0 100644 --- a/services/distributeddataservice/service/rdb/rdb_general_store.cpp +++ b/services/distributeddataservice/service/rdb/rdb_general_store.cpp @@ -23,6 +23,7 @@ #include "changeevent/remote_change_event.h" #include "cloud/asset_loader.h" #include "cloud/cloud_db.h" +#include "cloud/cloud_lock_event.h" #include "cloud/cloud_store_types.h" #include "cloud/schema_meta.h" #include "cloud_service.h" diff --git a/services/distributeddataservice/service/rdb/rdb_query.h b/services/distributeddataservice/service/rdb/rdb_query.h index 94d9460f2..c420e2f63 100644 --- a/services/distributeddataservice/service/rdb/rdb_query.h +++ b/services/distributeddataservice/service/rdb/rdb_query.h @@ -100,10 +100,10 @@ private: &RdbQuery::LessThan, &RdbQuery::LessThanOrEqual, &RdbQuery::Distinct, + &RdbQuery::IndexedBy, &RdbQuery::NotContains, &RdbQuery::NotLike, - &RdbQuery::AssetsOnly, - &RdbQuery::IndexedBy + &RdbQuery::AssetsOnly }; static constexpr inline uint32_t DECIMAL_BASE = 10; -- Gitee