From 3063ffa3e64521493a99fd5e4beb800f94faa802 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 14:26:24 +0800 Subject: [PATCH 1/8] Redundant code modifications Signed-off-by: z30053452 --- .../adapter/include/utils/kvstore_utils.h | 1 - .../adapter/utils/src/kvstore_utils.cpp | 1 - .../app/src/kvstore_account_observer.h | 3 --- .../app/src/kvstore_data_service.cpp | 21 ------------------- .../app/src/kvstore_data_service.h | 10 --------- .../app/src/kvstore_data_service_stub.cpp | 2 -- .../app/src/kvstore_data_service_stub.h | 1 - .../app/src/kvstore_meta_manager.cpp | 15 ------------- .../app/src/kvstore_meta_manager.h | 7 ------- .../app/src/kvstore_screen_observer.h | 1 - .../app/src/security/security.h | 1 - .../service/kvdb/auth_delegate.cpp | 3 --- .../service/kvdb/auth_delegate.h | 4 ---- .../service/kvdb/kvdb_exporter.h | 1 - .../service/kvdb/kvdb_general_store.cpp | 9 -------- .../service/kvdb/kvdb_general_store.h | 10 --------- .../service/kvdb/kvdb_observer_proxy.cpp | 3 --- .../service/kvdb/kvdb_observer_proxy.h | 4 ---- .../service/kvdb/kvdb_query.h | 3 --- .../service/kvdb/kvdb_service_impl.cpp | 7 ------- .../service/kvdb/kvdb_service_impl.h | 9 +------- .../service/kvdb/kvdb_service_stub.h | 1 - .../service/kvdb/kvdb_watcher.cpp | 6 ------ .../service/kvdb/kvdb_watcher.h | 3 --- .../service/kvdb/kvstore_sync_manager.h | 4 ---- .../service/kvdb/query_helper.cpp | 3 --- .../service/kvdb/query_helper.h | 2 -- .../service/kvdb/upgrade.cpp | 5 ----- .../service/kvdb/upgrade.h | 3 --- .../service/kvdb/user_delegate.cpp | 2 -- .../service/kvdb/user_delegate.h | 5 ----- 31 files changed, 1 insertion(+), 149 deletions(-) diff --git a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h index d521bf317..123d7977d 100644 --- a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h +++ b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h @@ -17,7 +17,6 @@ #define KVSTORE_UTILS_H #include -#include #include "visibility.h" namespace OHOS { diff --git a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp index 635bf7807..c95a67f3d 100644 --- a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp +++ b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp @@ -15,7 +15,6 @@ #define LOG_TAG "KvStoreUtils" #include "kvstore_utils.h" -#include namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_account_observer.h b/services/distributeddataservice/app/src/kvstore_account_observer.h index bbc535088..156ffa494 100644 --- a/services/distributeddataservice/app/src/kvstore_account_observer.h +++ b/services/distributeddataservice/app/src/kvstore_account_observer.h @@ -16,10 +16,7 @@ #ifndef KVSTORE_ACCOUNT_OBSERVER_H #define KVSTORE_ACCOUNT_OBSERVER_H -#include - #include "account/account_delegate.h" -#include "executor_pool.h" namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index 3c80f0741..8be5e0605 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -15,55 +15,34 @@ #define LOG_TAG "KvStoreDataService" #include "kvstore_data_service.h" -#include -#include -#include #include -#include #include -#include -#include #include "accesstoken_kit.h" -#include "app_id_mapping/app_id_mapping_config_manager.h" -#include "auth_delegate.h" -#include "auto_launch_export.h" #include "bootstrap.h" -#include "checker/checker_manager.h" -#include "communication_provider.h" #include "communicator_context.h" #include "config_factory.h" #include "crypto_manager.h" #include "db_info_handle_impl.h" #include "device_manager_adapter.h" #include "device_matrix.h" -#include "dfx/reporter.h" -#include "dump/dump_manager.h" #include "dump_helper.h" #include "eventcenter/event_center.h" -#include "if_system_ability_manager.h" #include "installer/installer.h" #include "iservice_registry.h" #include "kvstore_account_observer.h" #include "kvstore_screen_observer.h" #include "log_print.h" #include "mem_mgr_client.h" -#include "mem_mgr_proxy.h" #include "metadata/appid_meta_data.h" -#include "metadata/meta_data_manager.h" #include "network/network_delegate.h" -#include "metadata/store_meta_data.h" -#include "permission_validator.h" #include "permit_delegate.h" -#include "process_communicator_impl.h" #include "route_head_handler_impl.h" -#include "runtime_config.h" #include "store/auto_cache.h" #include "string_ex.h" #include "system_ability_definition.h" #include "task_manager.h" #include "thread/thread_manager.h" -#include "upgrade.h" #include "upgrade_manager.h" #include "user_delegate.h" #include "utils/anonymous.h" diff --git a/services/distributeddataservice/app/src/kvstore_data_service.h b/services/distributeddataservice/app/src/kvstore_data_service.h index f49a323c8..defc465dc 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.h +++ b/services/distributeddataservice/app/src/kvstore_data_service.h @@ -17,28 +17,18 @@ #define KVSTORE_DATASERVICE_H #include -#include -#include -#include #include "account/account_delegate.h" #include "clone/clone_backup_info.h" #include "clone/secret_key_backup_data.h" #include "dfx/reporter.h" -#include "executor_pool.h" #include "feature_stub_impl.h" -#include "ikvstore_data_service.h" -#include "ithread_pool.h" #include "kvstore_data_service_stub.h" #include "kvstore_device_listener.h" #include "kvstore_meta_manager.h" #include "metadata/secret_key_meta_data.h" -#include "metadata/store_meta_data.h" #include "runtime_config.h" -#include "screen/screen_manager.h" #include "security/security.h" -#include "system_ability.h" -#include "types.h" #include "unique_fd.h" namespace OHOS::DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp b/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp index 3b74cbee4..d03632ea3 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp @@ -18,8 +18,6 @@ #include "kvstore_data_service_stub.h" #include #include "itypes_util.h" -#include "message_parcel.h" -#include "types.h" #include "log_print.h" #include "xcollie.h" diff --git a/services/distributeddataservice/app/src/kvstore_data_service_stub.h b/services/distributeddataservice/app/src/kvstore_data_service_stub.h index 2e776bd01..e9ef385c9 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service_stub.h +++ b/services/distributeddataservice/app/src/kvstore_data_service_stub.h @@ -15,7 +15,6 @@ #ifndef KVSTORE_DATA_SERVICE_STUB_H #define KVSTORE_DATA_SERVICE_STUB_H #include "ikvstore_data_service.h" -#include "distributeddata_ipc_interface_code.h" namespace OHOS::DistributedKv { class API_EXPORT KvStoreDataServiceStub : public IRemoteStub { public: diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp index 1b785ff30..713ff5d86 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp @@ -14,13 +14,8 @@ */ #define LOG_TAG "KvStoreMetaManager" -#include "kvstore_meta_manager.h" - #include -#include -#include -#include "account/account_delegate.h" #include "bootstrap.h" #include "communication_provider.h" #include "crypto_manager.h" @@ -29,29 +24,19 @@ #include "directory/directory_manager.h" #include "eventcenter/event_center.h" #include "kvstore_data_service.h" -#include "kv_radar_reporter.h" #include "log_print.h" -#include "matrix_event.h" #include "metadata/auto_launch_meta_data.h" #include "metadata/capability_meta_data.h" #include "metadata/device_meta_data.h" -#include "metadata/meta_data_manager.h" -#include "metadata/matrix_meta_data.h" #include "metadata/strategy_meta_data.h" #include "metadata/store_meta_data_local.h" #include "metadata/strategy_meta_data.h" #include "metadata/switches_meta_data.h" #include "metadata/user_meta_data.h" #include "metadata/version_meta_data.h" -#include "runtime_config.h" -#include "safe_block_queue.h" -#include "store/general_store.h" -#include "store/store_info.h" #include "utils/anonymous.h" -#include "utils/block_integer.h" #include "utils/corrupt_reporter.h" #include "utils/crypto.h" -#include "utils/ref_count.h" #include "utils/converter.h" #include "utils/constant.h" diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h index df3abc661..dac381d7e 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.h +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h @@ -15,16 +15,9 @@ #ifndef KVSTORE_META_MANAGER_H #define KVSTORE_META_MANAGER_H -#include -#include - -#include "app_device_change_listener.h" -#include "executor_pool.h" -#include "kv_store_delegate.h" #include "kv_store_delegate_manager.h" #include "safe_block_queue.h" #include "system_ability.h" -#include "types.h" #include "metadata/meta_data_manager.h" #include "metadata/store_meta_data.h" diff --git a/services/distributeddataservice/app/src/kvstore_screen_observer.h b/services/distributeddataservice/app/src/kvstore_screen_observer.h index 944a5463c..fddf7dcd2 100644 --- a/services/distributeddataservice/app/src/kvstore_screen_observer.h +++ b/services/distributeddataservice/app/src/kvstore_screen_observer.h @@ -16,7 +16,6 @@ #ifndef KVSTORE_SCREEN_OBSERVER_H #define KVSTORE_SCREEN_OBSERVER_H -#include "executor_pool.h" #include "screen/screen_manager.h" namespace OHOS { diff --git a/services/distributeddataservice/app/src/security/security.h b/services/distributeddataservice/app/src/security/security.h index bfa2a5415..8562f4b19 100644 --- a/services/distributeddataservice/app/src/security/security.h +++ b/services/distributeddataservice/app/src/security/security.h @@ -21,7 +21,6 @@ #include "app_device_change_listener.h" #include "executor_pool.h" #include "iprocess_system_api_adapter.h" -#include "kv_store_delegate_manager.h" #include "sensitive.h" #include "visibility.h" diff --git a/services/distributeddataservice/service/kvdb/auth_delegate.cpp b/services/distributeddataservice/service/kvdb/auth_delegate.cpp index f76965451..61b273f30 100644 --- a/services/distributeddataservice/service/kvdb/auth_delegate.cpp +++ b/services/distributeddataservice/service/kvdb/auth_delegate.cpp @@ -16,13 +16,10 @@ #define LOG_TAG "AuthHandler" #include "auth_delegate.h" -#include "checker/checker_manager.h" #include "device_manager_adapter.h" #include "log_print.h" #include "user_delegate.h" #include "utils/anonymous.h" -#include "metadata/store_meta_data.h" -#include "metadata/meta_data_manager.h" namespace OHOS::DistributedData { using DmAdapter = OHOS::DistributedData::DeviceManagerAdapter; class AuthHandlerStub : public AuthHandler { diff --git a/services/distributeddataservice/service/kvdb/auth_delegate.h b/services/distributeddataservice/service/kvdb/auth_delegate.h index 199b7e745..b5ad1e94f 100644 --- a/services/distributeddataservice/service/kvdb/auth_delegate.h +++ b/services/distributeddataservice/service/kvdb/auth_delegate.h @@ -16,10 +16,6 @@ #ifndef DISTRIBUTEDDATAMGR_AUTH_DELEGATE_H #define DISTRIBUTEDDATAMGR_AUTH_DELEGATE_H -#include - -#include "metadata/user_meta_data.h" -#include "serializable/serializable.h" #include "commu_types.h" namespace OHOS::DistributedData { using AclParams = OHOS::AppDistributedKv::AclParams; diff --git a/services/distributeddataservice/service/kvdb/kvdb_exporter.h b/services/distributeddataservice/service/kvdb/kvdb_exporter.h index 2e856e5d8..a72ae87ad 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_exporter.h +++ b/services/distributeddataservice/service/kvdb/kvdb_exporter.h @@ -16,7 +16,6 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_EXPORTER_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_EXPORTER_H #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" #include "metadata/store_meta_data.h" namespace OHOS::DistributedKv { class KVDBExporter { diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp index 4c8a98473..8277098d2 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp @@ -19,25 +19,16 @@ #include "app_id_mapping/app_id_mapping_config_manager.h" #include "bootstrap.h" -#include "checker/checker_manager.h" -#include "cloud/cloud_sync_finished_event.h" #include "cloud/schema_meta.h" #include "crypto_manager.h" #include "device_manager_adapter.h" #include "device_matrix.h" -#include "dfx/dfx_types.h" #include "dfx/reporter.h" -#include "directory/directory_manager.h" -#include "eventcenter/event_center.h" #include "kvdb_query.h" #include "log_print.h" #include "metadata/meta_data_manager.h" -#include "metadata/secret_key_meta_data.h" #include "metadata/store_meta_data_local.h" -#include "query_helper.h" #include "rdb_cloud.h" -#include "snapshot/bind_event.h" -#include "types.h" #include "user_delegate.h" #include "utils/anonymous.h" diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.h b/services/distributeddataservice/service/kvdb/kvdb_general_store.h index 80e030f05..dce19e1aa 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.h +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.h @@ -16,19 +16,9 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_GENERAL_STORE_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_GENERAL_STORE_H -#include -#include -#include - -#include "kv_store_changed_data.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" -#include "kvstore_sync_callback.h" -#include "kvstore_sync_manager.h" #include "metadata/store_meta_data.h" #include "store/general_store.h" -#include "store/general_value.h" -#include "store_observer.h" namespace OHOS::DistributedKv { using namespace DistributedData; diff --git a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp index 3eb5413ef..d976b40f1 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp @@ -18,11 +18,8 @@ #include "kvdb_observer_proxy.h" #include -#include #include "kv_types_util.h" -#include "itypes_util.h" #include "log_print.h" -#include "message_parcel.h" namespace OHOS { namespace DistributedKv { using namespace std::chrono; diff --git a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h index 9a706fd26..ed3991314 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h +++ b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h @@ -16,11 +16,7 @@ #ifndef KVDB_OBSERVER_PROXY_H #define KVDB_OBSERVER_PROXY_H -#include "change_notification.h" -#include "iremote_broker.h" #include "ikvstore_observer.h" -#include "iremote_proxy.h" -#include "types.h" namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/service/kvdb/kvdb_query.h b/services/distributeddataservice/service/kvdb/kvdb_query.h index 3eec4f496..d6fd86575 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_query.h +++ b/services/distributeddataservice/service/kvdb/kvdb_query.h @@ -16,10 +16,7 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_QUERY_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_QUERY_H -#include "query.h" #include "query_helper.h" -#include "store/general_value.h" -#include "store_types.h" namespace OHOS::DistributedKv { class KVDBQuery : public DistributedData::GenQuery { diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp index 06373b517..753a4d072 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp @@ -15,17 +15,14 @@ #define LOG_TAG "KVDBServiceImpl" #include "kvdb_service_impl.h" -#include #include #include "accesstoken_kit.h" #include "account/account_delegate.h" #include "backup_manager.h" #include "bootstrap.h" -#include "checker/checker_manager.h" #include "cloud/change_event.h" #include "cloud/cloud_server.h" -#include "communication_provider.h" #include "communicator_context.h" #include "device_manager_adapter.h" #include "directory/directory_manager.h" @@ -36,14 +33,10 @@ #include "kvdb_general_store.h" #include "kvdb_query.h" #include "log_print.h" -#include "matrix_event.h" #include "metadata/appid_meta_data.h" #include "metadata/capability_meta_data.h" -#include "metadata/store_meta_data.h" #include "metadata/switches_meta_data.h" #include "permit_delegate.h" -#include "query_helper.h" -#include "store/store_info.h" #include "upgrade.h" #include "utils/anonymous.h" #include "utils/constant.h" diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h index fd7f4e8c8..380b8f7bb 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h @@ -15,25 +15,18 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_SERVICE_IMPL_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_SERVICE_IMPL_H -#include -#include -#include "concurrent_map.h" #include "crypto_manager.h" #include "device_matrix.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" -#include "kvdb_notifier_proxy.h" #include "kvdb_service_stub.h" #include "kvdb_watcher.h" #include "kvstore_sync_manager.h" #include "metadata/meta_data_manager.h" -#include "metadata/store_meta_data.h" #include "metadata/store_meta_data_local.h" #include "metadata/strategy_meta_data.h" #include "store/auto_cache.h" -#include "store/general_value.h" -#include "utils/ref_count.h" + namespace OHOS::DistributedKv { class KVDBServiceImpl final : public KVDBServiceStub { public: diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h index f26cb7c83..11d508e3a 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h @@ -18,7 +18,6 @@ #include "checker/checker_manager.h" #include "distributeddata_kvdb_ipc_interface_code.h" #include "feature/feature_system.h" -#include "iremote_stub.h" #include "kvdb_service.h" namespace OHOS::DistributedKv { class KVDBServiceStub : public KVDBService, public DistributedData::FeatureSystem::Feature { diff --git a/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp b/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp index f04180ab5..ebf4e5397 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp @@ -17,12 +17,6 @@ #include "kvdb_watcher.h" -#include "error/general_error.h" -#include "kvdb_observer_proxy.h" -#include "log_print.h" -#include "types.h" -#include "utils/anonymous.h" - namespace OHOS::DistributedKv { using namespace DistributedData; using Error = DistributedData::GeneralError; diff --git a/services/distributeddataservice/service/kvdb/kvdb_watcher.h b/services/distributeddataservice/service/kvdb/kvdb_watcher.h index 301bcc6b4..d02292687 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_watcher.h +++ b/services/distributeddataservice/service/kvdb/kvdb_watcher.h @@ -15,11 +15,8 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_WATCHER_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_WATCHER_H -#include -#include #include "kvdb_observer_proxy.h" -#include "kv_store_changed_data.h" #include "store/general_value.h" #include "store/general_watcher.h" diff --git a/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h b/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h index 4f4fc19d2..c609ce668 100644 --- a/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h +++ b/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h @@ -16,10 +16,6 @@ #ifndef KVSTORE_SYNC_MANAGER_H #define KVSTORE_SYNC_MANAGER_H -#include -#include -#include - #include "executor_pool.h" #include "kv_store_nb_delegate.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/query_helper.cpp b/services/distributeddataservice/service/kvdb/query_helper.cpp index c1bd2d6c0..b32e7dba3 100644 --- a/services/distributeddataservice/service/kvdb/query_helper.cpp +++ b/services/distributeddataservice/service/kvdb/query_helper.cpp @@ -15,12 +15,9 @@ #define LOG_TAG "QueryHelper" #include "query_helper.h" #include -#include #include "data_query.h" #include "device_manager_adapter.h" -#include "kvstore_utils.h" #include "log_print.h" -#include "types.h" #include "utils/anonymous.h" namespace OHOS::DistributedKv { constexpr int QUERY_SKIP_SIZE = 1; diff --git a/services/distributeddataservice/service/kvdb/query_helper.h b/services/distributeddataservice/service/kvdb/query_helper.h index 227f7a67a..05418a0a6 100644 --- a/services/distributeddataservice/service/kvdb/query_helper.h +++ b/services/distributeddataservice/service/kvdb/query_helper.h @@ -16,8 +16,6 @@ #ifndef QUERY_HELPER_H #define QUERY_HELPER_H -#include - #include "query.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/upgrade.cpp b/services/distributeddataservice/service/kvdb/upgrade.cpp index 7040dfb88..6d523c657 100644 --- a/services/distributeddataservice/service/kvdb/upgrade.cpp +++ b/services/distributeddataservice/service/kvdb/upgrade.cpp @@ -15,16 +15,11 @@ #define LOG_TAG "Upgrade" #include "upgrade.h" -#include -#include - #include "accesstoken_kit.h" #include "device_manager_adapter.h" #include "directory/directory_manager.h" #include "kvdb_general_store.h" #include "log_print.h" -#include "metadata/meta_data_manager.h" -#include "metadata/secret_key_meta_data.h" #include "utils/anonymous.h" namespace OHOS::DistributedKv { using namespace OHOS::DistributedData; diff --git a/services/distributeddataservice/service/kvdb/upgrade.h b/services/distributeddataservice/service/kvdb/upgrade.h index 62458e235..d9b18c101 100644 --- a/services/distributeddataservice/service/kvdb/upgrade.h +++ b/services/distributeddataservice/service/kvdb/upgrade.h @@ -15,12 +15,9 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_UPGRADE_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_UPGRADE_H -#include -#include #include "concurrent_map.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" #include "metadata/store_meta_data.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/user_delegate.cpp b/services/distributeddataservice/service/kvdb/user_delegate.cpp index 222cfef5b..61ced3cda 100644 --- a/services/distributeddataservice/service/kvdb/user_delegate.cpp +++ b/services/distributeddataservice/service/kvdb/user_delegate.cpp @@ -16,9 +16,7 @@ #define LOG_TAG "UserDelegate" #include "user_delegate.h" -#include #include -#include #include "device_manager_adapter.h" #include "log_print.h" diff --git a/services/distributeddataservice/service/kvdb/user_delegate.h b/services/distributeddataservice/service/kvdb/user_delegate.h index 497d16f29..ccb9a7add 100644 --- a/services/distributeddataservice/service/kvdb/user_delegate.h +++ b/services/distributeddataservice/service/kvdb/user_delegate.h @@ -16,14 +16,9 @@ #ifndef DISTRIBUTEDDATAMGR_USER_DELEGATE_H #define DISTRIBUTEDDATAMGR_USER_DELEGATE_H -#include -#include - #include "account/account_delegate.h" #include "concurrent_map.h" -#include "executor_pool.h" #include "metadata/user_meta_data.h" -#include "visibility.h" namespace OHOS::DistributedData { using AccountDelegate = DistributedData::AccountDelegate; -- Gitee From 4df8c15c5100f721dad17436f51cfbd8955c11c0 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 14:34:43 +0800 Subject: [PATCH 2/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/BUILD.gn | 3 +-- services/distributeddataservice/app/src/checker/BUILD.gn | 1 - services/distributeddataservice/service/kvdb/BUILD.gn | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index d676ea9d9..46605b525 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +Redundant code modifications# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -147,7 +147,6 @@ ohos_shared_library("distributeddataservice") { "hitrace:libhitracechain", "ipc:ipc_core", "cJSON:cjson", - "kv_store:datamgr_common", "kv_store:distributeddata_mgr", "kv_store:distributeddb", "memmgr:memmgrclient", diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index f0fa8dd25..c351d81b6 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -49,7 +49,6 @@ ohos_source_set("distributeddata_checker") { "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", - "kv_store:datamgr_common", "samgr:samgr_proxy", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index 011ace89b..ec3cfb51f 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -67,19 +67,12 @@ ohos_source_set("distributeddata_kvdb") { deps = [ "${data_service_path}/service/backup:distributeddata_backup", - "${data_service_path}/service/rdb:distributeddata_rdb", ] external_deps = [ - "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "c_utils:utils", "device_manager:devicemanagersdk", - "hilog:libhilog", "hisysevent:libhisysevent", - "ipc:ipc_core", - "cJSON:cjson", - "kv_store:datamgr_common", "kv_store:distributeddb", "kv_store:kvdb_inner_lite", ] -- Gitee From 769af66d74dc95a50776c0c626188f7effdc4b5b Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 14:36:20 +0800 Subject: [PATCH 3/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 46605b525..74515be4b 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -1,4 +1,4 @@ -Redundant code modifications# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -- Gitee From 9d23ae3f679042a0799a4fc0e6c38150cdfd2f8f Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 15:07:49 +0800 Subject: [PATCH 4/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/src/checker/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index c351d81b6..f0fa8dd25 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -49,6 +49,7 @@ ohos_source_set("distributeddata_checker") { "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", + "kv_store:datamgr_common", "samgr:samgr_proxy", ] subsystem_name = "distributeddatamgr" -- Gitee From a6228c5eab1f022b8def17690d62520387556513 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 17:00:20 +0800 Subject: [PATCH 5/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/BUILD.gn | 1 + services/distributeddataservice/service/kvdb/BUILD.gn | 2 ++ 2 files changed, 3 insertions(+) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 74515be4b..d676ea9d9 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -147,6 +147,7 @@ ohos_shared_library("distributeddataservice") { "hitrace:libhitracechain", "ipc:ipc_core", "cJSON:cjson", + "kv_store:datamgr_common", "kv_store:distributeddata_mgr", "kv_store:distributeddb", "memmgr:memmgrclient", diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index ec3cfb51f..e3daf5773 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -67,12 +67,14 @@ ohos_source_set("distributeddata_kvdb") { deps = [ "${data_service_path}/service/backup:distributeddata_backup", + "${data_service_path}/service/rdb:distributeddata_rdb", ] external_deps = [ "access_token:libtokenid_sdk", "device_manager:devicemanagersdk", "hisysevent:libhisysevent", + "kv_store:datamgr_common", "kv_store:distributeddb", "kv_store:kvdb_inner_lite", ] -- Gitee From 043b76875a3af25bab6c91c412291e7f31dd0278 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Thu, 26 Jun 2025 20:31:10 +0800 Subject: [PATCH 6/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/src/kvstore_meta_manager.h | 1 + services/distributeddataservice/service/kvdb/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h index dac381d7e..843b33256 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.h +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h @@ -15,6 +15,7 @@ #ifndef KVSTORE_META_MANAGER_H #define KVSTORE_META_MANAGER_H +#include "app_device_change_listener.h" #include "kv_store_delegate_manager.h" #include "safe_block_queue.h" #include "system_ability.h" diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index e3daf5773..a8383173e 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -73,6 +73,7 @@ ohos_source_set("distributeddata_kvdb") { external_deps = [ "access_token:libtokenid_sdk", "device_manager:devicemanagersdk", + "hilog:libhilog", "hisysevent:libhisysevent", "kv_store:datamgr_common", "kv_store:distributeddb", -- Gitee From cfdf2689e5874c6acf86627f268b5a92309fbdf6 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Fri, 27 Jun 2025 09:33:42 +0800 Subject: [PATCH 7/8] code fix Signed-off-by: z30053452 --- .../distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp | 2 -- .../distributeddataservice/service/kvdb/kvdb_notifier_proxy.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp index ce558c677..f56754241 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp @@ -20,8 +20,6 @@ #include "distributeddata_kvdb_ipc_interface_code.h" #include "itypes_util.h" #include "log_print.h" -#include "message_parcel.h" -#include "message_option.h" #include "utils/anonymous.h" namespace OHOS { diff --git a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h index 671014164..9764f994b 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h +++ b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h @@ -17,8 +17,6 @@ #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_NOTIFIER_PROXY_H #include "ikvdb_notifier.h" -#include "iremote_broker.h" -#include "iremote_proxy.h" namespace OHOS { namespace DistributedKv { -- Gitee From 809d09bc36a066c852d08932373a31e44913e935 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Fri, 27 Jun 2025 16:37:30 +0800 Subject: [PATCH 8/8] code fix Signed-off-by: z30053452 --- services/distributeddataservice/service/kvdb/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index a8383173e..5e433ec9f 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -75,6 +75,7 @@ ohos_source_set("distributeddata_kvdb") { "device_manager:devicemanagersdk", "hilog:libhilog", "hisysevent:libhisysevent", + "ipc:ipc_core", "kv_store:datamgr_common", "kv_store:distributeddb", "kv_store:kvdb_inner_lite", -- Gitee