diff --git a/services/distributeddataservice/libs/distributeddb/BUILD.gn b/services/distributeddataservice/libs/distributeddb/BUILD.gn old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/auto_launch.h b/services/distributeddataservice/libs/distributeddb/common/include/auto_launch.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/db_common.h b/services/distributeddataservice/libs/distributeddb/common/include/db_common.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/db_constant.h b/services/distributeddataservice/libs/distributeddb/common/include/db_constant.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/db_errno.h b/services/distributeddataservice/libs/distributeddb/common/include/db_errno.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/db_types.h b/services/distributeddataservice/libs/distributeddb/common/include/db_types.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/endian_convert.h b/services/distributeddataservice/libs/distributeddb/common/include/endian_convert.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/hash.h b/services/distributeddataservice/libs/distributeddb/common/include/hash.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/json_object.h b/services/distributeddataservice/libs/distributeddb/common/include/json_object.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/macro_utils.h b/services/distributeddataservice/libs/distributeddb/common/include/macro_utils.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/notification_chain.h b/services/distributeddataservice/libs/distributeddb/common/include/notification_chain.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/param_check_utils.h b/services/distributeddataservice/libs/distributeddb/common/include/param_check_utils.h old mode 100755 new mode 100644 index 2c522e9cb103f226e9d3ed3988dcbff3961cfe08..a5927a266225456da0c9b44ab59d0a6a7c0d9396 --- a/services/distributeddataservice/libs/distributeddb/common/include/param_check_utils.h +++ b/services/distributeddataservice/libs/distributeddb/common/include/param_check_utils.h @@ -47,7 +47,7 @@ public: static bool IsS3SECEOpt(const SecurityOption &secOpt); static int CheckAndTransferAutoLaunchParam(const AutoLaunchParam ¶m, - SchemaObject &schemaObject, std::string &canonicalDir); + SchemaObject &schemaObject); static uint8_t GetValidCompressionRate(uint8_t compressionRate); diff --git a/services/distributeddataservice/libs/distributeddb/common/include/parcel.h b/services/distributeddataservice/libs/distributeddb/common/include/parcel.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/platform_specific.h b/services/distributeddataservice/libs/distributeddb/common/include/platform_specific.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/res_finalizer.h b/services/distributeddataservice/libs/distributeddb/common/include/res_finalizer.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/runtime_context.h b/services/distributeddataservice/libs/distributeddb/common/include/runtime_context.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/schema_object.h b/services/distributeddataservice/libs/distributeddb/common/include/schema_object.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/schema_utils.h b/services/distributeddataservice/libs/distributeddb/common/include/schema_utils.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/value_hash_calc.h b/services/distributeddataservice/libs/distributeddb/common/include/value_hash_calc.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/value_object.h b/services/distributeddataservice/libs/distributeddb/common/include/value_object.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/include/version.h b/services/distributeddataservice/libs/distributeddb/common/include/version.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/auto_launch.cpp b/services/distributeddataservice/libs/distributeddb/common/src/auto_launch.cpp old mode 100755 new mode 100644 index 7b4440fa0dc4160d3f7e93f45c0d40d13ee763df..2ef7cd1ab4ee1c6e108eb344ef47c1b893b6231a --- a/services/distributeddataservice/libs/distributeddb/common/src/auto_launch.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/auto_launch.cpp @@ -1005,8 +1005,7 @@ int AutoLaunch::GetAutoLaunchKVProperties(const AutoLaunchParam ¶m, const std::shared_ptr &propertiesPtr) { SchemaObject schemaObject; - std::string canonicalDir; - int errCode = ParamCheckUtils::CheckAndTransferAutoLaunchParam(param, schemaObject, canonicalDir); + int errCode = ParamCheckUtils::CheckAndTransferAutoLaunchParam(param, schemaObject); if (errCode != E_OK) { return errCode; } @@ -1014,7 +1013,7 @@ int AutoLaunch::GetAutoLaunchKVProperties(const AutoLaunchParam ¶m, if (param.option.isEncryptedDb) { propertiesPtr->SetPassword(param.option.cipher, param.option.passwd); } - propertiesPtr->SetStringProp(KvDBProperties::DATA_DIR, canonicalDir); + propertiesPtr->SetStringProp(KvDBProperties::DATA_DIR, param.option.dataDir); propertiesPtr->SetBoolProp(KvDBProperties::CREATE_IF_NECESSARY, param.option.createIfNecessary); propertiesPtr->SetBoolProp(KvDBProperties::CREATE_DIR_BY_STORE_ID_ONLY, param.option.createDirByStoreIdOnly); propertiesPtr->SetBoolProp(KvDBProperties::MEMORY_MODE, false); @@ -1081,6 +1080,14 @@ int AutoLaunch::OpenKvConnection(AutoLaunchItem &autoLaunchItem) std::shared_ptr properties = std::static_pointer_cast(autoLaunchItem.propertiesPtr); int errCode = E_OK; + std::string canonicalDir; + std::string dataDir; + properties->GetStringProp(KvDBProperties::DATA_DIR, dataDir); + if (!ParamCheckUtils::CheckDataDir(dataDir, canonicalDir)) { + LOGE("[AutoLaunch] CheckDataDir is invalid Auto Launch failed."); + return -E_INVALID_ARGS; + } + properties->SetStringProp(KvDBProperties::DATA_DIR, canonicalDir); IKvDBConnection *conn = KvDBManager::GetDatabaseConnection(*properties, errCode, false); if (errCode == -E_ALREADY_OPENED) { LOGI("[AutoLaunch] GetOneConnection user already getkvstore by self"); diff --git a/services/distributeddataservice/libs/distributeddb/common/src/db_common.cpp b/services/distributeddataservice/libs/distributeddb/common/src/db_common.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/db_constant.cpp b/services/distributeddataservice/libs/distributeddb/common/src/db_constant.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/event_fd.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/event_fd.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/ievent.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/ievent.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/ievent_loop.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/include/ievent_loop.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_impl.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_impl.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_epoll.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_epoll.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_epoll.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_epoll.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_impl.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_impl.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.cpp old mode 100755 new mode 100644 index 21b0a7301d7444718c56e7b1d0ccf50cfe5c4a0d..a9ba7c3119ad0bccdd52c3abaa8e22e780990bb3 --- a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.cpp @@ -36,6 +36,7 @@ int EventLoopSelect::Initialize() int EventLoopSelect::Prepare(const std::set &polling) { + (void)polling; return E_OK; } @@ -56,21 +57,27 @@ int EventLoopSelect::WakeUp() int EventLoopSelect::Exit(const std::set &polling) { + (void)polling; return E_OK; } int EventLoopSelect::AddEvent(EventImpl *event) { + (void)event; return E_OK; } int EventLoopSelect::RemoveEvent(EventImpl *event) { + (void)event; return E_OK; } int EventLoopSelect::ModifyEvent(EventImpl *event, bool isAdd, EventsMask events) { + (void)event; + (void)isAdd; + (void)events; return E_OK; } diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.h b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/event_loop_select.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/ievent.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/ievent.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/ievent_loop.cpp b/services/distributeddataservice/libs/distributeddb/common/src/evloop/src/ievent_loop.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/flatbuffer_schema.cpp b/services/distributeddataservice/libs/distributeddb/common/src/flatbuffer_schema.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/hash.cpp b/services/distributeddataservice/libs/distributeddb/common/src/hash.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp b/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp old mode 100755 new mode 100644 index 9cfd5b8db4e1c6350a7c42cf3bb98203f4f57f9d..53b53e0eac4e5a65fed67bcd170640804688ac4a --- a/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp @@ -786,16 +786,22 @@ int JsonObject::GetStringArrayByFieldPath(const FieldPath &inPath, std::vector &inData) { + (void)inData; LOGW("[Json][Parse] Json Omit From Compile."); return -E_NOT_PERMIT; } int JsonObject::Parse(const uint8_t *dataBegin, const uint8_t *dataEnd) { + (void)dataBegin; + (void)dataEnd; LOGW("[Json][Parse] Json Omit From Compile."); return -E_NOT_PERMIT; } @@ -833,68 +843,94 @@ std::string JsonObject::ToString() const bool JsonObject::IsFieldPathExist(const FieldPath &inPath) const { + (void)inPath; return false; } int JsonObject::GetFieldTypeByFieldPath(const FieldPath &inPath, FieldType &outType) const { + (void)inPath; + (void)outType; return -E_NOT_PERMIT; } int JsonObject::GetFieldValueByFieldPath(const FieldPath &inPath, FieldValue &outValue) const { + (void)inPath; + (void)outValue; return -E_NOT_PERMIT; } int JsonObject::GetSubFieldPath(const FieldPath &inPath, std::set &outSubPath) const { + (void)inPath; + (void)outSubPath; return -E_NOT_PERMIT; } int JsonObject::GetSubFieldPath(const std::set &inPath, std::set &outSubPath) const { + (void)inPath; + (void)outSubPath; return -E_NOT_PERMIT; } int JsonObject::GetSubFieldPathAndType(const FieldPath &inPath, std::map &outSubPathType) const { + (void)inPath; + (void)outSubPathType; return -E_NOT_PERMIT; } int JsonObject::GetSubFieldPathAndType(const std::set &inPath, std::map &outSubPathType) const { + (void)inPath; + (void)outSubPathType; return -E_NOT_PERMIT; } int JsonObject::GetArraySize(const FieldPath &inPath, uint32_t &outSize) const { + (void)inPath; + (void)outSize; return -E_NOT_PERMIT; } int JsonObject::GetArrayContentOfStringOrStringArray(const FieldPath &inPath, std::vector> &outContent) const { + (void)inPath; + (void)outContent; return -E_NOT_PERMIT; } int JsonObject::InsertField(const FieldPath &inPath, FieldType inType, const FieldValue &inValue) { + (void)inPath; + (void)inType; + (void)inValue; return -E_NOT_PERMIT; } int JsonObject::InsertField(const FieldPath &inPath, const JsonObject &inValue, bool isAppend = false) { + (void)inPath; + (void)inValue; + (void)isAppend; return -E_NOT_PERMIT; } int JsonObject::DeleteField(const FieldPath &inPath) { + (void)inPath; return -E_NOT_PERMIT; } int JsonObject::GetArrayValueByFieldPath(const FieldPath &inPath, JsonObject &outArray) const { + (void)inPath; + (void)outArray; return -E_NOT_PERMIT; } #endif // OMIT_JSON diff --git a/services/distributeddataservice/libs/distributeddb/common/src/lock_status_observer.cpp b/services/distributeddataservice/libs/distributeddb/common/src/lock_status_observer.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/lock_status_observer.h b/services/distributeddataservice/libs/distributeddb/common/src/lock_status_observer.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/log_print.cpp b/services/distributeddataservice/libs/distributeddb/common/src/log_print.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/notification_chain.cpp b/services/distributeddataservice/libs/distributeddb/common/src/notification_chain.cpp old mode 100755 new mode 100644 index 8db202781cf2bce26c7a4d9751db6a6a37499f2d..4b7daea5f425dff783deaf42f27804722629680d --- a/services/distributeddataservice/libs/distributeddb/common/src/notification_chain.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/notification_chain.cpp @@ -273,7 +273,7 @@ void NotificationChain::Listener::KillWait() return; } - LOGW("[NotificationChain] Try to kill a active event listener, now wait."); + LOGW("[NotificationChain] Try to kill an active event listener, now wait."); bool noDeadLock = WaitLockedUntil(safeKill_, [this]() { if (eventRunningThread_ == std::thread::id()) { return true; diff --git a/services/distributeddataservice/libs/distributeddb/common/src/param_check_utils.cpp b/services/distributeddataservice/libs/distributeddb/common/src/param_check_utils.cpp old mode 100755 new mode 100644 index e9ad559b0cb222cbc927461ae24e849a6008c338..098735fefcd5b66a3af325b7462b54be853f149f --- a/services/distributeddataservice/libs/distributeddb/common/src/param_check_utils.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/param_check_utils.cpp @@ -146,7 +146,7 @@ bool ParamCheckUtils::IsS3SECEOpt(const SecurityOption &secOpt) } int ParamCheckUtils::CheckAndTransferAutoLaunchParam(const AutoLaunchParam ¶m, - SchemaObject &schemaObject, std::string &canonicalDir) + SchemaObject &schemaObject) { if ((param.option.notifier && !ParamCheckUtils::CheckConflictNotifierType(param.option.conflictType)) || (!param.option.notifier && param.option.conflictType != 0)) { @@ -178,11 +178,6 @@ int ParamCheckUtils::CheckAndTransferAutoLaunchParam(const AutoLaunchParam ¶ return -E_INVALID_SCHEMA; } } - - if (!ParamCheckUtils::CheckDataDir(param.option.dataDir, canonicalDir)) { - LOGE("[AutoLaunch] CheckDataDir is invalid."); - return -E_INVALID_ARGS; - } return E_OK; } diff --git a/services/distributeddataservice/libs/distributeddb/common/src/parcel.cpp b/services/distributeddataservice/libs/distributeddb/common/src/parcel.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/performance_analysis.cpp b/services/distributeddataservice/libs/distributeddb/common/src/performance_analysis.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/platform_specific.cpp b/services/distributeddataservice/libs/distributeddb/common/src/platform_specific.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/query.cpp b/services/distributeddataservice/libs/distributeddb/common/src/query.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/query_expression.cpp b/services/distributeddataservice/libs/distributeddb/common/src/query_expression.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/ref_object.cpp b/services/distributeddataservice/libs/distributeddb/common/src/ref_object.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/runtime_context.cpp b/services/distributeddataservice/libs/distributeddb/common/src/runtime_context.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/runtime_context_impl.cpp b/services/distributeddataservice/libs/distributeddb/common/src/runtime_context_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/runtime_context_impl.h b/services/distributeddataservice/libs/distributeddb/common/src/runtime_context_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/schema_object.cpp b/services/distributeddataservice/libs/distributeddb/common/src/schema_object.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/schema_utils.cpp b/services/distributeddataservice/libs/distributeddb/common/src/schema_utils.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/task_pool.cpp b/services/distributeddataservice/libs/distributeddb/common/src/task_pool.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/task_pool_impl.cpp b/services/distributeddataservice/libs/distributeddb/common/src/task_pool_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/task_queue.cpp b/services/distributeddataservice/libs/distributeddb/common/src/task_queue.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/task_queue.h b/services/distributeddataservice/libs/distributeddb/common/src/task_queue.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/time_tick_monitor.cpp b/services/distributeddataservice/libs/distributeddb/common/src/time_tick_monitor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/time_tick_monitor.h b/services/distributeddataservice/libs/distributeddb/common/src/time_tick_monitor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/types_export.cpp b/services/distributeddataservice/libs/distributeddb/common/src/types_export.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/common/src/value_object.cpp b/services/distributeddataservice/libs/distributeddb/common/src/value_object.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/communicator_type_define.h b/services/distributeddataservice/libs/distributeddb/communicator/include/communicator_type_define.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/frame_combiner.h b/services/distributeddataservice/libs/distributeddb/communicator/include/frame_combiner.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/frame_retainer.h b/services/distributeddataservice/libs/distributeddb/communicator/include/frame_retainer.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/message.h b/services/distributeddataservice/libs/distributeddb/communicator/include/message.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/message_transform.h b/services/distributeddataservice/libs/distributeddb/communicator/include/message_transform.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/parse_result.h b/services/distributeddataservice/libs/distributeddb/communicator/include/parse_result.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/include/send_task_scheduler.h b/services/distributeddataservice/libs/distributeddb/communicator/include/send_task_scheduler.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/combine_status.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/combine_status.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/communicator.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/communicator.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_aggregator.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_aggregator.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_linker.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_linker.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_linker.h b/services/distributeddataservice/libs/distributeddb/communicator/src/communicator_linker.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/frame_combiner.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/frame_combiner.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/frame_retainer.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/frame_retainer.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/header_converter.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/header_converter.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/message_transform.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/message_transform.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/network_adapter.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/network_adapter.cpp old mode 100755 new mode 100644 index 7862b8cdc4c771cac22543c602e7b9315e2f9dbc..964676f36fdaab3c5850bf89a44b0b031a81c139 --- a/services/distributeddataservice/libs/distributeddb/communicator/src/network_adapter.cpp +++ b/services/distributeddataservice/libs/distributeddb/communicator/src/network_adapter.cpp @@ -209,7 +209,7 @@ int NetworkAdapter::SendBytes(const std::string &dstTarget, const uint8_t *bytes if (bytes == nullptr || length == 0) { return -E_INVALID_ARGS; } - LOGI("[NAdapt][SendBytes] Enter, to=%s{private}, length=%d", dstTarget.c_str(), length); + LOGI("[NAdapt][SendBytes] Enter, to=%s{private}, length=%u", dstTarget.c_str(), length); DeviceInfos dstDevInfo; dstDevInfo.identifier = dstTarget; DBStatus errCode = processCommunicator_->SendData(dstDevInfo, bytes, length); diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/protocol_proto.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/protocol_proto.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/send_task_scheduler.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/send_task_scheduler.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/communicator/src/serial_buffer.cpp b/services/distributeddataservice/libs/distributeddb/communicator/src/serial_buffer.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/include/auto_launch_export.h b/services/distributeddataservice/libs/distributeddb/include/auto_launch_export.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/include/query.h b/services/distributeddataservice/libs/distributeddb/include/query.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/include/query_expression.h b/services/distributeddataservice/libs/distributeddb/include/query_expression.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/include/types_export.h b/services/distributeddataservice/libs/distributeddb/include/types_export.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/iprocess_communicator.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/iprocess_communicator.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/iprocess_system_api_adapter.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/iprocess_system_api_adapter.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_delegate.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_delegate.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_delegate_manager.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_delegate_manager.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_snapshot_delegate.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/kv_store_snapshot_delegate.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/include/store_types.h b/services/distributeddataservice/libs/distributeddb/interfaces/include/store_types.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_changed_data_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_changed_data_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_impl.h b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_errno.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_errno.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_conflict_data_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_conflict_data_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_result_set_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_result_set_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_snapshot_delegate_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_snapshot_delegate_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_snapshot_delegate_impl.h b/services/distributeddataservice/libs/distributeddb/interfaces/src/kv_store_snapshot_delegate_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp index cc526ccd9d5ced5c1b3cc6936023bc0d4115c702..2d44ee6c7057aa3251ebfa873171973f4913771a 100644 --- a/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp +++ b/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp @@ -90,7 +90,7 @@ DBStatus RelationalStoreDelegateImpl::RemoveDeviceData(const std::string &device if (device.empty() || device.length() > DBConstant::MAX_DEV_LENGTH || !ParamCheckUtils::CheckRelationalTableName(tableName)) { - LOGE("[RelationalStore Delegate] Remove device data with invald device name or table name."); + LOGE("[RelationalStore Delegate] Remove device data with invalid device name or table name."); return INVALID_ARGS; } diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_connection.h b/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_connection.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_factory.h b/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_factory.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_result_set.h b/services/distributeddataservice/libs/distributeddb/storage/include/ikvdb_result_set.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_manager.h b/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_manager.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_pragma.h b/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_pragma.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_properties.h b/services/distributeddataservice/libs/distributeddb/storage/include/kvdb_properties.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/multi_ver_kvdb_sync_interface.h b/services/distributeddataservice/libs/distributeddb/storage/include/multi_ver_kvdb_sync_interface.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/multi_ver_vacuum.h b/services/distributeddataservice/libs/distributeddb/storage/include/multi_ver_vacuum.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/single_ver_kvdb_sync_interface.h b/services/distributeddataservice/libs/distributeddb/storage/include/single_ver_kvdb_sync_interface.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/include/storage_engine_manager.h b/services/distributeddataservice/libs/distributeddb/storage/include/storage_engine_manager.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/data_transformer.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/data_transformer.cpp index 8e05736e947924799e0d27959ae6c76f4151f0cd..a019cbda930a9440ac411e103138c12b558a1cba 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/data_transformer.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/data_transformer.cpp @@ -79,7 +79,8 @@ int DataTransformer::SerializeDataItem(const RowDataWithLog &data, int DataTransformer::DeSerializeDataItem(const DataItem &dataItem, OptRowDataWithLog &data, const std::vector &remoteFieldInfo) { - if ((dataItem.flag & DataItem::DELETE_FLAG) == 0) { + if ((dataItem.flag & DataItem::DELETE_FLAG) == 0 && + (dataItem.flag & DataItem::REMOTE_DEVICE_DATA_MISS_QUERY) == 0) { int errCode = DeSerializeValue(dataItem.value, data.optionalData, remoteFieldInfo); if (errCode != E_OK) { return errCode; diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/default_factory.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/default_factory.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/default_factory.h b/services/distributeddataservice/libs/distributeddb/storage/src/default_factory.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb.h b/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb_connection.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb_connection.h b/services/distributeddataservice/libs/distributeddb/storage/src/generic_kvdb_connection.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/generic_single_ver_kv_entry.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/generic_single_ver_kv_entry.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/ikvdb_factory.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/ikvdb_factory.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_commit_notify_filterable_data.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_commit_notify_filterable_data.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_commit_notify_filterable_data.h b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_commit_notify_filterable_data.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_manager.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_manager.cpp old mode 100755 new mode 100644 index 0814b865d96366f2e86e7aaef593d5fe3645fe33..b6b589db49d6b190e9c2b3454c2d6b6668b1a101 --- a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_manager.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_manager.cpp @@ -566,7 +566,7 @@ int KvDBManager::RemoveDatabase(const KvDBProperties &properties) if (errCode != E_OK) { LOGE("[KvDBManager] Remove database failed:%d", errCode); } - int err = KvDBManager::UnlockDB(properties); // unlock and delete lock file befor delete dir + int err = KvDBManager::UnlockDB(properties); // unlock and delete lock file before delete dir if (err != E_OK) { LOGE("[KvDBManager][RemoveDatabase] UnlockDB failed:%d, errno:%d", err, errno); errCode = err; diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_observer_handle.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_observer_handle.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_properties.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_properties.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_utils.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_utils.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_windowed_result_set.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_windowed_result_set.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_windowed_result_set.h b/services/distributeddataservice/libs/distributeddb/storage/src/kvdb_windowed_result_set.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/generic_multi_ver_kv_entry.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/generic_multi_ver_kv_entry.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/generic_multi_ver_kv_entry.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/generic_multi_ver_kv_entry.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/ikvdb_multi_ver_data_storage.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/ikvdb_multi_ver_data_storage.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/ikvdb_multi_ver_transaction.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/ikvdb_multi_ver_transaction.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_commit.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_commit.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_commit.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_commit.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kv_entry.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kv_entry.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kvdata_storage.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kvdata_storage.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kvdata_storage.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_kvdata_storage.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.cpp old mode 100755 new mode 100644 index 5ab0f971c6aa00547151f115458b9aab1239c1aa..a492db363ed7d3b8acb50fb338744585017befd2 --- a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.cpp @@ -1184,11 +1184,13 @@ int MultiVerNaturalStore::GetVersionFilePath(const KvDBProperties &kvDBProp, std int MultiVerNaturalStore::DeleteMetaDataByPrefixKey(const Key &keyPrefix) const { + (void)keyPrefix; return -E_NOT_SUPPORT; } void MultiVerNaturalStore::SetDataInterceptor(const PushDataInterceptor &interceptor) { + (void)interceptor; return; } diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_notify_data.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_notify_data.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_notify_data.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_notify_data.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_storage.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_storage.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_storage.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_commit_storage.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_snapshot.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_snapshot.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_snapshot.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_snapshot.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_transfer_data.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_transfer_data.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_transfer_data.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_transfer_data.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_engine.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_engine.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.cpp old mode 100755 new mode 100644 index 048c953e8e943bb2ddabb9052b8f4f9c47fdbe51..6f52d8e3024075184084f6391d5e096cf789485e --- a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.cpp @@ -1489,11 +1489,14 @@ int MultiVerStorageExecutor::DeleteEntriesByHashKey(Version version, const Key & int MultiVerStorageExecutor::UpdateTrimedFlag(Version version, const Key &hashKey) { + (void)version; + (void)hashKey; return E_OK; } int MultiVerStorageExecutor::UpdateTrimedFlag(const CommitID &commit) { + (void)commit; return E_OK; } } // namespace DistributedDB diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_storage_executor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum_executor_impl.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum_executor_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum_executor_impl.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_vacuum_executor_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_value_object.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_value_object.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_value_object.h b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_value_object.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/database_oper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/operation/database_oper.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/database_oper.h b/services/distributeddataservice/libs/distributeddb/storage/src/operation/database_oper.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/local_database_oper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/operation/local_database_oper.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/local_database_oper.h b/services/distributeddataservice/libs/distributeddb/storage/src/operation/local_database_oper.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.h b/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/single_ver_database_oper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/operation/single_ver_database_oper.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/single_ver_database_oper.h b/services/distributeddataservice/libs/distributeddb/storage/src/operation/single_ver_database_oper.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/package_file.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/package_file.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/package_file.h b/services/distributeddataservice/libs/distributeddb/storage/src/package_file.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/relational_sync_able_storage.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/relational_sync_able_storage.cpp index ad35b65043c67d122dbb17033c677677afc610cd..419b4afed9576f10774e4494b61b3173ea71f130 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/relational_sync_able_storage.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/relational_sync_able_storage.cpp @@ -397,7 +397,7 @@ int RelationalSyncAbleStorage::SaveSyncDataItems(const QueryObject &object, std: storageEngine_->GetSchemaRef().GetTable(object.GetTableName()), maxTimestamp); if (errCode == E_OK) { (void)SetMaxTimeStamp(maxTimestamp); - // dataItems size > 0 now because already check befor + // dataItems size > 0 now because already check before // all dataItems will write into db now, so need to observer notify here // if some dataItems will not write into db in the future, observer notify here need change TriggerObserverAction(deviceName); diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/result_entries_window.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/result_entries_window.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/single_ver_natural_store_commit_notify_data.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/single_ver_natural_store_commit_notify_data.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/single_ver_natural_store_commit_notify_data.h b/services/distributeddataservice/libs/distributeddb/storage/src/single_ver_natural_store_commit_notify_data.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/query_object.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/query_object.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/query_object.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/query_object.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_import.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_import.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb_connection.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb_snapshot.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_kvdb_snapshot.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_engine.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_executor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_executor.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_local_storage_executor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.cpp old mode 100755 new mode 100644 index 762b4ab4badf1ee93f5e03421acd4889eccf8671..568ea7a6d12191fbead2dbe97ec310b5391ba16a --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.cpp @@ -233,6 +233,7 @@ int SQLiteMultiVerDataStorage::RollbackWrite(IKvDBMultiVerTransaction *transacti void SQLiteMultiVerDataStorage::CommitWritePhaseTwo(IKvDBMultiVerTransaction *transaction) { // just change the head version? + (void)transaction; } // Get one start transaction. diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_data_storage.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_transaction.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_transaction.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_transaction.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_multi_ver_transaction.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.cpp index 5b19ce55d9ea1416d5d5502b402c13f2c3674dd9..49dd55f1bc084559e3d30d773c1639fb63a35669 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.cpp @@ -351,6 +351,13 @@ int SqliteQueryHelper::BindSyncDataCheckStmt(sqlite3_stmt *statement, const Key } index += 2; // prefixKey takes 2 position } + + errCode = BindKeysToStmt(keys_, statement, index); + if (errCode != E_OK) { + SQLiteUtils::ResetStatement(statement, true, errCode); + return errCode; + } + for (const QueryObjNode &objNode : queryObjNodes_) { errCode = BindFieldValue(statement, objNode, index); if (errCode != E_OK) { @@ -1042,7 +1049,7 @@ std::string SqliteQueryHelper::MapKeysInToSql(size_t keysNum) const return resultSql; } -int SqliteQueryHelper::BindKeysToStmt(std::set &keys, sqlite3_stmt *&statement, int &index) const +int SqliteQueryHelper::BindKeysToStmt(const std::set &keys, sqlite3_stmt *&statement, int &index) const { if (!keys_.empty()) { int errCode = E_OK; diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.h index fbfcc9820c83f662298f1cb16518967256cf9203..1d719b8c244e0648abb37a4395b5b0b8469f8653 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.h +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_query_helper.h @@ -121,7 +121,7 @@ private: int BindObjNodes(sqlite3_stmt *&statement, int &index) const; int GetSubscribeCondition(const std::string &accessStr, std::string &conditionStr); std::string MapKeysInToSql(size_t keysNum) const; - int BindKeysToStmt(std::set &keys, sqlite3_stmt *&countStmt, int &index) const; + int BindKeysToStmt(const std::set &keys, sqlite3_stmt *&countStmt, int &index) const; std::string MapKeysInSubCondition(const std::string &accessStr) const; // For InKeys. // Return the left string of symbol in compare clause. diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_forward_cursor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_forward_cursor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp old mode 100755 new mode 100644 index c1433fcb5c8d7a7c918f184e2adeed34704d21d9..7a75c080783077bb220d2e9ddeab92576d8cce7a --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp @@ -35,12 +35,6 @@ #include "value_hash_calc.h" namespace DistributedDB { -#define CHECK_STORAGE_ENGINE do { \ - if (storageEngine_ == nullptr) { \ - return -E_INVALID_DB; \ - } \ -} while (0) - namespace { constexpr int WAIT_DELEGATE_CALLBACK_TIME = 100; @@ -545,7 +539,9 @@ IKvDBSyncInterface *SQLiteSingleVerNaturalStore::GetSyncInterface() int SQLiteSingleVerNaturalStore::GetMetaData(const Key &key, Value &value) const { - CHECK_STORAGE_ENGINE; + if (storageEngine_ == nullptr) { + return -E_INVALID_DB; + } if (key.size() > DBConstant::MAX_KEY_SIZE) { return -E_INVALID_ARGS; } @@ -615,7 +611,9 @@ int SQLiteSingleVerNaturalStore::DeleteMetaData(const std::vector &keys) int SQLiteSingleVerNaturalStore::GetAllMetaKeys(std::vector &keys) const { - CHECK_STORAGE_ENGINE; + if (storageEngine_ == nullptr) { + return -E_INVALID_DB; + } int errCode = E_OK; SQLiteSingleVerStorageExecutor *handle = GetHandle(true, errCode); if (handle == nullptr) { @@ -1185,7 +1183,9 @@ int SQLiteSingleVerNaturalStore::SaveSyncDataItems(const QueryObject &query, std const DeviceInfo &deviceInfo, bool checkValueContent) { // Sync procedure does not care readOnly Flag - CHECK_STORAGE_ENGINE; + if (storageEngine_ == nullptr) { + return -E_INVALID_DB; + } int errCode = E_OK; for (const auto &item : dataItems) { // Check only the key and value size @@ -1384,7 +1384,9 @@ END: int SQLiteSingleVerNaturalStore::Export(const std::string &filePath, const CipherPassword &passwd) { - CHECK_STORAGE_ENGINE; + if (storageEngine_ == nullptr) { + return -E_INVALID_DB; + } if (MyProp().GetBoolProp(KvDBProperties::MEMORY_MODE, false)) { return -E_NOT_SUPPORT; } @@ -1422,7 +1424,9 @@ int SQLiteSingleVerNaturalStore::Export(const std::string &filePath, const Ciphe int SQLiteSingleVerNaturalStore::Import(const std::string &filePath, const CipherPassword &passwd) { - CHECK_STORAGE_ENGINE; + if (storageEngine_ == nullptr) { + return -E_INVALID_DB; + } if (MyProp().GetBoolProp(KvDBProperties::MEMORY_MODE, false)) { return -E_NOT_SUPPORT; } diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_schema_database_upgrader.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_schema_database_upgrader.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_schema_database_upgrader.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_schema_database_upgrader.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_sql.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_sql.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_engine.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_engine.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_executor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_executor.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_storage_executor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.cpp old mode 100755 new mode 100644 index 179a5db4397454f5119e7ff47262f3495983bd45..60f5911d15275ac5f15d2d2f4c465b49e0e0343f --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.cpp @@ -472,7 +472,6 @@ int SQLiteUtils::GetColumnBlobValue(sqlite3_stmt *statement, int index, std::vec int keySize = sqlite3_column_bytes(statement, index); auto keyRead = static_cast(sqlite3_column_blob(statement, index)); - if (keySize < 0) { LOGE("[SQLiteUtils][Column blob] size:%d", keySize); return -E_INVALID_DATA; @@ -852,11 +851,17 @@ int SQLiteUtils::Rekey(sqlite3 *db, const CipherPassword &passwd) int SQLiteUtils::ExportDatabase(sqlite3 *db, CipherType type, const CipherPassword &passwd, const std::string &newDbName) { + (void)db; + (void)type; + (void)passwd; + (void)newDbName; return -E_NOT_SUPPORT; } int SQLiteUtils::Rekey(sqlite3 *db, const CipherPassword &passwd) { + (void)db; + (void)passwd; return -E_NOT_SUPPORT; } #endif @@ -1040,6 +1045,11 @@ int SQLiteUtils::ExportDatabase(const std::string &srcFile, CipherType type, con int SQLiteUtils::ExportDatabase(const std::string &srcFile, CipherType type, const CipherPassword &srcPasswd, const std::string &targetFile, const CipherPassword &passwd) { + (void)srcFile; + (void)type; + (void)srcPasswd; + (void)targetFile; + (void)passwd; return -E_NOT_SUPPORT; } #endif diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.h b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_utils.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine.h b/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine_manager.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/storage_engine_manager.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/storage_executor.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/storage_executor.h b/services/distributeddataservice/libs/distributeddb/storage/src/storage_executor.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb.h b/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb_connection.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb_connection.h b/services/distributeddataservice/libs/distributeddb/storage/src/sync_able_kvdb_connection.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.h b/services/distributeddataservice/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h b/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h old mode 100755 new mode 100644 index fd3c3aba096e251d257f682e689bd7561a3dc1b7..131f43f5b11bead354860910c8e2be47e0cf24a7 --- a/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h @@ -1,3 +1,4 @@ + /* * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -60,7 +61,7 @@ public: const std::function &)> &onComplete, const std::function &onFinalize, bool wait) = 0; - // Sync function. use SyncParma to reduce paramter. + // Sync function. use SyncParma to reduce parameter. virtual int Sync(const SyncParma ¶m) = 0; // Remove the operation, with the given syncId, used to clean resource if sync finished or failed. @@ -76,7 +77,7 @@ public: // delete specified device's watermark virtual int EraseDeviceWaterMark(const std::string &deviceId, bool isNeedHash) = 0; - + // delete specified device's and table's watermark virtual int EraseDeviceWaterMark(const std::string &deviceId, bool isNeedHash, const std::string &tableName) = 0; diff --git a/services/distributeddataservice/libs/distributeddb/syncer/include/syncer_proxy.h b/services/distributeddataservice/libs/distributeddb/syncer/include/syncer_proxy.h old mode 100755 new mode 100644 index 7bf90555db5c885b95378d38bb76c35d296a29d5..caf30d763812b14ae264c9f52081879190e9c270 --- a/services/distributeddataservice/libs/distributeddb/syncer/include/syncer_proxy.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/include/syncer_proxy.h @@ -45,7 +45,7 @@ public: const std::function &)> &onComplete, const std::function &onFinalize, bool wait) override; - // Sync function. use SyncParma to reduce paramter. + // Sync function. use SyncParma to reduce parameter. int Sync(const SyncParma ¶m) override; // Remove the operation, with the given syncId, used to clean resource if sync finished or failed. diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.cpp old mode 100755 new mode 100644 index bce417a8eb1fc25c68978534d3d52aeae0998f3f..514a79354efaf2d1a85ecb2efca223fd77a26c2c --- a/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.cpp @@ -1010,7 +1010,7 @@ int AbilitySync::AckMsgCheck(const Message *message, ISyncTaskContext *context) } int ackCode = packet->GetAckCode(); if (ackCode != E_OK) { - LOGE("[AbilitySync][AckMsgCheck] received a errCode %d", ackCode); + LOGE("[AbilitySync][AckMsgCheck] received an errCode %d", ackCode); context->SetTaskErrCode(ackCode); return ackCode; } diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.h b/services/distributeddataservice/libs/distributeddb/syncer/src/ability_sync.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/commit_history_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/commit_history_sync.cpp old mode 100755 new mode 100644 index 7ea01a854486c2433af9ab6147e0970f19718655..325431dcf579442ef0356079469f90dd9125bc3f --- a/services/distributeddataservice/libs/distributeddb/syncer/src/commit_history_sync.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/commit_history_sync.cpp @@ -219,6 +219,8 @@ int CommitHistorySync::Initialize(MultiVerKvDBSyncInterface *storagePtr, ICommun void CommitHistorySync::TimeOutCallback(MultiVerSyncTaskContext *context, const Message *message) const { + (void)context; + (void)message; return; } diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/device_manager.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/device_manager.cpp old mode 100755 new mode 100644 index 50057c3ff99d5e41a4712e7879db5af79a834a56..a45011979975b054fb1c1ef405f5d78716925eb6 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/device_manager.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/device_manager.cpp @@ -115,7 +115,7 @@ int DeviceManager::SendBroadCast(uint32_t msgId) if (msgId == LOCAL_DATA_CHANGED) { return SendLocalDataChanged(); } - LOGE("[DeviceManager] invalid BroadCast msgId:%d", msgId); + LOGE("[DeviceManager] invalid BroadCast msgId:%u", msgId); return -E_INVALID_ARGS; } @@ -153,7 +153,7 @@ int DeviceManager::SendLocalDataChanged() bool DeviceManager::IsDeviceOnline(const std::string &deviceId) const { std::lock_guard lock(devicesLock_); - auto iter = std::find(devices_.begin(), devices_.end(), deviceId); + auto iter = std::find(devices_.begin(), devices_.end(), deviceId); return (iter != devices_.end()); } } // namespace DistributedDB \ No newline at end of file diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.cpp old mode 100755 new mode 100644 index 1b36af62c2fb2b45885f7407dfabec427353a46a..b91f2549feb21a72aab96a25f5018226496b3c92 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.cpp @@ -46,7 +46,8 @@ GenericSyncer::GenericSyncer() queuedManualSyncSize_(0), queuedManualSyncLimit_(DBConstant::QUEUED_SYNC_LIMIT_DEFAULT), manualSyncEnable_(true), - closing_(false) + closing_(false), + engineFinalize_(false) { } @@ -56,6 +57,14 @@ GenericSyncer::~GenericSyncer() if (syncEngine_ != nullptr) { syncEngine_->OnKill([this]() { this->syncEngine_->Close(); }); RefObject::KillAndDecObjRef(syncEngine_); + // waiting all thread exist + std::mutex engineMutex; + std::unique_lock cvLock(engineMutex); + bool engineFinalize = engineFinalizeCv_.wait_for(cvLock, std::chrono::milliseconds(DBConstant::MIN_TIMEOUT), + [this]() { return engineFinalize_; }); + if (!engineFinalize) { + LOGW("syncer finalize before engine finalize!"); + } syncEngine_ = nullptr; } timeHelper_ = nullptr; @@ -117,7 +126,7 @@ int GenericSyncer::Initialize(ISyncInterface *syncInterface, bool isNeedActive) initialized_ = true; } - // RegConnectCallback may start a auto sync, this function can not in syncerLock_ + // RegConnectCallback may start an auto sync, this function can not in syncerLock_ syncEngine_->RegConnectCallback(); return E_OK; } @@ -273,6 +282,7 @@ uint64_t GenericSyncer::GetTimeStamp() void GenericSyncer::QueryAutoSync(const InternalSyncParma ¶m) { + (void)param; } void GenericSyncer::AddSyncOperation(SyncOperation *operation) @@ -343,21 +353,17 @@ int GenericSyncer::InitSyncEngine(ISyncInterface *syncInterface) LOGI("[Syncer] syncEngine is active"); return E_OK; } - if (syncEngine_ == nullptr) { - syncEngine_ = CreateSyncEngine(); - if (syncEngine_ == nullptr) { - return -E_OUT_OF_MEMORY; - } + int errCode = BuildSyncEngine(); + if (errCode != E_OK) { + return errCode; } - - syncEngine_->OnLastRef([]() { LOGD("[Syncer] SyncEngine finalized"); }); const std::function onlineFunc = std::bind(&GenericSyncer::RemoteDataChanged, this, std::placeholders::_1); const std::function offlineFunc = std::bind(&GenericSyncer::RemoteDeviceOffline, this, std::placeholders::_1); const std::function queryAutoSyncFunc = std::bind(&GenericSyncer::QueryAutoSync, this, std::placeholders::_1); - int errCode = syncEngine_->Initialize(syncInterface, metadata_, onlineFunc, offlineFunc, queryAutoSyncFunc); + errCode = syncEngine_->Initialize(syncInterface, metadata_, onlineFunc, offlineFunc, queryAutoSyncFunc); if (errCode == E_OK) { syncInterface_ = syncInterface; syncInterface->IncRefCount(); @@ -381,11 +387,9 @@ int GenericSyncer::CheckSyncActive(ISyncInterface *syncInterface, bool isNeedAct return E_OK; } LOGI("[Syncer] syncer no need to active"); - if (syncEngine_ == nullptr) { - syncEngine_ = CreateSyncEngine(); - if (syncEngine_ == nullptr) { - return -E_OUT_OF_MEMORY; - } + int errCode = BuildSyncEngine(); + if (errCode != E_OK) { + return errCode; } return -E_NO_NEED_ACTIVE; } @@ -413,6 +417,10 @@ bool GenericSyncer::IsValidMode(int mode) const int GenericSyncer::SyncConditionCheck(QuerySyncObject &query, int mode, bool isQuerySync, const std::vector &devices) const { + (void)query; + (void)mode; + (void)isQuerySync; + (void)(devices); return E_OK; } @@ -752,4 +760,21 @@ void GenericSyncer::InitSyncOperation(SyncOperation *operation, const SyncParma operation->SetQuery(param.syncQuery); } } + +int GenericSyncer::BuildSyncEngine() +{ + if (syncEngine_ != nullptr) { + return E_OK; + } + syncEngine_ = CreateSyncEngine(); + if (syncEngine_ == nullptr) { + return -E_OUT_OF_MEMORY; + } + syncEngine_->OnLastRef([this]() { + LOGD("[Syncer] SyncEngine finalized"); + engineFinalize_ = true; + engineFinalizeCv_.notify_all(); + }); + return E_OK; +} } // namespace DistributedDB diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.h b/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.h old mode 100755 new mode 100644 index 1077497a4fe1b01f976bd0fedbea7147cd79e7a6..9612b8cada4a63b5afcc0459a3357bc18f67d2b3 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/generic_syncer.h @@ -50,7 +50,7 @@ public: const std::function &)> &onComplete, const std::function &onFinalize, bool wait) override; - // Sync function. use SyncParma to reduce paramter. + // Sync function. use SyncParma to reduce parameter. int Sync(const SyncParma ¶m) override; // Remove the operation, with the given syncId, used to clean resource if sync finished or failed. @@ -165,6 +165,8 @@ protected: int SyncParamCheck(const SyncParma ¶m) const; + int BuildSyncEngine(); + static int SyncModuleInit(); static int SyncResourceInit(); @@ -192,6 +194,8 @@ protected: mutable std::mutex queuedManualSyncLock_; mutable std::mutex syncerLock_; std::string label_; + bool engineFinalize_; + std::condition_variable engineFinalizeCv_; }; } // namespace DistributedDB diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/isync_target.h b/services/distributeddataservice/libs/distributeddb/syncer/src/isync_target.h index 36ca06578170a11c18415ce89a342a79d87a4e3e..e8fd05cf24eb47d490a88420c5722dfd54817ace 100644 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/isync_target.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/isync_target.h @@ -49,7 +49,7 @@ public: // Get a SyncOperation virtual void GetSyncOperation(SyncOperation *&operation) const = 0; - // Is this target is a auto sync + // Is this target is an auto sync virtual bool IsAutoSync() const = 0; virtual uint32_t GetResponseSessionId() const = 0; diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/meta_data.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/meta_data.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_data_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_data_sync.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_engine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_engine.h b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_state_machine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_state_machine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_state_machine.h b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_state_machine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_task_context.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_task_context.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_task_context.h b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_sync_task_context.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_syncer.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_syncer.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_syncer.h b/services/distributeddataservice/libs/distributeddb/syncer/src/multi_ver_syncer.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.h index bbd274eaa07b8ec0d1f67390537914599af2a549..4bdcf6670f7fcb10ab6234df779cfb99a35788e4 100644 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.h @@ -47,7 +47,7 @@ private: void StopTimer(); void ResetTimer(SingleVerSyncTaskContext *context); // when timeout queue size is 0 because thread can move queue msg to map if isNeedReload which is - // actived when queue has new msg is true + // activated when queue has new msg is true // so only need clear map msg int TimeOut(TimerId timerId); diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.cpp old mode 100755 new mode 100644 index 12bdd398d28131ffe366a5cf70ac4c41e3335045..21cb9852e6995060f22a45fde6dca0e8d038d65d --- a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.cpp @@ -1181,7 +1181,7 @@ void SingleVerDataSync::SendSaveDataNotifyPacket(SingleVerSyncTaskContext *conte uint32_t sessionId, uint32_t sequenceId, uint32_t inMsgId) { if (inMsgId != DATA_SYNC_MESSAGE && inMsgId != QUERY_SYNC_MESSAGE) { - LOGE("[SingleVerDataSync] messageId not avaiable."); + LOGE("[SingleVerDataSync] messageId not available."); return; } Message *ackMessage = new (std::nothrow) Message(inMsgId); diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_sync.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_relational_syncer.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_relational_syncer.h index 18f42a48a90cdf07635a03ca3e6c4e5f170b149f..cd54e6d4ff2ac07a1a08222070df54e25c92b24e 100644 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_relational_syncer.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_relational_syncer.h @@ -24,7 +24,7 @@ public: int Initialize(ISyncInterface *syncInterface, bool isNeedActive) override; - // Sync function. use SyncParma to reduce paramter. + // Sync function. use SyncParma to reduce parameter. int Sync(const SyncParma ¶m) override; void EnableAutoSync(bool enable) override; diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_engine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_state_machine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_state_machine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_state_machine.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_state_machine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_target.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_target.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.cpp old mode 100755 new mode 100644 index 2235ded7a5b87fcf9b6a7e074bc7ffc7d5ad3a2d..362a04f0c797884fe8d934dac7735fb5934737c1 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.cpp @@ -479,6 +479,9 @@ DEFINE_OBJECT_TAG_FACILITIES(SingleVerSyncTaskContext) bool SingleVerSyncTaskContext::IsCurrentSyncTaskCanBeSkipped() const { + if (syncOperation_ == nullptr) { + return true; + } if (mode_ == SyncModeType::PUSH) { if (lastFullSyncTaskStatus_ != SyncOperation::OP_FINISHED_ALL) { return false; diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_sync_task_context.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_syncer.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_syncer.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_syncer.h b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_syncer.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_engine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_engine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_engine.h b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_engine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.cpp old mode 100755 new mode 100644 index cc688a17ea8f1449a16e3c252215a8d586bd9796..48c7fc7e19c8fdd35530e996578d51c275f45c16 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.cpp @@ -278,7 +278,7 @@ SyncType SyncOperation::GetSyncType(int mode) int SyncOperation::TransferSyncMode(int mode) { // AUTO_PUSH and AUTO_PULL mode is used before sync, RESPONSE_PULL is regarded as push or query push mode. - // so for the three mode, it is no need to transfered. + // so for the three mode, it is no need to transferred. if (mode >= SyncModeType::QUERY_PUSH && mode <= SyncModeType::QUERY_PUSH_PULL) { return (mode - QUERY_SYNC_MODE_BASE); } diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.h b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.h index 5b5152e5f338eadd32c07c49e4ca6f6e3c15d839..229c8320b9c557d00ae4935f52154c185d63ffa8 100644 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_operation.h @@ -163,7 +163,7 @@ private: // Is this operation is a block sync bool isBlockSync_; - // Is this operation is a auto sync + // Is this operation is an auto sync bool isAutoSync_; // Is this operation has finished diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_state_machine.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_state_machine.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_state_machine.h b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_state_machine.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.h b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.h old mode 100755 new mode 100644 index 23efcd763dd91db4bb526265764721b24db9e3fd..11df7813e03996f62ceb7a890f6b68a5d5d8f41c --- a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.h +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_target.h @@ -45,7 +45,7 @@ public: // Get a SyncOperation void GetSyncOperation(SyncOperation *&operation) const override; - // Is this target is a auto sync + // Is this target is an auto sync bool IsAutoSync() const override; uint32_t GetResponseSessionId() const override; diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_task_context.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_task_context.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/sync_task_context.h b/services/distributeddataservice/libs/distributeddb/syncer/src/sync_task_context.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/syncer_factory.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/syncer_factory.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/syncer_proxy.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/syncer_proxy.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/time_helper.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/time_helper.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/time_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/time_sync.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/time_sync.h b/services/distributeddataservice/libs/distributeddb/syncer/src/time_sync.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/value_slice_sync.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/value_slice_sync.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/BUILD.gn b/services/distributeddataservice/libs/distributeddb/test/BUILD.gn old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_auto_launch_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_auto_launch_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_data_generate_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_data_generate_unit_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_data_generate_unit_test.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_data_generate_unit_test.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_json_precheck_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_json_precheck_unit_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_notification_chain_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_notification_chain_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_parcel_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_parcel_unit_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_object_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_object_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_unit_test.cpp old mode 100755 new mode 100644 index 7f9a88c1b22de74bc1f94d09c98150f65b4f7398..8f6a58261172e60d48abd2c5cf24efba22edff52 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_unit_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_schema_unit_test.cpp @@ -132,14 +132,14 @@ void PreDoubleDataForParseAndCheckSchemaAttribute003() SchemaAttribute attributeRes9; attributeRes9.type = FieldType::LEAF_FIELD_DOUBLE; attributeRes9.hasDefaultValue = true; - attributeRes9.defaultValue.doubleValue = 0.1; // test data + attributeRes9.defaultValue.doubleValue = 0.1; // 0.1 as test data g_schemaAttrDefTestDataDir["DOUBLE,DEFAULT 0.1"] = attributeRes9; SchemaAttribute attributeRes10; attributeRes10.type = FieldType::LEAF_FIELD_DOUBLE; attributeRes10.hasNotNullConstraint = true; attributeRes10.hasDefaultValue = true; - attributeRes10.defaultValue.doubleValue = -0.123456; // test data + attributeRes10.defaultValue.doubleValue = -0.123456; // -0.123456 as test data g_schemaAttrDefTestDataDir["DOUBLE, NOT NULL,DEFAULT -0.123456"] = attributeRes10; SchemaAttribute attributeRes11; diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp old mode 100755 new mode 100644 index 67810662b46152feffba3c8de72944952e747b0e..b9e48b9d5155b775086ae251c1f5dc535dbaf0a5 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp @@ -53,7 +53,7 @@ EventTime TimerTester::GetCurrentTime() LOGE("Get current time failed."); return 0; } - return now / 1000; // microsecond to millisecond. + return now / 1000; // 1 ms equals to 1000 us } class DistributedDBEventLoopTimerTest : public testing::Test { diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/adapter_stub.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/adapter_stub.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/adapter_stub.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/adapter_stub.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_deep_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_deep_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_send_receive_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_send_receive_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_data_operation_syncdb_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_data_operation_syncdb_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_data_operation_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_data_operation_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_database_corrupt_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_database_corrupt_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_database_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_database_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_device_identifier_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_device_identifier_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_database_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_database_test.cpp old mode 100755 new mode 100644 index 31c815784ffd8399c0073e7621901a5edf32a94b..645b3c7c2398144cc6b6166907c1ddc04fb91ef1 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_database_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_database_test.cpp @@ -95,7 +95,7 @@ void DistributedDBInterfacesEncryptDatabaseTest::CheckRekeyWithMultiKvStore(bool * @tc.expected: step3. return BUSY. */ CipherPassword passwd; // random password - vector passwdBuffer(10, 45); + vector passwdBuffer(10, 45); // 10 and 45 as random password. int errCode = passwd.SetValue(passwdBuffer.data(), passwdBuffer.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); EXPECT_EQ(kvStore1->Rekey(passwd), BUSY); @@ -138,7 +138,7 @@ void DistributedDBInterfacesEncryptDatabaseTest::CheckRekeyWithExistedSnapshot(b * @tc.expected: step3. return BUSY. */ CipherPassword passwd; // random password - vector passwdBuffer(10, 45); + vector passwdBuffer(10, 45); // 10 and 45 as random password. int errCode = passwd.SetValue(passwdBuffer.data(), passwdBuffer.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); EXPECT_EQ(kvStore->Rekey(passwd), BUSY); @@ -178,7 +178,7 @@ void DistributedDBInterfacesEncryptDatabaseTest::CheckRekeyWithExistedObserver(b * @tc.expected: step3. return BUSY. */ CipherPassword passwd; // random password - vector passwdBuffer(10, 45); + vector passwdBuffer(10, 45); // 10 and 45 as random password. int errCode = passwd.SetValue(passwdBuffer.data(), passwdBuffer.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); EXPECT_EQ(kvStore->Rekey(passwd), BUSY); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_delegate_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_delegate_test.cpp old mode 100755 new mode 100644 index 75d4f009017d19bac70e2d272eb91eaebce38f50..f2d9b53f2569aef0134f02f25396a9665086bc31 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_delegate_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_encrypt_delegate_test.cpp @@ -110,13 +110,13 @@ void DistributedDBInterfacesEncryptDelegateTest::SetUpTestCase(void) DistributedDBToolsUnitTest::TestDirInit(g_testDir); g_config.dataDir = g_testDir; g_mgr.SetKvStoreConfig(g_config); - vector passwdBuffer1(5, 1); + vector passwdBuffer1(5, 1); // 5 and 1 as random password. int errCode = g_passwd1.SetValue(passwdBuffer1.data(), passwdBuffer1.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); - vector passwdBuffer2(5, 2); + vector passwdBuffer2(5, 2); // 5 and 2 as random password. errCode = g_passwd2.SetValue(passwdBuffer2.data(), passwdBuffer2.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); - vector passwdBuffer3(5, 3); + vector passwdBuffer3(5, 3); // 5 and 3 as random password. errCode = g_passwd3.SetValue(passwdBuffer3.data(), passwdBuffer3.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); } diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp old mode 100755 new mode 100644 index f0e38770f37755d184b3cc7c580f9a97ca563db3..28279b62036f9dea8df70f89930ee824beef4fb7 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp @@ -96,16 +96,16 @@ void DistributedDBInterfacesImportAndExportTest::SetUpTestCase(void) g_exportFileDir = g_testDir + "/ExportDir"; OS::MakeDBDirectory(g_exportFileDir); - vector passwdBuffer1(5, 1); + vector passwdBuffer1(5, 1); // 5 and 1 as random password. int errCode = g_passwd1.SetValue(passwdBuffer1.data(), passwdBuffer1.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); - vector passwdBuffer2(5, 2); + vector passwdBuffer2(5, 2); // 5 and 2 as random password. errCode = g_passwd2.SetValue(passwdBuffer2.data(), passwdBuffer2.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); - vector passwdBuffer3(5, 3); + vector passwdBuffer3(5, 3); // 5 and 3 as random password. errCode = g_passwd3.SetValue(passwdBuffer3.data(), passwdBuffer3.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); - vector passwdBuffer4(5, 4); + vector passwdBuffer4(5, 4); // 5 and 4 as random password. errCode = g_passwd4.SetValue(passwdBuffer4.data(), passwdBuffer4.size()); ASSERT_EQ(errCode, CipherPassword::ErrorCode::OK); } diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_index_unit_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_index_unit_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_schema_put_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_schema_put_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_publish_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_publish_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_unpublish_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_unpublish_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_query_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_query_test.cpp old mode 100755 new mode 100644 index e0f097a5832d7a642a0bad7a7658ecb0da65aeef..c59b1713e0f283109159a4678ba73446851b0121 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_query_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_query_test.cpp @@ -109,7 +109,7 @@ namespace { } } -class DistributedDBInterfacesQueryDBTest : public testing::Test { +class DistributedDBInterfacesQueryTest : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); @@ -117,20 +117,20 @@ public: void TearDown(); }; -void DistributedDBInterfacesQueryDBTest::SetUpTestCase(void) +void DistributedDBInterfacesQueryTest::SetUpTestCase(void) { } -void DistributedDBInterfacesQueryDBTest::TearDownTestCase(void) +void DistributedDBInterfacesQueryTest::TearDownTestCase(void) { } -void DistributedDBInterfacesQueryDBTest::SetUp(void) +void DistributedDBInterfacesQueryTest::SetUp(void) { DistributedDBUnitTest::DistributedDBToolsUnitTest::PrintTestCaseInfo(); } -void DistributedDBInterfacesQueryDBTest::TearDown(void) +void DistributedDBInterfacesQueryTest::TearDown(void) { } @@ -141,7 +141,7 @@ void DistributedDBInterfacesQueryDBTest::TearDown(void) * @tc.require: AR000DR9K6 * @tc.author: sunpeng */ -HWTEST_F(DistributedDBInterfacesQueryDBTest, Query001, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesQueryTest, Query001, TestSize.Level1) { Query query = Query::Select(); Query queryCopy = query; @@ -196,7 +196,7 @@ HWTEST_F(DistributedDBInterfacesQueryDBTest, Query001, TestSize.Level1) * @tc.require: AR000DR9K6 * @tc.author: sunpeng */ -HWTEST_F(DistributedDBInterfacesQueryDBTest, Query002, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesQueryTest, Query002, TestSize.Level1) { float testValue = 1.1; Query query = Query::Select().NotEqualTo(".test", testValue); @@ -214,7 +214,7 @@ HWTEST_F(DistributedDBInterfacesQueryDBTest, Query002, TestSize.Level1) * @tc.require: AR000DR9K6 * @tc.author: sunpeng */ -HWTEST_F(DistributedDBInterfacesQueryDBTest, Query003, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesQueryTest, Query003, TestSize.Level1) { Query query = Query::Select().EqualTo(TEST_FIELD_NAME, true).And().GreaterThan(TEST_FIELD_NAME, 1); QueryExpression queryExpression = GetQueryInfo::GetQueryExpression(query); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_register_syncdb_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_register_syncdb_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp index c0d4e798b80efa5e11b0b76c1f7b9e62c5e736cc..d153709b53b2243b87f1d13658f96c73a832bd7b 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp @@ -318,7 +318,7 @@ HWTEST_F(DistributedDBInterfacesRelationalTest, RelationalStoreTest005, TestSize ASSERT_NE(delegate, nullptr); /** - * @tc.steps:step3. Create distributed table with invald table name + * @tc.steps:step3. Create distributed table with invalid table name * @tc.expected: step3. Create distributed table failed. */ EXPECT_NE(delegate->CreateDistributedTable(DBConstant::SYSTEM_TABLE_PREFIX + "_tmp"), OK); @@ -362,7 +362,7 @@ HWTEST_F(DistributedDBInterfacesRelationalTest, RelationalStoreTest006, TestSize ASSERT_NE(delegate, nullptr); /** - * @tc.steps:step3. Create distributed table with invald table name + * @tc.steps:step3. Create distributed table with invalid table name * @tc.expected: step3. Create distributed table failed. */ EXPECT_EQ(delegate->CreateDistributedTable("sync_data"), OK); @@ -611,7 +611,7 @@ HWTEST_F(DistributedDBInterfacesRelationalTest, RelationalRemoveDeviceDataTest00 EXPECT_EQ(delegate->RemoveDeviceData("DEVICE_C", "sync_data"), OK); /** - * @tc.steps:step4. Remove device data with invald args + * @tc.steps:step4. Remove device data with invalid args * @tc.expected: step4. invalid */ EXPECT_EQ(delegate->RemoveDeviceData(""), INVALID_ARGS); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_resultset_performance.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_resultset_performance.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_schema_database_upgrade_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_schema_database_upgrade_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_single_version_result_set_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_single_version_result_set_test.cpp old mode 100755 new mode 100644 index 87b8e8d31ea858459b69e4a289bae951c1e9f6f6..a4bd33648244fcbcb7590d42ff8342dd0a0ae609 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_single_version_result_set_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_single_version_result_set_test.cpp @@ -58,7 +58,7 @@ namespace { const Key LOCAL_KEY_4 = {'K', '4'}; } -class DistributedDBSingleVersionResultSetTest : public testing::Test { +class DistributedDBInterfacesSingleVersionResultSetTest : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); @@ -66,7 +66,7 @@ public: void TearDown(); }; -void DistributedDBSingleVersionResultSetTest::SetUpTestCase(void) +void DistributedDBInterfacesSingleVersionResultSetTest::SetUpTestCase(void) { DistributedDBToolsUnitTest::TestDirInit(g_testDir); g_config.dataDir = g_testDir; @@ -83,7 +83,7 @@ void DistributedDBSingleVersionResultSetTest::SetUpTestCase(void) } } -void DistributedDBSingleVersionResultSetTest::TearDownTestCase(void) +void DistributedDBInterfacesSingleVersionResultSetTest::TearDownTestCase(void) { if (DistributedDBToolsUnitTest::RemoveTestDbFiles(g_testDir + STORE_ID + "/" + DBConstant::SINGLE_SUB_DIR) != 0) { LOGE("rm test db files error!"); @@ -92,7 +92,7 @@ void DistributedDBSingleVersionResultSetTest::TearDownTestCase(void) std::this_thread::sleep_for(std::chrono::milliseconds(TIME_LAG)); } -void DistributedDBSingleVersionResultSetTest::SetUp(void) +void DistributedDBInterfacesSingleVersionResultSetTest::SetUp(void) { DistributedDBToolsUnitTest::PrintTestCaseInfo(); KvStoreNbDelegate::Option delegateOption = {true}; @@ -132,7 +132,7 @@ void DistributedDBSingleVersionResultSetTest::SetUp(void) ASSERT_NE(g_rawCursor, nullptr); } -void DistributedDBSingleVersionResultSetTest::TearDown(void) +void DistributedDBInterfacesSingleVersionResultSetTest::TearDown(void) { if (g_connection != nullptr) { g_connection->Close(); @@ -162,7 +162,7 @@ void DistributedDBSingleVersionResultSetTest::TearDown(void) * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest001, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest001, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be INT_MAX, which is larger than the upper limit. @@ -181,7 +181,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest001, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest002, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest002, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be -1. @@ -200,7 +200,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest002, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest003, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest003, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 0. @@ -219,7 +219,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest003, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest004, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest004, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, which is smaller than the upper limit. @@ -238,7 +238,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest004, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest005, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest005, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be negative (-1). @@ -257,7 +257,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest005, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest006, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest006, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 2. @@ -276,7 +276,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest006, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest007, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest007, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 0. @@ -295,7 +295,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest007, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest008, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest008, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 0.5. @@ -314,7 +314,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest008, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest009, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest009, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -334,7 +334,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest009, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest010, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest010, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -360,7 +360,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest010, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest011, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest011, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -399,7 +399,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest011, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest012, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest012, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -433,7 +433,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest012, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest013, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest013, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -468,7 +468,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest013, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest014, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest014, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. @@ -504,7 +504,7 @@ HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest014, * @tc.require: AR000D08KT * @tc.author: maokeheng */ -HWTEST_F(DistributedDBSingleVersionResultSetTest, SingleVersionResultSetTest015, TestSize.Level1) +HWTEST_F(DistributedDBInterfacesSingleVersionResultSetTest, SingleVersionResultSetTest015, TestSize.Level1) { /** * @tc.steps:step1. Let the WindowSize be 100, and window scale to be 1 and resultWindow be null pointer. diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_space_management_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_space_management_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_optimization_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_optimization_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_syncdb_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_syncdb_test.cpp old mode 100755 new mode 100644 index 765fab83fe861f2532ad5598bca4b752dbdbcc3f..1b8779f8e504e28307a7aac7b121a125ff1988a4 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_syncdb_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_syncdb_test.cpp @@ -508,7 +508,7 @@ HWTEST_F(DistributedDBInterfacesTransactionSyncDBTest, RollBack004, TestSize.Lev /** * @tc.name: RollBack005 - * @tc.desc: delete a exist data and rollback + * @tc.desc: delete an exist data and rollback * @tc.type: FUNC * @tc.require: AR000BVRNM AR000CQDTQ * @tc.author: huangnaigu diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_testcase.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_transaction_testcase.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/process_system_api_adapter_impl.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/process_system_api_adapter_impl.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/process_system_api_adapter_impl.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/process_system_api_adapter_impl.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/runtime_context_process_system_api_adapter_impl_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/runtime_context_process_system_api_adapter_impl_test.cpp old mode 100755 new mode 100644 index 39c9935e583d1bb3d82025745db0f623137387a0..373f325d62d1d6dc38bcad4030592e0f9cf3c3d3 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/runtime_context_process_system_api_adapter_impl_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/interfaces/runtime_context_process_system_api_adapter_impl_test.cpp @@ -54,7 +54,7 @@ public: void RuntimeContextProcessSystemApiAdapterImplTest::SetUpTestCase(void) { /** - * @tc.setup: Get a adapter + * @tc.setup: Get an adapter */ g_adapter = std::make_shared(); EXPECT_TRUE(g_adapter != nullptr); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_data_transformer_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_data_transformer_test.cpp index 6955116d674a2bf7a0534cd02b28dfe9db2a1ac1..f1e605a0533fac5426fb73b12b09706e11758c19 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_data_transformer_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_data_transformer_test.cpp @@ -191,7 +191,7 @@ HWTEST_F(DistributedDBDataTransformerTest, DataTransformerCheck001, TestSize.Lev } /** - * @tc.steps: step2. generate a originData by fieldInfoLiist. + * @tc.steps: step2. generate an originData by fieldInfoLiist. */ TableDataWithLog originData; GenerateTableDataWithLog(fieldInfoList, originData); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_file_package_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_file_package_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_multi_ver_vacuum_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_multi_ver_vacuum_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_sqlite_register_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_sqlite_register_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_commit_storage_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_commit_storage_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_data_operation_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_data_operation_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_encrypt_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_encrypt_test.cpp old mode 100755 new mode 100644 index 5edc49d514a5faa7e60c14fa8cb0f8b6b6e15118..8b3a0b7e456a03b29f222ffeb1d125df63112095 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_encrypt_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_encrypt_test.cpp @@ -336,8 +336,12 @@ void DistributedDBStorageEncryptTest::SetUp(void) /** * @tc.Clean DB files created from every test case. */ - remove((STORE_ID + ".db").c_str()); - remove((STORE_ID2 + ".db").c_str()); + if (remove((STORE_ID + ".db").c_str()) != 0) { + LOGE("remove db failed, errno:%d", errno); + } + if (remove((STORE_ID2 + ".db").c_str()) != 0) { + LOGE("remove db failed, errno:%d", errno); + } } void DistributedDBStorageEncryptTest::TearDown(void) @@ -351,8 +355,12 @@ void DistributedDBStorageEncryptTest::TearDown(void) /** * @tc.Clean DB files created from every test case. */ - remove((STORE_ID + ".db").c_str()); - remove((STORE_ID2 + ".db").c_str()); + if (remove((STORE_ID + ".db").c_str()) != 0) { + LOGE("remove db failed, errno:%d", errno); + } + if (remove((STORE_ID2 + ".db").c_str()) != 0) { + LOGE("remove db failed, errno:%d", errno); + } /** * @tc.Wait a number of SLEEP_TIME until remove done. */ diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_index_optimize_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_index_optimize_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_memory_single_ver_naturall_store_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_memory_single_ver_naturall_store_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_register_conflict_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_register_conflict_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_register_observer_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_register_observer_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_resultset_and_json_optimize.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_resultset_and_json_optimize.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.cpp old mode 100755 new mode 100644 index ebe1e5420802b21286a92379db4efb0914fcecb2..bdaf46efb1054bf9e778d47b8ab976deb7a16539 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.cpp @@ -739,7 +739,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::SyncDatabaseOperate002(S DataItem dataItem1; DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.key); DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.value); - dataItem1.timeStamp = 1001; // random timestamp + dataItem1.timeStamp = 1001; // 1001 as random timestamp dataItem1.writeTimeStamp = dataItem1.timeStamp; dataItem1.flag = 0; @@ -804,7 +804,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::SyncDatabaseOperate004(S DataItem dataItem1; DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.key); DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.value); - dataItem1.timeStamp = 1997; // random timestamp + dataItem1.timeStamp = 1997; // 1997 as random timestamp dataItem1.writeTimeStamp = dataItem1.timeStamp; dataItem1.flag = 0; @@ -873,13 +873,13 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::SyncDatabaseOperate006(S * Insert the data of key length=keyPrefix length - 1, value3. * @tc.expected: step2/3/4. Return E_NOT_FOUND. */ - DistributedDBToolsUnitTest::GetRandomKeyValue(key1, 30); // random size + DistributedDBToolsUnitTest::GetRandomKeyValue(key1, 30); // 30 as random size key3 = key2 = key1; key2.push_back('C'); key3.pop_back(); - DistributedDBToolsUnitTest::GetRandomKeyValue(value1, 84); // random size - DistributedDBToolsUnitTest::GetRandomKeyValue(value2, 101); // random size - DistributedDBToolsUnitTest::GetRandomKeyValue(value3, 37); // random size + DistributedDBToolsUnitTest::GetRandomKeyValue(value1, 84); // 84 as random size + DistributedDBToolsUnitTest::GetRandomKeyValue(value2, 101); // 101 as random size + DistributedDBToolsUnitTest::GetRandomKeyValue(value3, 37); // 37 as random size EXPECT_EQ(connection->Put(option, key1, value1), E_OK); EXPECT_EQ(connection->Put(option, key2, value2), E_OK); EXPECT_EQ(connection->Put(option, key3, value3), E_OK); @@ -924,14 +924,14 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::ClearRemoteData001(SQLit DataItem dataItem1; DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.key); DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem1.value); - dataItem1.timeStamp = 1997; // random timestamp + dataItem1.timeStamp = 1997; // 1997 as random timestamp dataItem1.writeTimeStamp = dataItem1.timeStamp; dataItem1.flag = 0; DataItem dataItem2; DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem2.key, dataItem1.key.size() + 1); DistributedDBToolsUnitTest::GetRandomKeyValue(dataItem2.value); - dataItem2.timeStamp = 2019; // random timestamp + dataItem2.timeStamp = 2019; // 2019 as random timestamp dataItem2.writeTimeStamp = dataItem2.timeStamp; dataItem2.flag = 0; @@ -1013,7 +1013,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::DeleteUserKeyValue001(SQ int numSelect = GetRawSyncData(url, SYNC_DATA_DEFAULT_SQL, vecSyncData); bool isFound = false; - EXPECT_EQ(numSelect, 2); + EXPECT_EQ(numSelect, 2); // 2 as entry size isFound = IsSqlinteExistKey(vecSyncData, KEY_1); EXPECT_EQ(isFound, false); isFound = IsSqlinteExistKey(vecSyncData, KEY_2); @@ -1052,7 +1052,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::MemoryDbDeleteUserKeyVal int numSelect = GetRawSyncData(url, SYNC_DATA_DEFAULT_SQL, vecSyncData); bool isFound = false; - EXPECT_EQ(numSelect, 2); + EXPECT_EQ(numSelect, 2); // 2 as entry size isFound = IsSqlinteExistKey(vecSyncData, KEY_1); EXPECT_EQ(isFound, false); isFound = IsSqlinteExistKey(vecSyncData, KEY_2); @@ -1108,7 +1108,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::DeleteUserKeyValue002(SQ std::vector vecSyncData; int numSelect = GetRawSyncData(url, SYNC_DATA_DEFAULT_SQL, vecSyncData); - EXPECT_EQ(numSelect, 2); + EXPECT_EQ(numSelect, 2); // 2 as entry size } /** @@ -1341,7 +1341,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::DeleteUserKeyValue005(SQ std::vector vecSyncData; int numSelect = GetRawSyncData(url, SYNC_DATA_DEFAULT_SQL, vecSyncData); - EXPECT_EQ(numSelect, 2); + EXPECT_EQ(numSelect, 2); // 2 as entry size bool isFound = IsSqlinteExistKey(vecSyncData, KEY_1); EXPECT_EQ(isFound, true); } @@ -1391,7 +1391,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::MemoryDbDeleteUserKeyVal std::vector vecSyncData; int numSelect = GetRawSyncData(url, SYNC_DATA_DEFAULT_SQL, vecSyncData); - EXPECT_EQ(numSelect, 2); + EXPECT_EQ(numSelect, 2); // 2 as entry size bool isFound = IsSqlinteExistKey(vecSyncData, KEY_1); EXPECT_EQ(isFound, true); @@ -1606,7 +1606,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::TestMetaDataPutAndGet(SQ EXPECT_EQ(store->GetMetaData(key1, valueRead), E_OK); EXPECT_EQ(DistributedDBToolsUnitTest::IsValueEqual(valueRead, value1), true); Value value2; - DistributedDBToolsUnitTest::GetRandomKeyValue(value2, static_cast(value1.size() + 3)); // random size + DistributedDBToolsUnitTest::GetRandomKeyValue(value2, static_cast(value1.size() + 3)); // 3 as random size /** * @tc.steps:step3. The key value is key1, the value is not empty, @@ -1663,10 +1663,10 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::TestMetaDataPutAndGet(SQ * or value size greater than 4Mb through PutMetaData of NaturalStore. * @tc.expected: step9/10. Return E_INVALID_ARGS. */ - sizeKey.push_back(249); // random + sizeKey.push_back(249); // 249 as random size EXPECT_EQ(store->PutMetaData(sizeKey, sizeValue), -E_INVALID_ARGS); sizeKey.pop_back(); - sizeValue.push_back(174); // random + sizeValue.push_back(174); // 174 as random size EXPECT_EQ(store->PutMetaData(sizeKey, sizeValue), -E_INVALID_ARGS); /** @@ -1765,7 +1765,7 @@ void DistributedDBStorageSingleVerNaturalStoreTestCase::DataBaseCommonPutOperate sizeKey.push_back(std::rand()); // random size EXPECT_EQ(connection->Put(option, sizeKey, sizeValue), -E_INVALID_ARGS); sizeKey.pop_back(); - sizeValue.push_back(174); // random size + sizeValue.push_back(174); // 174 as random size EXPECT_EQ(connection->Put(option, sizeKey, sizeValue), -E_INVALID_ARGS); } diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_natural_store_testcase.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_upgrade_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_upgrade_test.cpp old mode 100755 new mode 100644 index 3068c1332b6a4dd20dfebeeeb7819c470d4bbef0..55a31af7e92ac63725e91e7b9dd8c60dd0451984 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_upgrade_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_upgrade_test.cpp @@ -246,10 +246,10 @@ namespace { g_mgr.GetKvStore("TestUpgradeNb", option, g_kvNbDelegateCallback); ASSERT_TRUE(g_kvNbDelegatePtr != nullptr); EXPECT_TRUE(g_kvDelegateStatus == OK); - if (secOptCheck == true) { + if (secOptCheck) { CheckSecOpt(secopt); } - if (putCheck == true) { + if (putCheck) { EXPECT_TRUE(g_kvNbDelegatePtr->Put(keyTmp, value) == OK); EXPECT_TRUE(g_kvNbDelegatePtr->Get(keyTmp, valueRead) == OK); } diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_sqlite_single_ver_natural_store_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_sqlite_single_ver_natural_store_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_data_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_data_test.cpp old mode 100755 new mode 100644 index ab414c0d204e1d00f4b239257447153c0ccf4a86..f595b4d2f4621f408a42dd63054447aff1ef9d7b --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_data_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_data_test.cpp @@ -95,7 +95,7 @@ static void ValueEqual(const Value &read, const Value &origin) static int RunSyncMergeForOneCommit(std::vector &entries) { MultiVerCommitNode multiVerCommit; - multiVerCommit.commitId.resize(20); // commit id size + multiVerCommit.commitId.resize(20); // 20 as commit id size RAND_bytes(multiVerCommit.commitId.data(), 20); multiVerCommit.deviceInfo = DBCommon::TransferHashString("deviceB") + "deviceB1"; diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_record_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_record_test.cpp old mode 100755 new mode 100644 index 2b25f36625397b1b2f20975f67a33bde33ddef94..4d0814b1a2bffa06326746137aef188af94e0b1e --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_record_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_transaction_record_test.cpp @@ -73,7 +73,9 @@ void DistributedDBStorageTransactionRecordTest::TearDown(void) g_transaction = nullptr; } - remove(g_storeDir.c_str()); + if (remove(g_storeDir.c_str()) != 0) { + LOGE("remove db failed, errno:%d", errno); + } } /** diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/multi_ver_vacuum_executor_stub.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/multi_ver_vacuum_executor_stub.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/multi_ver_vacuum_executor_stub.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/storage/multi_ver_vacuum_executor_stub.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_ability_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_ability_sync_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_communicator_proxy_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_communicator_proxy_test.cpp index 609a9e00c1073a70314b98a6b4c2039f383f609e..2706f6154fb7f7371a16da051c8cceea5d41a7b8 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_communicator_proxy_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_communicator_proxy_test.cpp @@ -324,7 +324,7 @@ HWTEST_F(DistributedDBCommunicatorProxyTest, SendMessage001, TestSize.Level1) /** * @tc.name: Get timeout time 001 - * @tc.desc: Test get timout called from CommunicatorProxy. + * @tc.desc: Test get timeout called from CommunicatorProxy. * @tc.type: FUNC * @tc.require: AR000F4GVG * @tc.author: xushaohua diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp index 972b6d764fa3fd109b917b697f1f56614a8de442..82478d8fdf5664b420dc00d0c0eda8cbe099ba4e 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp @@ -23,7 +23,9 @@ #include "mock_single_ver_data_sync.h" #include "mock_single_ver_state_machine.h" #include "mock_sync_task_context.h" +#include "single_ver_kv_syncer.h" #include "single_ver_relational_sync_task_context.h" +#include "virtual_communicator_aggregator.h" #include "virtual_single_ver_sync_db_Interface.h" #ifdef DATA_SYNC_CHECK_003 #include "virtual_relational_ver_sync_db_interface.h" @@ -195,6 +197,34 @@ HWTEST_F(DistributedDBMockSyncModuleTest, StateMachineCheck005, TestSize.Level1) } } +/** + * @tc.name: StateMachineCheck006 + * @tc.desc: Test machine exec next task when queue not empty to empty. + * @tc.type: FUNC + * @tc.require: AR000CCPOM + * @tc.author: zhangqiquan + */ +HWTEST_F(DistributedDBMockSyncModuleTest, StateMachineCheck006, TestSize.Level1) +{ + MockSingleVerStateMachine stateMachine; + MockSyncTaskContext syncTaskContext; + MockCommunicator communicator; + VirtualSingleVerSyncDBInterface dbSyncInterface; + Init(stateMachine, syncTaskContext, communicator, dbSyncInterface); + + EXPECT_CALL(syncTaskContext, IsTargetQueueEmpty()) + .WillOnce(Return(false)) + .WillOnce(Return(true)); + EXPECT_CALL(syncTaskContext, IsCurrentSyncTaskCanBeSkipped()) + .WillRepeatedly(Return(syncTaskContext.CallIsCurrentSyncTaskCanBeSkipped())); + EXPECT_CALL(syncTaskContext, MoveToNextTarget()).WillOnce(Return()); + // we expect machine dont change context status when queue not empty + EXPECT_CALL(syncTaskContext, SetOperationStatus(_)).WillOnce(Return()); + EXPECT_CALL(syncTaskContext, SetTaskExecStatus(_)).WillOnce(Return()); + + EXPECT_EQ(stateMachine.CallExecNextTask(), -E_NO_SYNC_TASK); +} + /** * @tc.name: DataSyncCheck001 * @tc.desc: Test dataSync recv error ack. @@ -248,7 +278,7 @@ HWTEST_F(DistributedDBMockSyncModuleTest, DataSyncCheck003, TestSize.Level1) MockCommunicator communicator; std::shared_ptr metadata = std::static_pointer_cast(mockMetadata); mockDataSync.Initialize(&storage, &communicator, metadata, "deviceId"); - + DistributedDB::Message *message = new(std::nothrow) DistributedDB::Message(); ASSERT_TRUE(message != nullptr); DataAckPacket packet; @@ -286,7 +316,7 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AutoLaunchCheck001, TestSize.Level1) mockAutoLaunch.SetAutoLaunchItem(id, userId, item); EXPECT_CALL(mockAutoLaunch, TryCloseConnection(_)).WillOnce(Return()); /** - * @tc.steps: step2. send close singal to simulate a connection was unused in 1 min + * @tc.steps: step2. send close signal to simulate a connection was unused in 1 min * @tc.expected: 10 thread try to close the connection and one thread close success */ const int loopCount = 10; @@ -355,7 +385,7 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AbilitySync001, TestSize.Level1) { MockSyncTaskContext syncTaskContext; AbilitySync abilitySync; - + DistributedDB::Message *message = new(std::nothrow) DistributedDB::Message(); ASSERT_TRUE(message != nullptr); AbilitySyncAckPacket packet; @@ -382,7 +412,7 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AbilitySync002, TestSize.Level1) std::shared_ptr metaData = std::make_shared(); metaData->Initialize(&syncDBInterface); abilitySync.Initialize(&comunicator, &syncDBInterface, metaData, "deviceId"); - + /** * @tc.steps: step1. set AbilitySyncAckPacket ackCode is E_OK for pass the ack check */ @@ -434,4 +464,27 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AbilitySync003, TestSize.Level1) context->SchemaChange(); EXPECT_EQ(context->GetSyncStrategy(query).permitSync, false); RefObject::KillAndDecObjRef(context); +} + +/** + * @tc.name: SyncLifeTest001 + * @tc.desc: Test syncer alive when thread still exist. + * @tc.type: FUNC + * @tc.require: AR000CCPOM + * @tc.author: zhangqiquan + */ +HWTEST_F(DistributedDBMockSyncModuleTest, SyncLifeTest001, TestSize.Level3) +{ + std::shared_ptr syncer = std::make_shared(); + VirtualCommunicatorAggregator *virtualCommunicatorAggregator = new VirtualCommunicatorAggregator(); + RuntimeContext::GetInstance()->SetCommunicatorAggregator(virtualCommunicatorAggregator); + VirtualSingleVerSyncDBInterface *syncDBInterface = new VirtualSingleVerSyncDBInterface(); + syncer->Initialize(syncDBInterface, true); + syncer->EnableAutoSync(true); + for (int i = 0; i < 1000; i++) { // trigger 1000 times auto sync check + syncer->LocalDataChanged(SQLITE_GENERAL_NS_PUT_EVENT); + } + syncer = nullptr; + RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr); + delete syncDBInterface; } \ No newline at end of file diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_multi_ver_p2p_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_multi_ver_p2p_sync_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp index e052edbc4be3a5a7f9a003a25a44787b523787fc..37d41afcf67ee78e652152097c2613668edd7883 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp @@ -291,10 +291,9 @@ namespace { fieldInfoList.push_back(columnThird); } - void BlockSync(const std::string &tableName, SyncMode syncMode, DBStatus exceptStatus, + void BlockSync(const Query &query, SyncMode syncMode, DBStatus exceptStatus, const std::vector &devices) { - Query query = Query::Select(tableName); std::map> statusMap; SyncStatusCallback callBack = [&statusMap]( const std::map> &devicesMap) { @@ -309,6 +308,13 @@ namespace { } } + void BlockSync(const std::string &tableName, SyncMode syncMode, DBStatus exceptStatus, + const std::vector &devices) + { + Query query = Query::Select(tableName); + BlockSync(query, syncMode, exceptStatus, devices); + } + void BlockSync(SyncMode syncMode, DBStatus exceptStatus, const std::vector &devices) { BlockSync(g_tableName, syncMode, exceptStatus, devices); @@ -755,6 +761,39 @@ HWTEST_F(DistributedDBRelationalVerP2PSyncTest, NormalSync005, TestSize.Level0) CheckData(dataMap); } +/** +* @tc.name: Normal Sync 007 +* @tc.desc: Test normal sync for miss query data. +* @tc.type: FUNC +* @tc.require: AR000GK58N +* @tc.author: zhangqiquan +*/ +HWTEST_F(DistributedDBRelationalVerP2PSyncTest, NormalSync007, TestSize.Level1) +{ + std::map dataMap; + PrepareEnvironment(dataMap, {g_deviceB}); + + Query query = Query::Select(g_tableName).EqualTo("NAME", DEFAULT_TEXT); + BlockSync(query, SyncMode::SYNC_MODE_PUSH_ONLY, OK, {DEVICE_B}); + + CheckVirtualData(dataMap); + + sqlite3 *db = nullptr; + EXPECT_EQ(GetDB(db), SQLITE_OK); + std::string sql = "UPDATE TEST_TABLE SET NAME = '' WHERE 1 = 1"; + EXPECT_EQ(SQLiteUtils::ExecuteRawSQL(db, sql), E_OK); + sqlite3_close(db); + + BlockSync(query, SyncMode::SYNC_MODE_PUSH_ONLY, OK, {DEVICE_B}); + + std::vector dataList; + EXPECT_EQ(g_deviceB->GetAllSyncData(g_tableName, dataList), E_OK); + EXPECT_EQ(static_cast(dataList.size()), 1); + for (const auto &item : dataList) { + EXPECT_EQ(item.logInfo.flag, DataItem::REMOTE_DEVICE_DATA_MISS_QUERY); + } +} + /** * @tc.name: Normal Sync 006 * @tc.desc: Test normal pull sync for add data. diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_msg_schedule_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_msg_schedule_test.cpp index fabb61c5fda06a98b091df92c7dd5bad9c48fcde..9df55d1bb65c8d80ba25eaa61aa9549aa421e17e 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_msg_schedule_test.cpp +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_msg_schedule_test.cpp @@ -54,7 +54,7 @@ void DistributedDBSingleVerMsgScheduleTest::TearDown(void) /** * @tc.name: MsgSchedule001 - * @tc.desc: Test MsgSchedule funtion with normal sequenceId + * @tc.desc: Test MsgSchedule function with normal sequenceId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -104,7 +104,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule001, TestSize.Level0) /** * @tc.name: MsgSchedule002 - * @tc.desc: Test MsgSchedule funtion with by low version + * @tc.desc: Test MsgSchedule function with by low version * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -147,7 +147,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule002, TestSize.Level0) /** * @tc.name: MsgSchedule003 - * @tc.desc: Test MsgSchedule funtion with cross sessionId + * @tc.desc: Test MsgSchedule function with cross sessionId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -214,7 +214,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule003, TestSize.Level0) /** * @tc.name: MsgSchedule004 - * @tc.desc: Test MsgSchedule funtion with same sessionId with different packetId + * @tc.desc: Test MsgSchedule function with same sessionId with different packetId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -273,7 +273,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule004, TestSize.Level0) /** * @tc.name: MsgSchedule005 - * @tc.desc: Test MsgSchedule funtion with same sessionId with different packetId + * @tc.desc: Test MsgSchedule function with same sessionId with different packetId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -330,7 +330,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule005, TestSize.Level0) /** * @tc.name: MsgSchedule006 - * @tc.desc: Test MsgSchedule funtion with same sessionId and same sequenceId and packetId + * @tc.desc: Test MsgSchedule function with same sessionId and same sequenceId and packetId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao @@ -396,7 +396,7 @@ HWTEST_F(DistributedDBSingleVerMsgScheduleTest, MsgSchedule006, TestSize.Level0) /** * @tc.name: MsgSchedule007 - * @tc.desc: Test MsgSchedule funtion with same sessionId and duplicate sequenceId and low packetId + * @tc.desc: Test MsgSchedule function with same sessionId and duplicate sequenceId and low packetId * @tc.type: FUNC * @tc.require: * @tc.author: zhuwentao diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_syncer_device_manager_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_syncer_device_manager_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/mock_sync_task_context.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/mock_sync_task_context.h index 5b650bc635468bd6f1266cf53af2feda5f18987e..1dfca14ffd500c9f4fc9f5cc1888c0829416cffe 100644 --- a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/mock_sync_task_context.h +++ b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/mock_sync_task_context.h @@ -22,6 +22,11 @@ namespace DistributedDB { class MockSyncTaskContext : public SingleVerKvSyncTaskContext { public: + bool CallIsCurrentSyncTaskCanBeSkipped() + { + return SingleVerKvSyncTaskContext::IsCurrentSyncTaskCanBeSkipped(); + } + MOCK_CONST_METHOD0(GetTimerId, TimerId(void)); MOCK_CONST_METHOD0(IsTargetQueueEmpty, bool(void)); diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_multi_ver_sync_db_interface.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_multi_ver_sync_db_interface.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_multi_ver_sync_db_interface.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_multi_ver_sync_db_interface.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_single_ver_sync_db_Interface.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_single_ver_sync_db_Interface.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_single_ver_sync_db_Interface.h b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_single_ver_sync_db_Interface.h old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp b/services/distributeddataservice/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp old mode 100755 new mode 100644 diff --git a/services/distributeddataservice/test/common/distributeddb/include/distributeddb_log_print.h b/services/distributeddataservice/test/common/distributeddb/include/distributeddb_log_print.h index ff00a8f26d5a7a3894799842997e9a8b79e36ae3..7f8a56d2a25090ca91fc86257d7440f79c373f80 100755 --- a/services/distributeddataservice/test/common/distributeddb/include/distributeddb_log_print.h +++ b/services/distributeddataservice/test/common/distributeddb/include/distributeddb_log_print.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 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 @@ -25,25 +25,9 @@ #endif #endif -#if defined USING_LOGCAT_LOGGER - #include -#elif defined _WIN32 - #define USING_PRINTF_LOGGER - #include -#elif defined USING_HILOG_LOGGER - #include "hilog/log.h" -#endif +#include "hilog/log.h" -#if defined USING_LOGCAT_LOGGER - #define MST_LOG(fmt, ...) \ - (void)(__android_log_print(static_cast(ANDROID_LOG_INFO), "DistributedDB[TEST]", \ - "%s: " fmt, __FUNCTION__, ##__VA_ARGS__)) -#elif defined USING_PRINTF_LOGGER - #define MST_LOG(fmt, ...) \ - (void)(std::printf(fmt"\n", ##__VA_ARGS__)) -#elif defined USING_HILOG_LOGGER - static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, 0xD001630, "DistributedDB[TEST]" }; - #define MST_LOG(fmt, ...) \ - OHOS::HiviewDFX::HiLog::Info(LOG_LABEL, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) -#endif +static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, 0xD001630, "DistributedDB[TEST]" }; +#define MST_LOG(fmt, ...) \ + OHOS::HiviewDFX::HiLog::Info(LOG_LABEL, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) #endif diff --git a/services/distributeddataservice/test/common/distributeddb/src/distributed_rdb_tools.cpp b/services/distributeddataservice/test/common/distributeddb/src/distributed_rdb_tools.cpp index fae08163e170eaa7eca056e45d3285a89e15a562..91d6dc8bebdb5943e65cf5c361f6cfb9f5013491 100644 --- a/services/distributeddataservice/test/common/distributeddb/src/distributed_rdb_tools.cpp +++ b/services/distributeddataservice/test/common/distributeddb/src/distributed_rdb_tools.cpp @@ -99,7 +99,7 @@ DBStatus DistributedRdbTools::GetOpenStoreStatus(const RelatetionalStoreManager if (delegate == nullptr) { MST_LOG("%s GetRdbStore failed! delegate nullptr.", TAG.c_str()); } - retrun status; + return status; } DBStatus DistributedRdbTools::GetCreateDistributedTableStatus(const RelatetionalStoreDelegate *&delegate, @@ -110,7 +110,7 @@ DBStatus DistributedRdbTools::GetCreateDistributedTableStatus(const Relatetional return DBStatus::DB_ERROR; } DBStatus status = delegate->CreateDistributedTable(tableName); - retrun status; + return status; } DBStatus DistributedRdbTools::CloseStore(const RelatetionalStoreDelegate *&delegate) diff --git a/services/distributeddataservice/test/common/distributeddb/src/distributed_test_sysinfo.cpp b/services/distributeddataservice/test/common/distributeddb/src/distributed_test_sysinfo.cpp index aa924ab9e8b8a30be8c53b8cbda2dc8174298418..e5be30527f0368d1a649267cfe26491e01516268 100755 --- a/services/distributeddataservice/test/common/distributeddb/src/distributed_test_sysinfo.cpp +++ b/services/distributeddataservice/test/common/distributeddb/src/distributed_test_sysinfo.cpp @@ -223,24 +223,34 @@ uint64_t DistributedTestSysInfo::GetSecondMemFree() const #elif defined RUNNING_ON_WIN void DistributedTestSysInfo::GetSysMemOccpy(SeqNo seqNo) { + (void)seqNo; } void DistributedTestSysInfo::GetSysCpuUsage(SeqNo seqNo, uint64_t microSeconds) { + (void)seqNo; + (void)microSeconds; } float DistributedTestSysInfo::ReadSysValFromFile(const std::string &filePath) { + (void)filePath; return 0.0f; } float DistributedTestSysInfo::GetSysMeanCurrentVal( const std::string &filePath, int totalCount, uint64_t microSeconds) { + (void)filePath; + (void)totalCount; + (void)microSeconds; return 0.0f; } void DistributedTestSysInfo::GetSysCurrentPower(SeqNo seqNo, int totalCount, uint64_t microSeconds) { + (void)seqNo; + (void)totalCount; + (void)microSeconds; } uint64_t DistributedTestSysInfo::GetFirstMemFree() const diff --git a/services/distributeddataservice/test/common/distributeddb/src/kv_store_observer_impl.cpp b/services/distributeddataservice/test/common/distributeddb/src/kv_store_observer_impl.cpp index 60bf9f9ba605f1bc9df5f65370aea0dfa88da48e..ecc20842564bbb66e4790712772533ec6f38e836 100644 --- a/services/distributeddataservice/test/common/distributeddb/src/kv_store_observer_impl.cpp +++ b/services/distributeddataservice/test/common/distributeddb/src/kv_store_observer_impl.cpp @@ -114,7 +114,7 @@ void KvStoreObserverImpl::WaitUntilReachChangeCount(unsigned int countGoal, uint } // Change count has not reach countGoal auto waitChangeFunc = [this, countGoal]()->bool { - MST_LOG("############################ realChanged=%d, countGoal=%d", this->changed_, countGoal); + MST_LOG("############################ realChanged=%d, countGoal=%u", this->changed_, countGoal); return this->changed_ >= countGoal; }; MST_LOG("############################ BEGIN ############################"); diff --git a/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_kv_crud_test.cpp b/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_kv_crud_test.cpp index dd0441762e0d37db9ce8657ec4ad87c36f1e6d70..16b064a468f176ef4e67f18562db2bd0d3ff9a89 100755 --- a/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_kv_crud_test.cpp +++ b/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_kv_crud_test.cpp @@ -458,7 +458,7 @@ HWTEST_F(DistributeddbKvCrudTest, ComplexDataTest002, TestSize.Level1) /* * @tc.name: ComplexDataTest 003 - * @tc.desc: Verify that can operate a alphanum string key. + * @tc.desc: Verify that can operate an alphanum string key. * @tc.type: FUNC * @tc.require: SR000BUH3J * @tc.author: luqianfu diff --git a/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_nb_autolaunch_test.cpp b/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_nb_autolaunch_test.cpp index a3cc731d91c90dcde1f47d0f063c2a4403750383..bfb03d708f148b23f09c619e6c2e6cf310437957 100644 --- a/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_nb_autolaunch_test.cpp +++ b/services/distributeddataservice/test/moduletest/common/distributeddb/src/distributeddb_nb_autolaunch_test.cpp @@ -423,7 +423,7 @@ HWTEST_F(DistributeddbNbAutolaunchTest, ParamCheck006, TestSize.Level0) EXPECT_EQ(manager->SetKvStoreConfig({ .dataDir = DistributedDBConstant::NB_DIRECTOR }), OK); /** * @tc.steps: step1. call EnableKvStoreAutoLaunch use the option with which createIfNecessary is true, - * isEncryptedDb = false, and different dataDir that include many special charaters; + * isEncryptedDb = false, and different dataDir that include many special characters; * @tc.expected: step1. enable success, and return OK. */ string middlePath = "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd/"