diff --git a/examples/quick-start/.clang-format b/examples/quick-start/.clang-format index 60d597e36..1b2d9229d 100644 --- a/examples/quick-start/.clang-format +++ b/examples/quick-start/.clang-format @@ -1,16 +1,13 @@ BasedOnStyle: "InheritParentConfig" IncludeCategories: - # NOTE: A header is grouped by first matching regex - # Project headers - - Regex: "^\"" - Priority: 4 - # Library headers. Update when adding new libraries. + # NOTE: A header is grouped by first matching regex library headers. # NOTE: clang-format retains leading white-space on a line in violation of the YAML spec. - # Ex: - # - Regex: "<(fmt|spdlog)" - # Priority: 3 - - Regex: "^<(absl|boost|catch2|fmt|mariadb|msgpack|spdlog|spider)" + # Project library headers + - Regex: "^" @@ -18,3 +15,6 @@ IncludeCategories: # C++ standard libraries - Regex: "^<.+>" Priority: 2 + # Project relative headers + - Regex: "^\".+\"" + Priority: 5 diff --git a/src/spider/.clang-format b/src/spider/.clang-format index 18897e341..1b2d9229d 100644 --- a/src/spider/.clang-format +++ b/src/spider/.clang-format @@ -1,15 +1,12 @@ BasedOnStyle: "InheritParentConfig" IncludeCategories: - # NOTE: A header is grouped by first matching regex - # Project headers + # NOTE: A header is grouped by first matching regex library headers. + # NOTE: clang-format retains leading white-space on a line in violation of the YAML spec. + # Project library headers - Regex: "^" Priority: 2 + # Project relative headers + - Regex: "^\".+\"" + Priority: 5 diff --git a/src/spider/CMakeLists.txt b/src/spider/CMakeLists.txt index b3f92f4ab..c1a4458a1 100644 --- a/src/spider/CMakeLists.txt +++ b/src/spider/CMakeLists.txt @@ -43,7 +43,7 @@ set(SPIDER_CORE_HEADERS add_library(spider_core) target_sources(spider_core PRIVATE ${SPIDER_CORE_SOURCES}) -target_sources(spider_core PUBLIC ${SPIDER_CORE_HEADERS}) +target_include_directories(spider_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) target_link_libraries( spider_core PUBLIC diff --git a/src/spider/client/Data.hpp b/src/spider/client/Data.hpp index 9ef8116ef..f3d7b89e1 100644 --- a/src/spider/client/Data.hpp +++ b/src/spider/client/Data.hpp @@ -11,13 +11,13 @@ #include -#include "../core/Error.hpp" -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "Exception.hpp" +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include namespace spider { namespace core { diff --git a/src/spider/client/Driver.cpp b/src/spider/client/Driver.cpp index f4acb8fad..a15f32502 100644 --- a/src/spider/client/Driver.cpp +++ b/src/spider/client/Driver.cpp @@ -12,13 +12,13 @@ #include #include -#include "../core/Driver.hpp" -#include "../core/Error.hpp" -#include "../core/KeyValueData.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../storage/mysql/MySqlStorageFactory.hpp" -#include "../storage/StorageConnection.hpp" -#include "Exception.hpp" +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include namespace spider { Driver::Driver(std::string const& storage_url) diff --git a/src/spider/client/Driver.hpp b/src/spider/client/Driver.hpp index 5baafe08f..e9ba87d6c 100644 --- a/src/spider/client/Driver.hpp +++ b/src/spider/client/Driver.hpp @@ -8,26 +8,26 @@ #include #include #include +#include #include #include #include #include -#include "../core/Error.hpp" -#include "../core/TaskGraphImpl.hpp" -#include "../io/Serializer.hpp" -#include "../storage/JobSubmissionBatch.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "../worker/FunctionManager.hpp" -#include "../worker/FunctionNameManager.hpp" -#include "Data.hpp" -#include "Exception.hpp" -#include "Job.hpp" -#include "task.hpp" -#include "TaskGraph.hpp" -#include "utility" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** * Registers a Task function with Spider diff --git a/src/spider/client/Job.hpp b/src/spider/client/Job.hpp index 58ffa5083..415dc4111 100644 --- a/src/spider/client/Job.hpp +++ b/src/spider/client/Job.hpp @@ -16,17 +16,17 @@ #include #include -#include "../core/DataImpl.hpp" -#include "../core/Error.hpp" -#include "../core/JobMetadata.hpp" -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "Data.hpp" -#include "Exception.hpp" -#include "task.hpp" -#include "type_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include namespace spider { namespace core { diff --git a/src/spider/client/TaskContext.cpp b/src/spider/client/TaskContext.cpp index 75dc6474b..64f1d7881 100644 --- a/src/spider/client/TaskContext.cpp +++ b/src/spider/client/TaskContext.cpp @@ -9,10 +9,10 @@ #include -#include "../core/Error.hpp" -#include "../core/KeyValueData.hpp" -#include "../storage/StorageConnection.hpp" -#include "Exception.hpp" +#include +#include +#include +#include namespace spider { auto TaskContext::get_id() const -> boost::uuids::uuid { diff --git a/src/spider/client/TaskContext.hpp b/src/spider/client/TaskContext.hpp index 904a944f7..0a8696287 100644 --- a/src/spider/client/TaskContext.hpp +++ b/src/spider/client/TaskContext.hpp @@ -15,17 +15,17 @@ #include #include -#include "../core/Error.hpp" -#include "../core/TaskGraph.hpp" -#include "../core/TaskGraphImpl.hpp" -#include "../io/Serializer.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "Data.hpp" -#include "Exception.hpp" -#include "Job.hpp" -#include "task.hpp" -#include "TaskGraph.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spider { namespace core { diff --git a/src/spider/client/TaskGraph.hpp b/src/spider/client/TaskGraph.hpp index c5f4f18a8..aa4bf2c21 100644 --- a/src/spider/client/TaskGraph.hpp +++ b/src/spider/client/TaskGraph.hpp @@ -4,7 +4,7 @@ #include #include -#include "task.hpp" +#include namespace spider { namespace core { diff --git a/src/spider/client/spider.hpp b/src/spider/client/spider.hpp index 67fd00566..fb41d51d3 100644 --- a/src/spider/client/spider.hpp +++ b/src/spider/client/spider.hpp @@ -2,11 +2,11 @@ #define SPIDER_CLIENT_SPIDER_HPP // IWYU pragma: begin_exports -#include "Data.hpp" -#include "Driver.hpp" -#include "Job.hpp" -#include "TaskContext.hpp" -#include "TaskGraph.hpp" +#include +#include +#include +#include +#include // IWYU pragma: end_exports diff --git a/src/spider/client/task.hpp b/src/spider/client/task.hpp index fffae7175..46d543022 100644 --- a/src/spider/client/task.hpp +++ b/src/spider/client/task.hpp @@ -3,9 +3,9 @@ #include -#include "../io/Serializer.hpp" -#include "Data.hpp" -#include "type_utils.hpp" +#include +#include +#include namespace spider { /** diff --git a/src/spider/core/DataImpl.hpp b/src/spider/core/DataImpl.hpp index fa60e7be0..bd7001399 100644 --- a/src/spider/core/DataImpl.hpp +++ b/src/spider/core/DataImpl.hpp @@ -4,9 +4,9 @@ #include #include -#include "../client/Data.hpp" -#include "../storage/StorageFactory.hpp" -#include "Data.hpp" +#include +#include +#include namespace spider::core { class DataImpl { diff --git a/src/spider/core/Task.cpp b/src/spider/core/Task.cpp index cd769bc6d..a3b6f3855 100644 --- a/src/spider/core/Task.cpp +++ b/src/spider/core/Task.cpp @@ -9,8 +9,8 @@ #include #include -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::core { auto Task::get_arg_buffers() const -> std::optional> { diff --git a/src/spider/core/Task.hpp b/src/spider/core/Task.hpp index fc25f4ecb..5c7e5d8af 100644 --- a/src/spider/core/Task.hpp +++ b/src/spider/core/Task.hpp @@ -13,8 +13,8 @@ #include #include -#include "../io/MsgPack.hpp" -#include "Data.hpp" +#include +#include namespace spider::core { class TaskInput { diff --git a/src/spider/core/TaskContextImpl.hpp b/src/spider/core/TaskContextImpl.hpp index d5b672081..18e55e149 100644 --- a/src/spider/core/TaskContextImpl.hpp +++ b/src/spider/core/TaskContextImpl.hpp @@ -5,10 +5,10 @@ #include -#include "../client/TaskContext.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageFactory.hpp" +#include +#include +#include +#include namespace spider::core { class TaskContextImpl { diff --git a/src/spider/core/TaskGraph.hpp b/src/spider/core/TaskGraph.hpp index cb49a22fc..49e76f7da 100644 --- a/src/spider/core/TaskGraph.hpp +++ b/src/spider/core/TaskGraph.hpp @@ -12,7 +12,7 @@ #include #include -#include "Task.hpp" +#include namespace spider::core { class TaskGraph { diff --git a/src/spider/core/TaskGraphImpl.hpp b/src/spider/core/TaskGraphImpl.hpp index eb97b40f4..a4674993b 100644 --- a/src/spider/core/TaskGraphImpl.hpp +++ b/src/spider/core/TaskGraphImpl.hpp @@ -11,14 +11,14 @@ #include -#include "../client/Data.hpp" -#include "../client/task.hpp" -#include "../client/type_utils.hpp" -#include "../core/Task.hpp" -#include "../core/TaskGraph.hpp" -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" // IWYU pragma: keep -#include "../worker/FunctionNameManager.hpp" +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include namespace spider::core { class Data; diff --git a/src/spider/io/Serializer.hpp b/src/spider/io/Serializer.hpp index 517bc758b..2c1c26687 100644 --- a/src/spider/io/Serializer.hpp +++ b/src/spider/io/Serializer.hpp @@ -6,7 +6,7 @@ #include -#include "MsgPack.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep template <> struct msgpack::adaptor::convert { diff --git a/src/spider/io/msgpack_message.cpp b/src/spider/io/msgpack_message.cpp index ccb449018..4f04bf3db 100644 --- a/src/spider/io/msgpack_message.cpp +++ b/src/spider/io/msgpack_message.cpp @@ -14,8 +14,8 @@ #include -#include "BoostAsio.hpp" // IWYU pragma: keep -#include "MsgPack.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace { /** diff --git a/src/spider/io/msgpack_message.hpp b/src/spider/io/msgpack_message.hpp index 9293ca444..3ad8ace73 100644 --- a/src/spider/io/msgpack_message.hpp +++ b/src/spider/io/msgpack_message.hpp @@ -4,8 +4,8 @@ #include #include -#include "BoostAsio.hpp" // IWYU pragma: keep -#include "MsgPack.hpp" // IWYU pragma :keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::core { auto send_message(boost::asio::ip::tcp::socket& socket, msgpack::sbuffer const& buffer) -> bool; diff --git a/src/spider/scheduler/FifoPolicy.cpp b/src/spider/scheduler/FifoPolicy.cpp index a50c07a6e..4faf4e5ad 100644 --- a/src/spider/scheduler/FifoPolicy.cpp +++ b/src/spider/scheduler/FifoPolicy.cpp @@ -10,10 +10,10 @@ #include -#include "../core/Task.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" +#include +#include +#include +#include namespace spider::scheduler { FifoPolicy::FifoPolicy( diff --git a/src/spider/scheduler/FifoPolicy.hpp b/src/spider/scheduler/FifoPolicy.hpp index adf91842e..e55568398 100644 --- a/src/spider/scheduler/FifoPolicy.hpp +++ b/src/spider/scheduler/FifoPolicy.hpp @@ -8,11 +8,11 @@ #include -#include "../core/Task.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "SchedulerPolicy.hpp" +#include +#include +#include +#include +#include namespace spider::scheduler { class FifoPolicy final : public SchedulerPolicy { diff --git a/src/spider/scheduler/SchedulerMessage.hpp b/src/spider/scheduler/SchedulerMessage.hpp index 1367271ea..eded1b5e6 100644 --- a/src/spider/scheduler/SchedulerMessage.hpp +++ b/src/spider/scheduler/SchedulerMessage.hpp @@ -7,8 +7,8 @@ #include -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::scheduler { class ScheduleTaskRequest { diff --git a/src/spider/scheduler/SchedulerServer.cpp b/src/spider/scheduler/SchedulerServer.cpp index 1324189e7..2fe0409f5 100644 --- a/src/spider/scheduler/SchedulerServer.cpp +++ b/src/spider/scheduler/SchedulerServer.cpp @@ -11,17 +11,17 @@ #include #include -#include "../core/Error.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/msgpack_message.hpp" -#include "../io/Serializer.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "../utils/StopFlag.hpp" -#include "SchedulerMessage.hpp" -#include "SchedulerPolicy.hpp" +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include namespace spider::scheduler { SchedulerServer::SchedulerServer( diff --git a/src/spider/scheduler/SchedulerServer.hpp b/src/spider/scheduler/SchedulerServer.hpp index 933a4ac91..898a482d4 100644 --- a/src/spider/scheduler/SchedulerServer.hpp +++ b/src/spider/scheduler/SchedulerServer.hpp @@ -5,11 +5,11 @@ #include #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "SchedulerPolicy.hpp" +#include // IWYU pragma: keep +#include +#include +#include +#include namespace spider::scheduler { class SchedulerServer { diff --git a/src/spider/scheduler/scheduler.cpp b/src/spider/scheduler/scheduler.cpp index 562042870..8679eab4c 100644 --- a/src/spider/scheduler/scheduler.cpp +++ b/src/spider/scheduler/scheduler.cpp @@ -20,18 +20,18 @@ #include // IWYU pragma: keep #include -#include "../core/Driver.hpp" -#include "../core/Error.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/mysql/MySqlStorageFactory.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "../utils/StopFlag.hpp" -#include "FifoPolicy.hpp" -#include "SchedulerPolicy.hpp" -#include "SchedulerServer.hpp" +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include +#include +#include constexpr int cCmdArgParseErr = 1; constexpr int cSignalHandleErr = 2; diff --git a/src/spider/storage/DataStorage.hpp b/src/spider/storage/DataStorage.hpp index 79713111e..c9c88f56c 100644 --- a/src/spider/storage/DataStorage.hpp +++ b/src/spider/storage/DataStorage.hpp @@ -5,10 +5,10 @@ #include -#include "../core/Data.hpp" -#include "../core/Error.hpp" -#include "../core/KeyValueData.hpp" -#include "StorageConnection.hpp" +#include +#include +#include +#include namespace spider::core { class DataStorage { diff --git a/src/spider/storage/JobSubmissionBatch.hpp b/src/spider/storage/JobSubmissionBatch.hpp index 06d51bbc8..3250edf04 100644 --- a/src/spider/storage/JobSubmissionBatch.hpp +++ b/src/spider/storage/JobSubmissionBatch.hpp @@ -1,8 +1,8 @@ #ifndef SPIDER_STORAGE_JOBSUBMISSIONBATCH_HPP #define SPIDER_STORAGE_JOBSUBMISSIONBATCH_HPP -#include "../core/Error.hpp" -#include "StorageConnection.hpp" +#include +#include namespace spider::core { class JobSubmissionBatch { diff --git a/src/spider/storage/MetadataStorage.hpp b/src/spider/storage/MetadataStorage.hpp index 91f733b70..dca6b4466 100644 --- a/src/spider/storage/MetadataStorage.hpp +++ b/src/spider/storage/MetadataStorage.hpp @@ -6,13 +6,13 @@ #include -#include "../core/Driver.hpp" -#include "../core/Error.hpp" -#include "../core/JobMetadata.hpp" -#include "../core/Task.hpp" -#include "../core/TaskGraph.hpp" -#include "JobSubmissionBatch.hpp" -#include "StorageConnection.hpp" +#include +#include +#include +#include +#include +#include +#include namespace spider::core { class MetadataStorage { diff --git a/src/spider/storage/StorageFactory.hpp b/src/spider/storage/StorageFactory.hpp index 4cfca3c28..d349de0a5 100644 --- a/src/spider/storage/StorageFactory.hpp +++ b/src/spider/storage/StorageFactory.hpp @@ -4,11 +4,11 @@ #include #include -#include "../core/Error.hpp" -#include "DataStorage.hpp" -#include "JobSubmissionBatch.hpp" -#include "MetadataStorage.hpp" -#include "StorageConnection.hpp" +#include +#include +#include +#include +#include namespace spider::core { class StorageFactory { diff --git a/src/spider/storage/mysql/MySqlConnection.cpp b/src/spider/storage/mysql/MySqlConnection.cpp index 0ed5fb04f..c0ce21f70 100644 --- a/src/spider/storage/mysql/MySqlConnection.cpp +++ b/src/spider/storage/mysql/MySqlConnection.cpp @@ -12,8 +12,8 @@ #include #include -#include "../../core/Error.hpp" -#include "../StorageConnection.hpp" +#include +#include namespace spider::core { auto MySqlConnection::create(std::string const& url) diff --git a/src/spider/storage/mysql/MySqlConnection.hpp b/src/spider/storage/mysql/MySqlConnection.hpp index 6c14f3670..f7e933ea8 100644 --- a/src/spider/storage/mysql/MySqlConnection.hpp +++ b/src/spider/storage/mysql/MySqlConnection.hpp @@ -8,8 +8,8 @@ #include -#include "../../core/Error.hpp" -#include "../StorageConnection.hpp" +#include +#include namespace spider::core { // Forward declaration for friend class diff --git a/src/spider/storage/mysql/MySqlJobSubmissionBatch.cpp b/src/spider/storage/mysql/MySqlJobSubmissionBatch.cpp index 84014b08c..516c04222 100644 --- a/src/spider/storage/mysql/MySqlJobSubmissionBatch.cpp +++ b/src/spider/storage/mysql/MySqlJobSubmissionBatch.cpp @@ -4,10 +4,10 @@ #include #include -#include "../../core/Error.hpp" -#include "../StorageConnection.hpp" -#include "mysql_stmt.hpp" -#include "MySqlConnection.hpp" +#include +#include +#include +#include namespace spider::core { // NOLINTBEGIN(cppcoreguidelines-pro-type-static-cast-downcast) diff --git a/src/spider/storage/mysql/MySqlJobSubmissionBatch.hpp b/src/spider/storage/mysql/MySqlJobSubmissionBatch.hpp index 532457da7..4c47829e6 100644 --- a/src/spider/storage/mysql/MySqlJobSubmissionBatch.hpp +++ b/src/spider/storage/mysql/MySqlJobSubmissionBatch.hpp @@ -5,9 +5,9 @@ #include -#include "../../core/Error.hpp" -#include "../JobSubmissionBatch.hpp" -#include "../StorageConnection.hpp" +#include +#include +#include namespace spider::core { // Forward declaration for friend class diff --git a/src/spider/storage/mysql/MySqlStorage.cpp b/src/spider/storage/mysql/MySqlStorage.cpp index 7678f69b8..bb23bf7b9 100644 --- a/src/spider/storage/mysql/MySqlStorage.cpp +++ b/src/spider/storage/mysql/MySqlStorage.cpp @@ -28,18 +28,18 @@ #include #include -#include "../../core/Data.hpp" -#include "../../core/Driver.hpp" -#include "../../core/Error.hpp" -#include "../../core/JobMetadata.hpp" -#include "../../core/KeyValueData.hpp" -#include "../../core/Task.hpp" -#include "../../core/TaskGraph.hpp" -#include "../JobSubmissionBatch.hpp" -#include "../StorageConnection.hpp" -#include "mysql_stmt.hpp" -#include "MySqlConnection.hpp" -#include "MySqlJobSubmissionBatch.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // mariadb-connector-cpp does not define SQL errcode. Just include some useful ones. enum MariadbErr : uint16_t { diff --git a/src/spider/storage/mysql/MySqlStorage.hpp b/src/spider/storage/mysql/MySqlStorage.hpp index 6fb2c708d..ecf96ee5b 100644 --- a/src/spider/storage/mysql/MySqlStorage.hpp +++ b/src/spider/storage/mysql/MySqlStorage.hpp @@ -10,19 +10,19 @@ #include #include -#include "../../core/Data.hpp" -#include "../../core/Driver.hpp" -#include "../../core/Error.hpp" -#include "../../core/JobMetadata.hpp" -#include "../../core/KeyValueData.hpp" -#include "../../core/Task.hpp" -#include "../../core/TaskGraph.hpp" -#include "../DataStorage.hpp" -#include "../JobSubmissionBatch.hpp" -#include "../MetadataStorage.hpp" -#include "../StorageConnection.hpp" -#include "MySqlConnection.hpp" -#include "MySqlJobSubmissionBatch.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace spider::core { // Forward declaration for friend class diff --git a/src/spider/storage/mysql/MySqlStorageFactory.cpp b/src/spider/storage/mysql/MySqlStorageFactory.cpp index 30c9061b6..ff0d48cd3 100644 --- a/src/spider/storage/mysql/MySqlStorageFactory.cpp +++ b/src/spider/storage/mysql/MySqlStorageFactory.cpp @@ -5,14 +5,14 @@ #include #include -#include "../../core/Error.hpp" -#include "../DataStorage.hpp" -#include "../JobSubmissionBatch.hpp" -#include "../MetadataStorage.hpp" -#include "../StorageConnection.hpp" -#include "MySqlConnection.hpp" -#include "MySqlJobSubmissionBatch.hpp" -#include "MySqlStorage.hpp" +#include +#include +#include +#include +#include +#include +#include +#include namespace spider::core { MySqlStorageFactory::MySqlStorageFactory(std::string url) : m_url{std::move(url)} {} diff --git a/src/spider/storage/mysql/MySqlStorageFactory.hpp b/src/spider/storage/mysql/MySqlStorageFactory.hpp index fe00d3fa5..65c17ad91 100644 --- a/src/spider/storage/mysql/MySqlStorageFactory.hpp +++ b/src/spider/storage/mysql/MySqlStorageFactory.hpp @@ -5,12 +5,12 @@ #include #include -#include "../../core/Error.hpp" -#include "../DataStorage.hpp" -#include "../JobSubmissionBatch.hpp" -#include "../MetadataStorage.hpp" -#include "../StorageConnection.hpp" -#include "../StorageFactory.hpp" +#include +#include +#include +#include +#include +#include namespace spider::core { class MySqlStorageFactory : public StorageFactory { diff --git a/src/spider/worker/DllLoader.cpp b/src/spider/worker/DllLoader.cpp index 1b202a25d..56d5279ad 100644 --- a/src/spider/worker/DllLoader.cpp +++ b/src/spider/worker/DllLoader.cpp @@ -8,8 +8,8 @@ #include #include -#include "../worker/FunctionManager.hpp" -#include "../worker/FunctionNameManager.hpp" +#include +#include namespace spider::worker { auto DllLoader::load_dll(std::string const& path_str) -> bool { diff --git a/src/spider/worker/FunctionManager.cpp b/src/spider/worker/FunctionManager.cpp index 66cd3845a..9c0c26225 100644 --- a/src/spider/worker/FunctionManager.cpp +++ b/src/spider/worker/FunctionManager.cpp @@ -11,8 +11,8 @@ #include #include -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "TaskExecutorMessage.hpp" +#include // IWYU pragma: keep +#include namespace spider::core { auto response_get_error(msgpack::sbuffer const& buffer) diff --git a/src/spider/worker/FunctionManager.hpp b/src/spider/worker/FunctionManager.hpp index 672451c93..7a5982b60 100644 --- a/src/spider/worker/FunctionManager.hpp +++ b/src/spider/worker/FunctionManager.hpp @@ -17,17 +17,17 @@ #include #include -#include "../client/Data.hpp" -#include "../client/task.hpp" -#include "../client/TaskContext.hpp" -#include "../core/DataImpl.hpp" -#include "../core/Error.hpp" -#include "../core/TaskContextImpl.hpp" -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "TaskExecutorMessage.hpp" +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include // NOLINTBEGIN(cppcoreguidelines-macro-usage) #define CONCAT_DIRECT(s1, s2) s1##s2 diff --git a/src/spider/worker/TaskExecutor.cpp b/src/spider/worker/TaskExecutor.cpp index b4a9f7fff..88c787c26 100644 --- a/src/spider/worker/TaskExecutor.cpp +++ b/src/spider/worker/TaskExecutor.cpp @@ -10,11 +10,11 @@ #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "FunctionManager.hpp" -#include "message_pipe.hpp" -#include "TaskExecutorMessage.hpp" +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include namespace spider::worker { auto TaskExecutor::get_pid() const -> pid_t { diff --git a/src/spider/worker/TaskExecutor.hpp b/src/spider/worker/TaskExecutor.hpp index e417adc70..3fc19caf4 100644 --- a/src/spider/worker/TaskExecutor.hpp +++ b/src/spider/worker/TaskExecutor.hpp @@ -21,11 +21,11 @@ #include #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "FunctionManager.hpp" -#include "message_pipe.hpp" -#include "Process.hpp" +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include namespace spider::worker { enum class TaskExecutorState : std::uint8_t { diff --git a/src/spider/worker/TaskExecutorMessage.hpp b/src/spider/worker/TaskExecutorMessage.hpp index a26279a14..58de0a21b 100644 --- a/src/spider/worker/TaskExecutorMessage.hpp +++ b/src/spider/worker/TaskExecutorMessage.hpp @@ -3,7 +3,7 @@ #include -#include "../io/MsgPack.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::worker { enum class TaskExecutorResponseType : std::uint8_t { diff --git a/src/spider/worker/WorkerClient.cpp b/src/spider/worker/WorkerClient.cpp index 489c116cf..6435ec629 100644 --- a/src/spider/worker/WorkerClient.cpp +++ b/src/spider/worker/WorkerClient.cpp @@ -15,17 +15,17 @@ #include #include -#include "../core/Driver.hpp" -#include "../core/Error.hpp" -#include "../core/Task.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/msgpack_message.hpp" -#include "../scheduler/SchedulerMessage.hpp" -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" +#include +#include +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include namespace spider::worker { WorkerClient::WorkerClient( diff --git a/src/spider/worker/WorkerClient.hpp b/src/spider/worker/WorkerClient.hpp index 11f189176..33bf78b56 100644 --- a/src/spider/worker/WorkerClient.hpp +++ b/src/spider/worker/WorkerClient.hpp @@ -8,10 +8,10 @@ #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/StorageFactory.hpp" +#include // IWYU pragma: keep +#include +#include +#include namespace spider::worker { class WorkerClient { diff --git a/src/spider/worker/message_pipe.cpp b/src/spider/worker/message_pipe.cpp index 0d8323ea5..189712839 100644 --- a/src/spider/worker/message_pipe.cpp +++ b/src/spider/worker/message_pipe.cpp @@ -11,8 +11,8 @@ #include #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::worker { constexpr size_t cHeaderSize = 16; diff --git a/src/spider/worker/message_pipe.hpp b/src/spider/worker/message_pipe.hpp index 6d70f700d..719d46ea4 100644 --- a/src/spider/worker/message_pipe.hpp +++ b/src/spider/worker/message_pipe.hpp @@ -4,8 +4,8 @@ #include #include -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep namespace spider::worker { auto send_message(boost::asio::writable_pipe& pipe, msgpack::sbuffer const& request) -> bool; diff --git a/src/spider/worker/task_executor.cpp b/src/spider/worker/task_executor.cpp index f64916399..8382d4140 100644 --- a/src/spider/worker/task_executor.cpp +++ b/src/spider/worker/task_executor.cpp @@ -20,17 +20,17 @@ #include // IWYU pragma: keep #include -#include "../client/TaskContext.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/mysql/MySqlStorageFactory.hpp" -#include "../storage/StorageFactory.hpp" -#include "DllLoader.hpp" -#include "FunctionManager.hpp" -#include "message_pipe.hpp" -#include "TaskExecutorMessage.hpp" +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include +#include namespace { auto parse_arg(int const argc, char** const& argv) -> boost::program_options::variables_map { diff --git a/src/spider/worker/worker.cpp b/src/spider/worker/worker.cpp index d494827af..ade6ce6bc 100644 --- a/src/spider/worker/worker.cpp +++ b/src/spider/worker/worker.cpp @@ -33,22 +33,22 @@ #include // IWYU pragma: keep #include -#include "../core/Data.hpp" -#include "../core/Driver.hpp" -#include "../core/Error.hpp" -#include "../core/Task.hpp" -#include "../io/BoostAsio.hpp" // IWYU pragma: keep -#include "../io/MsgPack.hpp" // IWYU pragma: keep -#include "../io/Serializer.hpp" // IWYU pragma: keep -#include "../storage/DataStorage.hpp" -#include "../storage/MetadataStorage.hpp" -#include "../storage/mysql/MySqlStorageFactory.hpp" -#include "../storage/StorageConnection.hpp" -#include "../storage/StorageFactory.hpp" -#include "../utils/StopFlag.hpp" -#include "ChildPid.hpp" -#include "TaskExecutor.hpp" -#include "WorkerClient.hpp" +#include +#include +#include +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include +#include +#include constexpr int cCmdArgParseErr = 1; constexpr int cSignalHandleErr = 2; diff --git a/tests/.clang-format b/tests/.clang-format index 06150eeaf..addca8add 100644 --- a/tests/.clang-format +++ b/tests/.clang-format @@ -1,16 +1,13 @@ BasedOnStyle: "InheritParentConfig" IncludeCategories: - # NOTE: A header is grouped by first matching regex - # Project headers - - Regex: "^" @@ -18,3 +15,6 @@ IncludeCategories: # C++ standard libraries - Regex: "^<.+>" Priority: 2 + # Project relative headers + - Regex: "^\".+\"" + Priority: 5 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3e9b66468..a04b1c584 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,6 +19,7 @@ set(SPIDER_TEST_SOURCES add_executable(unitTest) target_sources(unitTest PRIVATE ${SPIDER_TEST_SOURCES}) +target_include_directories(unitTest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) set(SPIDER_TEST_WORKER_SOURCES) foreach(worker_source ${SPIDER_WORKER_SOURCES}) @@ -54,6 +55,7 @@ add_dependencies(unitTest worker_test) add_library(worker_test SHARED) target_sources(worker_test PUBLIC worker/worker-test.hpp) target_sources(worker_test PRIVATE worker/worker-test.cpp) +target_include_directories(worker_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) target_link_libraries( worker_test PRIVATE @@ -76,6 +78,7 @@ target_link_libraries( add_library(signal_test SHARED) target_sources(signal_test PUBLIC worker/signal-test.hpp) target_sources(signal_test PRIVATE worker/signal-test.cpp) +target_include_directories(signal_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) target_link_libraries( signal_test PRIVATE diff --git a/tests/client/client-test.cpp b/tests/client/client-test.cpp index a5d49b0e8..56c03061c 100644 --- a/tests/client/client-test.cpp +++ b/tests/client/client-test.cpp @@ -12,11 +12,11 @@ #include // IWYU pragma: keep #include -#include "../../src/spider/client/Data.hpp" -#include "../../src/spider/client/Driver.hpp" -#include "../../src/spider/client/Job.hpp" -#include "../../src/spider/client/TaskGraph.hpp" -#include "../worker/worker-test.hpp" +#include +#include +#include +#include +#include namespace { auto parse_args(int const argc, char** argv) -> boost::program_options::variables_map { diff --git a/tests/client/test-Driver.cpp b/tests/client/test-Driver.cpp index 2dbbebafd..2b26fb61a 100644 --- a/tests/client/test-Driver.cpp +++ b/tests/client/test-Driver.cpp @@ -6,11 +6,11 @@ #include #include -#include "../../src/spider/client/Data.hpp" -#include "../../src/spider/client/Driver.hpp" -#include "../../src/spider/client/TaskContext.hpp" -#include "../../src/spider/client/TaskGraph.hpp" -#include "../storage/StorageTestHelper.hpp" +#include +#include +#include +#include +#include namespace { TEMPLATE_LIST_TEST_CASE( diff --git a/tests/io/test-MsgpackMessage.cpp b/tests/io/test-MsgpackMessage.cpp index 4885628b9..2a446f664 100644 --- a/tests/io/test-MsgpackMessage.cpp +++ b/tests/io/test-MsgpackMessage.cpp @@ -10,9 +10,9 @@ #include -#include "../../src/spider/io/BoostAsio.hpp" // IWYU pragma: keep -#include "../../src/spider/io/MsgPack.hpp" // IWYU pragma: keep -#include "../../src/spider/io/msgpack_message.hpp" +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include namespace { using namespace boost::asio::ip; diff --git a/tests/scheduler/test-SchedulerPolicy.cpp b/tests/scheduler/test-SchedulerPolicy.cpp index a6fd555a5..167bc78ea 100644 --- a/tests/scheduler/test-SchedulerPolicy.cpp +++ b/tests/scheduler/test-SchedulerPolicy.cpp @@ -12,17 +12,17 @@ #include #include -#include "../../src/spider/core/Data.hpp" -#include "../../src/spider/core/Driver.hpp" -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/scheduler/FifoPolicy.hpp" -#include "../../src/spider/storage/DataStorage.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../storage/StorageTestHelper.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { TEMPLATE_LIST_TEST_CASE( diff --git a/tests/scheduler/test-SchedulerServer.cpp b/tests/scheduler/test-SchedulerServer.cpp index 9deb2006d..c51070bb3 100644 --- a/tests/scheduler/test-SchedulerServer.cpp +++ b/tests/scheduler/test-SchedulerServer.cpp @@ -12,21 +12,21 @@ #include #include -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/io/BoostAsio.hpp" // IWYU pragma: keep -#include "../../src/spider/io/MsgPack.hpp" // IWYU pragma: keep -#include "../../src/spider/io/msgpack_message.hpp" -#include "../../src/spider/scheduler/FifoPolicy.hpp" -#include "../../src/spider/scheduler/SchedulerMessage.hpp" -#include "../../src/spider/scheduler/SchedulerPolicy.hpp" -#include "../../src/spider/scheduler/SchedulerServer.hpp" -#include "../../src/spider/storage/DataStorage.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../storage/StorageTestHelper.hpp" +#include +#include +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { constexpr int cServerWarmupTime = 5; diff --git a/tests/storage/StorageTestHelper.hpp b/tests/storage/StorageTestHelper.hpp index 0f9406ae2..737f47c27 100644 --- a/tests/storage/StorageTestHelper.hpp +++ b/tests/storage/StorageTestHelper.hpp @@ -7,8 +7,8 @@ #include #include -#include "../../src/spider/storage/mysql/MySqlStorageFactory.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" +#include +#include namespace spider::test { std::string const cMySqlStorageUrl diff --git a/tests/storage/test-DataStorage.cpp b/tests/storage/test-DataStorage.cpp index f47e4ee30..71fb009cd 100644 --- a/tests/storage/test-DataStorage.cpp +++ b/tests/storage/test-DataStorage.cpp @@ -8,18 +8,18 @@ #include #include -#include "../../src/spider/core/Data.hpp" -#include "../../src/spider/core/Driver.hpp" -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/KeyValueData.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/storage/DataStorage.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../utils/CoreDataUtils.hpp" -#include "StorageTestHelper.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { TEMPLATE_LIST_TEST_CASE( diff --git a/tests/storage/test-MetadataStorage.cpp b/tests/storage/test-MetadataStorage.cpp index a685b16d6..254fcc11e 100644 --- a/tests/storage/test-MetadataStorage.cpp +++ b/tests/storage/test-MetadataStorage.cpp @@ -13,17 +13,17 @@ #include #include -#include "../../src/spider/core/Driver.hpp" -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/JobMetadata.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/storage/JobSubmissionBatch.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../utils/CoreTaskUtils.hpp" -#include "StorageTestHelper.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { TEMPLATE_LIST_TEST_CASE("Driver heartbeat", "[storage]", spider::test::StorageFactoryTypeList) { diff --git a/tests/utils/CoreDataUtils.hpp b/tests/utils/CoreDataUtils.hpp index 0de998280..3136e6dfd 100644 --- a/tests/utils/CoreDataUtils.hpp +++ b/tests/utils/CoreDataUtils.hpp @@ -1,6 +1,6 @@ #ifndef SPIDER_TESTS_COREDATAUTILS_HPP #define SPIDER_TESTS_COREDATAUTILS_HPP -#include "../../src/spider/core/Data.hpp" +#include namespace spider::test { inline auto data_equal(core::Data const& d1, core::Data const& d2) -> bool { diff --git a/tests/utils/CoreTaskUtils.cpp b/tests/utils/CoreTaskUtils.cpp index ded571f1b..1bdaa640c 100644 --- a/tests/utils/CoreTaskUtils.cpp +++ b/tests/utils/CoreTaskUtils.cpp @@ -13,8 +13,8 @@ #include #include -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" +#include +#include namespace spider::test { namespace { diff --git a/tests/utils/CoreTaskUtils.hpp b/tests/utils/CoreTaskUtils.hpp index 7926a8e2d..5dcd9da5e 100644 --- a/tests/utils/CoreTaskUtils.hpp +++ b/tests/utils/CoreTaskUtils.hpp @@ -1,8 +1,8 @@ #ifndef SPIDER_TESTS_CORETASKUTILS_HPP #define SPIDER_TESTS_CORETASKUTILS_HPP -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" +#include +#include namespace spider::test { auto task_equal(core::Task const& t1, core::Task const& t2) -> bool; diff --git a/tests/worker/test-FunctionManager.cpp b/tests/worker/test-FunctionManager.cpp index 2f3b18d5a..d89ea7a95 100644 --- a/tests/worker/test-FunctionManager.cpp +++ b/tests/worker/test-FunctionManager.cpp @@ -11,21 +11,21 @@ #include #include -#include "../../src/spider/client/Data.hpp" -#include "../../src/spider/client/TaskContext.hpp" -#include "../../src/spider/core/Driver.hpp" -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskContextImpl.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/io/MsgPack.hpp" // IWYU pragma: keep -#include "../../src/spider/storage/DataStorage.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../../src/spider/worker/FunctionManager.hpp" -#include "../../src/spider/worker/FunctionNameManager.hpp" -#include "../storage/StorageTestHelper.hpp" +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include namespace { auto int_test(spider::TaskContext& /*context*/, int const x, int const y) -> int { diff --git a/tests/worker/test-MessagePipe.cpp b/tests/worker/test-MessagePipe.cpp index e810b2ceb..eab456b4e 100644 --- a/tests/worker/test-MessagePipe.cpp +++ b/tests/worker/test-MessagePipe.cpp @@ -6,11 +6,11 @@ #include -#include "../../src/spider/io/BoostAsio.hpp" -#include "../../src/spider/io/MsgPack.hpp" // IWYU pragma: keep -#include "../../src/spider/worker/FunctionManager.hpp" -#include "../../src/spider/worker/message_pipe.hpp" -#include "../../src/spider/worker/TaskExecutorMessage.hpp" +#include +#include // IWYU pragma: keep +#include +#include +#include // NOLINTBEGIN(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays) namespace { diff --git a/tests/worker/test-Process.cpp b/tests/worker/test-Process.cpp index e7eaf69b3..f26d2c24b 100644 --- a/tests/worker/test-Process.cpp +++ b/tests/worker/test-Process.cpp @@ -7,8 +7,8 @@ #include -#include "../../src/spider/io/BoostAsio.hpp" // IWYU pragma: keep -#include "../../src/spider/worker/Process.hpp" +#include // IWYU pragma: keep +#include namespace { TEST_CASE("Process exit", "[worker]") { diff --git a/tests/worker/test-TaskExecutor.cpp b/tests/worker/test-TaskExecutor.cpp index ea5b0f6df..1cca3cadf 100644 --- a/tests/worker/test-TaskExecutor.cpp +++ b/tests/worker/test-TaskExecutor.cpp @@ -16,20 +16,20 @@ #include #include -#include "../../src/spider/core/Data.hpp" -#include "../../src/spider/core/Driver.hpp" -#include "../../src/spider/core/Error.hpp" -#include "../../src/spider/core/Task.hpp" -#include "../../src/spider/core/TaskGraph.hpp" -#include "../../src/spider/io/BoostAsio.hpp" // IWYU pragma: keep -#include "../../src/spider/io/MsgPack.hpp" // IWYU pragma: keep -#include "../../src/spider/storage/DataStorage.hpp" -#include "../../src/spider/storage/MetadataStorage.hpp" -#include "../../src/spider/storage/StorageConnection.hpp" -#include "../../src/spider/storage/StorageFactory.hpp" -#include "../../src/spider/worker/FunctionManager.hpp" -#include "../../src/spider/worker/TaskExecutor.hpp" -#include "../storage/StorageTestHelper.hpp" +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include // NOLINTBEGIN(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,clang-analyzer-unix.BlockInCriticalSection)