From fd7d82fb4e07b657e0f0750d5eb24c5ef3bf1b3f Mon Sep 17 00:00:00 2001 From: "sergei.nikitin" Date: Mon, 25 Nov 2024 00:44:16 +0300 Subject: [PATCH] feat(cmake): Move to find_package This is preparation to unlock conan package build for otterbrix --- .github/workflows/csharp.yaml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu-20-04-aarch64.yaml | 2 +- .github/workflows/ubuntu-20-04.yaml | 2 +- .github/workflows/ubuntu-22-04.yaml | 2 +- CMakeLists.txt | 27 +++++++---- components/CMakeLists.txt | 1 + components/context/CMakeLists.txt | 28 +++++++++++ .../{physical_plan => context}/context.cpp | 0 .../{physical_plan => context}/context.hpp | 0 components/cursor/CMakeLists.txt | 5 +- components/cursor/tests/CMakeLists.txt | 4 +- components/document/CMakeLists.txt | 7 +-- components/document/benchmark/CMakeLists.txt | 2 +- components/document/document_id.hpp | 2 +- components/document/test/CMakeLists.txt | 6 +-- components/expressions/CMakeLists.txt | 4 +- components/expressions/test/CMakeLists.txt | 4 ++ components/index/CMakeLists.txt | 4 +- components/index/index_engine.hpp | 2 +- components/index/test/CMakeLists.txt | 3 +- components/log/CMakeLists.txt | 6 +-- components/log/test/CMakeLists.txt | 6 +-- components/logical_plan/CMakeLists.txt | 2 +- components/oid/test/CMakeLists.txt | 5 ++ components/physical_plan/CMakeLists.txt | 9 ++-- .../collection/operators/operator.hpp | 3 +- .../collection/operators/operator_join.hpp | 2 +- components/physical_plan/tests/CMakeLists.txt | 7 +-- .../physical_plan_generator/CMakeLists.txt | 9 ++-- .../tests/CMakeLists.txt | 9 ++-- components/planner/test/CMakeLists.txt | 2 + components/ql/CMakeLists.txt | 3 +- components/ql/join/join.hpp | 2 +- .../ql/join/{join_types.h => join_types.hpp} | 0 components/ql/test/CMakeLists.txt | 2 + components/sql/test/CMakeLists.txt | 1 + components/tests/CMakeLists.txt | 2 +- components/types/tests/CMakeLists.txt | 1 + conanfile.txt | 5 +- core/assert/tests/CMakeLists.txt | 3 +- core/b_plus_tree/CMakeLists.txt | 4 +- core/b_plus_tree/tests/CMakeLists.txt | 1 + core/btree/btree.hpp | 2 +- core/file/tests/CMakeLists.txt | 1 + core/non_thread_scheduler/CMakeLists.txt | 2 +- core/tests/CMakeLists.txt | 4 +- docker/Dockerfile-manylinux2014 | 2 +- docker/Dockerfile-ubuntu-20 | 2 +- docker/Dockerfile-ubuntu-20-address-sanitizer | 2 +- docker/Dockerfile-ubuntu-22 | 2 +- example/cpp/CMakeLists.txt | 6 +-- example/cpp/main.cpp | 47 ++++++++++--------- integration/c/test/CMakeLists.txt | 24 +++++----- integration/cpp/CMakeLists.txt | 44 ++++++++--------- .../benchmark/document_read/CMakeLists.txt | 2 +- .../cpp/benchmark/document_rw/CMakeLists.txt | 2 +- .../benchmark/document_write/CMakeLists.txt | 2 +- .../cpp/benchmark/index/CMakeLists.txt | 2 +- integration/cpp/otterbrix.cpp | 6 --- integration/cpp/test/CMakeLists.txt | 24 +++++----- integration/python/CMakeLists.txt | 22 ++++----- .../convert_int_to_string/CMakeLists.txt | 2 + services/collection/CMakeLists.txt | 11 +++-- services/collection/collection.hpp | 2 +- services/collection/session/suspend_plan.hpp | 2 +- services/collection/tests/CMakeLists.txt | 9 ++-- services/disk/CMakeLists.txt | 6 +-- services/disk/tests/CMakeLists.txt | 6 +-- services/dispatcher/CMakeLists.txt | 4 +- services/memory_storage/CMakeLists.txt | 4 +- services/wal/CMakeLists.txt | 8 ++-- services/wal/tests/CMakeLists.txt | 8 ++-- 73 files changed, 264 insertions(+), 189 deletions(-) create mode 100644 components/context/CMakeLists.txt rename components/{physical_plan => context}/context.cpp (100%) rename components/{physical_plan => context}/context.hpp (100%) rename components/ql/join/{join_types.h => join_types.hpp} (100%) diff --git a/.github/workflows/csharp.yaml b/.github/workflows/csharp.yaml index 72b3784d4..26084bd1a 100644 --- a/.github/workflows/csharp.yaml +++ b/.github/workflows/csharp.yaml @@ -48,7 +48,7 @@ jobs: CC: gcc run: | cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON .. + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON .. cmake --build . - name: Test diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6c82e0a0d..ddf757a99 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,7 +43,7 @@ jobs: CC: gcc run: | cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. cmake --build . - name: Test diff --git a/.github/workflows/ubuntu-20-04-aarch64.yaml b/.github/workflows/ubuntu-20-04-aarch64.yaml index 33650048f..4a264d42f 100644 --- a/.github/workflows/ubuntu-20-04-aarch64.yaml +++ b/.github/workflows/ubuntu-20-04-aarch64.yaml @@ -45,6 +45,6 @@ jobs: cp ../conanfile.txt . conan install . --build missing -s build_type=Release - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON .. + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON .. cmake --build . ctest -C -V --output-on-failure diff --git a/.github/workflows/ubuntu-20-04.yaml b/.github/workflows/ubuntu-20-04.yaml index 8392ce37c..784918794 100644 --- a/.github/workflows/ubuntu-20-04.yaml +++ b/.github/workflows/ubuntu-20-04.yaml @@ -55,7 +55,7 @@ jobs: CC: gcc run: | cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. cmake --build . - name: Test diff --git a/.github/workflows/ubuntu-22-04.yaml b/.github/workflows/ubuntu-22-04.yaml index e65638ec7..542cb4d74 100644 --- a/.github/workflows/ubuntu-22-04.yaml +++ b/.github/workflows/ubuntu-22-04.yaml @@ -49,7 +49,7 @@ jobs: CC: gcc run: | cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DEXAMPLE=ON .. cmake --build . - name: Test diff --git a/CMakeLists.txt b/CMakeLists.txt index ff6b3fa61..768dbd45f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ option(CONAN_EXPERIMENTAL_INCLUDE "CONAN EXPERIMENT INCLUDE" ON) option(APPLICATION_SERVER "application server" OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +add_definitions(-D_GNU_SOURCE) if (DEV_MODE) add_definitions(-DDEV_MODE) @@ -82,15 +83,23 @@ find_package(Sanitizers REQUIRED) #clang tools ############################################################################################# -#conan - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - -#include(${CMAKE_BINARY_DIR}/conan_paths.cmake) -set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH}) +# conan +message("DCMAKE_TOOLCHAIN_FILE= ${CMAKE_TOOLCHAIN_FILE}") + +find_package(Boost 1.86.0 REQUIRED) +find_package(fmt 10.2.1 REQUIRED) +find_package(spdlog 1.12.0 REQUIRED) +find_package(pybind11 2.10.0 REQUIRED) +find_package(msgpack 4.1.1 REQUIRED) +find_package(Catch2 2.13.7 REQUIRED) +find_package(Crc32c 1.1.2 REQUIRED) +find_package(absl 20230802.1 REQUIRED) +find_package(benchmark 1.6.1 REQUIRED) +find_package(ZLIB 1.2.12 REQUIRED) +find_package(BZip2 1.0.8 REQUIRED) +find_package(magic_enum 0.8.1 REQUIRED) +find_package(actor-zeta REQUIRED) -include_directories(SYSTEM ${CONAN_INCLUDE_DIRS}) -conan_basic_setup(NO_OUTPUT_DIRS TARGETS KEEP_RPATHS) # conan ############################################################################################# @@ -141,7 +150,7 @@ include_directories(services) add_subdirectory(services) add_subdirectory(integration) if(EXAMPLE) - # add_subdirectory(example) + add_subdirectory(example) endif() diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index a07c11fd1..69e425031 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(physical_plan_generator) add_subdirectory(planner) add_subdirectory(ql) add_subdirectory(session) +add_subdirectory(context) add_subdirectory(sql) add_subdirectory(types) diff --git a/components/context/CMakeLists.txt b/components/context/CMakeLists.txt new file mode 100644 index 000000000..41deac020 --- /dev/null +++ b/components/context/CMakeLists.txt @@ -0,0 +1,28 @@ +project(context) + +set( ${PROJECT_NAME}_HEADERS + context.hpp +) + +set(${PROJECT_NAME}_SOURCES + context.cpp + +) + +add_library(otterbrix_${PROJECT_NAME} + ${${PROJECT_NAME}_HEADERS} + ${${PROJECT_NAME}_SOURCES} +) + +add_library(otterbrix::${PROJECT_NAME} ALIAS otterbrix_${PROJECT_NAME}) + +set_property(TARGET otterbrix_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAME}) + +target_link_libraries( + otterbrix_${PROJECT_NAME} PUBLIC + otterbrix::session + otterbrix::ql + actor-zeta::actor-zeta +) + +target_include_directories( otterbrix_${PROJECT_NAME} PUBLIC ) diff --git a/components/physical_plan/context.cpp b/components/context/context.cpp similarity index 100% rename from components/physical_plan/context.cpp rename to components/context/context.cpp diff --git a/components/physical_plan/context.hpp b/components/context/context.hpp similarity index 100% rename from components/physical_plan/context.hpp rename to components/context/context.hpp diff --git a/components/cursor/CMakeLists.txt b/components/cursor/CMakeLists.txt index 41c83964f..e02196cea 100644 --- a/components/cursor/CMakeLists.txt +++ b/components/cursor/CMakeLists.txt @@ -19,8 +19,9 @@ set_property(TARGET otterbrix_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAM target_link_libraries( otterbrix_${PROJECT_NAME} PRIVATE - CONAN_PKG::actor-zeta - CONAN_PKG::boost + actor-zeta::actor-zeta + Boost::boost + absl::int128 ) target_include_directories(otterbrix_${PROJECT_NAME} diff --git a/components/cursor/tests/CMakeLists.txt b/components/cursor/tests/CMakeLists.txt index 18a268a6e..c06ac40cd 100644 --- a/components/cursor/tests/CMakeLists.txt +++ b/components/cursor/tests/CMakeLists.txt @@ -14,7 +14,9 @@ target_link_libraries( otterbrix::document otterbrix::test_generaty otterbrix::cursor - CONAN_PKG::boost + Boost::boost + Catch2::Catch2 + actor-zeta::actor-zeta ) include(CTest) diff --git a/components/document/CMakeLists.txt b/components/document/CMakeLists.txt index 9d242c0f5..70eb2898e 100644 --- a/components/document/CMakeLists.txt +++ b/components/document/CMakeLists.txt @@ -31,9 +31,10 @@ target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC "${CMAKE_SOURCE_DIR} target_link_libraries( otterbrix_${PROJECT_NAME} otterbrix::types - CONAN_PKG::boost - CONAN_PKG::abseil - CONAN_PKG::msgpack-cxx + Boost::boost + absl::flat_hash_map + absl::node_hash_map + msgpackc-cxx ) if (DEV_MODE) diff --git a/components/document/benchmark/CMakeLists.txt b/components/document/benchmark/CMakeLists.txt index b4ba062a3..afcaf9137 100644 --- a/components/document/benchmark/CMakeLists.txt +++ b/components/document/benchmark/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::document otterbrix::test_generaty - CONAN_PKG::benchmark + benchmark::benchmark ) file(COPY start-perf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/components/document/document_id.hpp b/components/document/document_id.hpp index 7dae73215..aa7a14076 100644 --- a/components/document/document_id.hpp +++ b/components/document/document_id.hpp @@ -2,8 +2,8 @@ #include +#include #include -#include namespace components::document { diff --git a/components/document/test/CMakeLists.txt b/components/document/test/CMakeLists.txt index 5ecf021a2..294027d85 100644 --- a/components/document/test/CMakeLists.txt +++ b/components/document/test/CMakeLists.txt @@ -14,9 +14,9 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::document otterbrix::test_generaty - CONAN_PKG::boost - CONAN_PKG::catch2 - CONAN_PKG::msgpack-cxx + Boost::boost + Catch2::Catch2 + msgpackc-cxx ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/components/expressions/CMakeLists.txt b/components/expressions/CMakeLists.txt index c561c07ae..f73a11bfb 100644 --- a/components/expressions/CMakeLists.txt +++ b/components/expressions/CMakeLists.txt @@ -19,7 +19,9 @@ set_property(TARGET otterbrix_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAM target_link_libraries( otterbrix_${PROJECT_NAME} PRIVATE - CONAN_PKG::boost + Boost::boost + magic_enum::magic_enum + msgpackc-cxx ) target_include_directories( diff --git a/components/expressions/test/CMakeLists.txt b/components/expressions/test/CMakeLists.txt index d4d2a3b50..23650a8e9 100644 --- a/components/expressions/test/CMakeLists.txt +++ b/components/expressions/test/CMakeLists.txt @@ -12,6 +12,10 @@ add_executable(${PROJECT_NAME} main.cpp ${${PROJECT_NAME}_SOURCES}) target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::expressions + Catch2::Catch2 + actor-zeta::actor-zeta + magic_enum::magic_enum + msgpackc-cxx ) include(CTest) diff --git a/components/index/CMakeLists.txt b/components/index/CMakeLists.txt index 80daebb36..da449d89c 100644 --- a/components/index/CMakeLists.txt +++ b/components/index/CMakeLists.txt @@ -21,9 +21,9 @@ target_link_libraries( otterbrix::document otterbrix::cursor otterbrix::ql - otterbrix::physical_plan_generator + otterbrix::context dl - CONAN_PKG::boost + Boost::boost ) target_include_directories( diff --git a/components/index/index_engine.hpp b/components/index/index_engine.hpp index 85c1adb43..e5f3fee41 100644 --- a/components/index/index_engine.hpp +++ b/components/index/index_engine.hpp @@ -11,7 +11,7 @@ #include "core/pmr.hpp" #include "forward.hpp" #include "index.hpp" -#include +#include #include namespace components::index { diff --git a/components/index/test/CMakeLists.txt b/components/index/test/CMakeLists.txt index 9401359fd..2153bdf20 100644 --- a/components/index/test/CMakeLists.txt +++ b/components/index/test/CMakeLists.txt @@ -15,7 +15,8 @@ target_link_libraries( otterbrix::document otterbrix::index otterbrix::test_generaty - CONAN_PKG::boost + Boost::boost + Catch2::Catch2 ) include(CTest) diff --git a/components/log/CMakeLists.txt b/components/log/CMakeLists.txt index 0acd7e4f1..56a52fff1 100644 --- a/components/log/CMakeLists.txt +++ b/components/log/CMakeLists.txt @@ -20,9 +20,9 @@ set_property(TARGET otterbrix_${CURRENT_TARGET} PROPERTY EXPORT_NAME ${CURRENT_T target_link_libraries( otterbrix_${CURRENT_TARGET} PUBLIC - CONAN_PKG::spdlog - CONAN_PKG::boost - CONAN_PKG::fmt + spdlog::spdlog + Boost::boost + fmt::fmt ) target_include_directories( diff --git a/components/log/test/CMakeLists.txt b/components/log/test/CMakeLists.txt index eb7745fe7..c028ab449 100644 --- a/components/log/test/CMakeLists.txt +++ b/components/log/test/CMakeLists.txt @@ -5,9 +5,9 @@ add_executable(${CURRENT_TARGET} main.cpp) target_link_libraries( ${CURRENT_TARGET} PRIVATE otterbrix::log - CONAN_PKG::spdlog - CONAN_PKG::boost - CONAN_PKG::fmt + spdlog::spdlog + Boost::boost + fmt::fmt ) diff --git a/components/logical_plan/CMakeLists.txt b/components/logical_plan/CMakeLists.txt index 1465a3e21..e43e699cf 100644 --- a/components/logical_plan/CMakeLists.txt +++ b/components/logical_plan/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries( otterbrix_${PROJECT_NAME} PRIVATE otterbrix::ql otterbrix::types - CONAN_PKG::boost + Boost::boost ) target_include_directories( diff --git a/components/oid/test/CMakeLists.txt b/components/oid/test/CMakeLists.txt index 0ef4e50ac..624980965 100644 --- a/components/oid/test/CMakeLists.txt +++ b/components/oid/test/CMakeLists.txt @@ -6,6 +6,11 @@ set( ${PROJECT_NAME}_SOURCES add_executable(${PROJECT_NAME} main.cpp ${${PROJECT_NAME}_SOURCES}) +target_link_libraries( + ${PROJECT_NAME} PRIVATE + Catch2::Catch2 +) + include(CTest) include(Catch) catch_discover_tests(${PROJECT_NAME}) diff --git a/components/physical_plan/CMakeLists.txt b/components/physical_plan/CMakeLists.txt index ba1fa6a1f..d515adb53 100644 --- a/components/physical_plan/CMakeLists.txt +++ b/components/physical_plan/CMakeLists.txt @@ -40,8 +40,6 @@ set(${PROJECT_NAME}_SOURCES collection/operators/operator_sort.cpp collection/operators/operator_join.cpp collection/operators/aggregation.cpp - - context.cpp ) add_library(otterbrix_${PROJECT_NAME} @@ -60,11 +58,12 @@ target_link_libraries( otterbrix::types otterbrix::cursor otterbrix::session + otterbrix::context otterbrix::index otterbrix::logical_plan - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost + spdlog::spdlog + abseil::abseil + Boost::boost ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/components/physical_plan/collection/operators/operator.hpp b/components/physical_plan/collection/operators/operator.hpp index 777eca178..327e882b3 100644 --- a/components/physical_plan/collection/operators/operator.hpp +++ b/components/physical_plan/collection/operators/operator.hpp @@ -1,8 +1,8 @@ #pragma once +#include #include #include -#include namespace services::collection { @@ -48,6 +48,7 @@ namespace services::collection::operators { operator_t(context_collection_t* collection, operator_type type); virtual ~operator_t() = default; + // TODO fwd void on_execute(components::pipeline::context_t* pipeline_context); void on_resume(components::pipeline::context_t* pipeline_context); void async_wait(); diff --git a/components/physical_plan/collection/operators/operator_join.hpp b/components/physical_plan/collection/operators/operator_join.hpp index 183ba7aee..2bb41a5f2 100644 --- a/components/physical_plan/collection/operators/operator_join.hpp +++ b/components/physical_plan/collection/operators/operator_join.hpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace services::collection::operators { diff --git a/components/physical_plan/tests/CMakeLists.txt b/components/physical_plan/tests/CMakeLists.txt index 1ddf6be57..d4e67c444 100644 --- a/components/physical_plan/tests/CMakeLists.txt +++ b/components/physical_plan/tests/CMakeLists.txt @@ -21,9 +21,10 @@ target_link_libraries( otterbrix::cursor otterbrix::session otterbrix::test_generaty - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost + spdlog::spdlog + absl::int128 + Boost::boost + Catch2::Catch2 ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/components/physical_plan_generator/CMakeLists.txt b/components/physical_plan_generator/CMakeLists.txt index 206365aaa..e2010f240 100644 --- a/components/physical_plan_generator/CMakeLists.txt +++ b/components/physical_plan_generator/CMakeLists.txt @@ -33,9 +33,12 @@ target_link_libraries( otterbrix::logical_plan otterbrix::planner otterbrix::physical_plan - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost + spdlog::spdlog + absl::int128 + absl::flat_hash_map + absl::node_hash_map + Boost::boost + actor-zeta::actor-zeta ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/components/physical_plan_generator/tests/CMakeLists.txt b/components/physical_plan_generator/tests/CMakeLists.txt index 9b79bfcd5..511b29478 100644 --- a/components/physical_plan_generator/tests/CMakeLists.txt +++ b/components/physical_plan_generator/tests/CMakeLists.txt @@ -18,9 +18,12 @@ target_link_libraries( otterbrix::cursor otterbrix::session otterbrix::test_generaty - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost + spdlog::spdlog + absl::int128 + absl::flat_hash_map + absl::node_hash_map + Boost::boost + Catch2::Catch2 ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/components/planner/test/CMakeLists.txt b/components/planner/test/CMakeLists.txt index ea5f48f28..d3b98ba12 100644 --- a/components/planner/test/CMakeLists.txt +++ b/components/planner/test/CMakeLists.txt @@ -13,6 +13,8 @@ target_link_libraries( otterbrix::logical_plan otterbrix::test_generaty otterbrix::planner + Catch2::Catch2 + actor-zeta::actor-zeta ) include(CTest) diff --git a/components/ql/CMakeLists.txt b/components/ql/CMakeLists.txt index a35127b40..80f528fd1 100644 --- a/components/ql/CMakeLists.txt +++ b/components/ql/CMakeLists.txt @@ -35,7 +35,8 @@ target_link_libraries( otterbrix::document otterbrix::types otterbrix::expressions - CONAN_PKG::boost + Boost::boost + magic_enum::magic_enum ) target_include_directories( diff --git a/components/ql/join/join.hpp b/components/ql/join/join.hpp index 27e38950b..a1fcc089e 100644 --- a/components/ql/join/join.hpp +++ b/components/ql/join/join.hpp @@ -1,6 +1,6 @@ #pragma once -#include "join_types.h" +#include "join_types.hpp" #include #include #include diff --git a/components/ql/join/join_types.h b/components/ql/join/join_types.hpp similarity index 100% rename from components/ql/join/join_types.h rename to components/ql/join/join_types.hpp diff --git a/components/ql/test/CMakeLists.txt b/components/ql/test/CMakeLists.txt index f0ef8000d..667e7127e 100644 --- a/components/ql/test/CMakeLists.txt +++ b/components/ql/test/CMakeLists.txt @@ -12,6 +12,8 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::document otterbrix::ql + Catch2::Catch2 + actor-zeta::actor-zeta ) include(CTest) diff --git a/components/sql/test/CMakeLists.txt b/components/sql/test/CMakeLists.txt index cac458964..807f64891 100644 --- a/components/sql/test/CMakeLists.txt +++ b/components/sql/test/CMakeLists.txt @@ -16,6 +16,7 @@ add_executable(${PROJECT_NAME} main.cpp ${${PROJECT_NAME}_SOURCES}) target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::sql + Catch2::Catch2 ) include(CTest) diff --git a/components/tests/CMakeLists.txt b/components/tests/CMakeLists.txt index 7c1dceda6..c93bc1c7b 100644 --- a/components/tests/CMakeLists.txt +++ b/components/tests/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(otterbrix::${PROJECT_NAME} ALIAS otterbrix_${PROJECT_NAME}) set_property(TARGET otterbrix_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAME}) target_link_libraries( - otterbrix_${PROJECT_NAME} + otterbrix_${PROJECT_NAME} PRIVATE absl::numeric absl::int128 Boost::json ) diff --git a/components/types/tests/CMakeLists.txt b/components/types/tests/CMakeLists.txt index 8a5dce82b..d8aa33457 100644 --- a/components/types/tests/CMakeLists.txt +++ b/components/types/tests/CMakeLists.txt @@ -13,6 +13,7 @@ target_link_libraries( otterbrix::log otterbrix::file otterbrix::types + Catch2::Catch2 ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/conanfile.txt b/conanfile.txt index a1897c220..80dc460e3 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,6 @@ [requires] boost/1.86.0 +fmt/10.2.1 spdlog/1.12.0 pybind11/2.13.6 msgpack-cxx/4.1.1 @@ -22,11 +23,9 @@ actor-zeta:rtti_disable=False #OpenSSL:shared = True [generators] -cmake -cmake_find_package CMakeDeps CMakeToolchain -#cmake_paths + [imports] diff --git a/core/assert/tests/CMakeLists.txt b/core/assert/tests/CMakeLists.txt index 26068dcdd..5c9de9dcb 100644 --- a/core/assert/tests/CMakeLists.txt +++ b/core/assert/tests/CMakeLists.txt @@ -11,8 +11,9 @@ add_executable(${PROJECT_NAME} main.cpp ${${PROJECT_NAME}_SOURCES}) target_link_libraries( ${PROJECT_NAME} PRIVATE otterbrix::log - CONAN_PKG::boost + Boost::boost otterbrix::assert + Catch2::Catch2 ) include(CTest) diff --git a/core/b_plus_tree/CMakeLists.txt b/core/b_plus_tree/CMakeLists.txt index 3e1c41a06..a8c9a39fb 100644 --- a/core/b_plus_tree/CMakeLists.txt +++ b/core/b_plus_tree/CMakeLists.txt @@ -24,8 +24,8 @@ set_property(TARGET otterbrix_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAM target_link_libraries( otterbrix_${PROJECT_NAME} PUBLIC - CONAN_PKG::crc32c - CONAN_PKG::msgpack-cxx + Crc32c::crc32c + msgpackc-cxx otterbrix::types otterbrix::document otterbrix::file diff --git a/core/b_plus_tree/tests/CMakeLists.txt b/core/b_plus_tree/tests/CMakeLists.txt index aeaf158ca..8f07ff516 100644 --- a/core/b_plus_tree/tests/CMakeLists.txt +++ b/core/b_plus_tree/tests/CMakeLists.txt @@ -16,6 +16,7 @@ target_link_libraries( otterbrix::file otterbrix::test_generaty otterbrix::b_plus_tree + Catch2::Catch2 ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/core/btree/btree.hpp b/core/btree/btree.hpp index 8367dc321..2bb506d1b 100644 --- a/core/btree/btree.hpp +++ b/core/btree/btree.hpp @@ -2,7 +2,7 @@ #include -#include "absl/container/btree_map.h" +#include namespace core::pmr::btree { template> diff --git a/core/file/tests/CMakeLists.txt b/core/file/tests/CMakeLists.txt index 64cb782d3..8a9f2e32f 100644 --- a/core/file/tests/CMakeLists.txt +++ b/core/file/tests/CMakeLists.txt @@ -14,6 +14,7 @@ target_link_libraries( otterbrix::ql otterbrix::log otterbrix::file + Catch2::Catch2 ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/core/non_thread_scheduler/CMakeLists.txt b/core/non_thread_scheduler/CMakeLists.txt index 6e539b3b5..8cd825d42 100644 --- a/core/non_thread_scheduler/CMakeLists.txt +++ b/core/non_thread_scheduler/CMakeLists.txt @@ -4,6 +4,6 @@ add_library(${PROJECT_NAME} scheduler_test.cpp clock_test.cpp) target_link_libraries( ${PROJECT_NAME} PUBLIC - CONAN_PKG::actor-zeta + actor-zeta::actor-zeta ) diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt index ccb9255c6..9c8384ce7 100644 --- a/core/tests/CMakeLists.txt +++ b/core/tests/CMakeLists.txt @@ -12,8 +12,8 @@ add_executable(${PROJECT_NAME} main.cpp ${${PROJECT_NAME}_SOURCES}) target_link_libraries( ${PROJECT_NAME} PRIVATE - CONAN_PKG::catch2 - CONAN_PKG::boost + Catch2::Catch2 + Boost::boost otterbrix::assert otterbrix::log ${CMAKE_THREAD_LIBS_INIT} diff --git a/docker/Dockerfile-manylinux2014 b/docker/Dockerfile-manylinux2014 index 2875910d8..d08c85679 100644 --- a/docker/Dockerfile-manylinux2014 +++ b/docker/Dockerfile-manylinux2014 @@ -39,7 +39,7 @@ RUN PYBIN=(/opt/python/*/bin) && \ ${BIN}/python3 -m pip install --no-cache-dir wheel setuptools scikit-build==0.16.4 && \ mkdir -p $(echo "./$(${BIN}/python3 get_path.py )") && \ conan install . -s build_type=Release -if=$(echo "./$(${BIN}/python3 get_path.py )") && \ - ${BIN}/python3 setup.py bdist_wheel --verbose -DDEV_MODE=ON && \ + ${BIN}/python3 setup.py bdist_wheel --verbose -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DDEV_MODE=ON && \ #${BIN}/python3 -m pip install --no-index --find-links . dist/otterbrix-*.whl && \ cd $(echo "./$(${BIN}/python3 get_path.py )") && \ ctest -C -V --output-on-failure --timeout 60 && \ diff --git a/docker/Dockerfile-ubuntu-20 b/docker/Dockerfile-ubuntu-20 index 5f08a8a21..f81dab33a 100644 --- a/docker/Dockerfile-ubuntu-20 +++ b/docker/Dockerfile-ubuntu-20 @@ -41,7 +41,7 @@ COPY ./CMakeLists.txt ./CMakeLists.txt WORKDIR /app/build -RUN cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON && \ +RUN cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON && \ cmake --build . --target all -- -j $(nproc) RUN ctest -C -V --output-on-failure --timeout 60 diff --git a/docker/Dockerfile-ubuntu-20-address-sanitizer b/docker/Dockerfile-ubuntu-20-address-sanitizer index d384fddfc..1fd104b8c 100644 --- a/docker/Dockerfile-ubuntu-20-address-sanitizer +++ b/docker/Dockerfile-ubuntu-20-address-sanitizer @@ -41,7 +41,7 @@ COPY ./CMakeLists.txt ./CMakeLists.txt WORKDIR /app/build -RUN cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DSANITIZE_ADDRESS=ON && \ +RUN cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON -DSANITIZE_ADDRESS=ON && \ cmake --build . --target all -- -j $(nproc) RUN ctest -C -V --output-on-failure --timeout 60 diff --git a/docker/Dockerfile-ubuntu-22 b/docker/Dockerfile-ubuntu-22 index ee2612b35..6c1c20899 100644 --- a/docker/Dockerfile-ubuntu-22 +++ b/docker/Dockerfile-ubuntu-22 @@ -40,7 +40,7 @@ COPY ./CMakeLists.txt ./CMakeLists.txt WORKDIR /app/build -RUN cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON && \ +RUN cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DDEV_MODE=ON && \ cmake --build . --target all -- -j $(nproc) RUN ctest -C -V --output-on-failure --timeout 60 diff --git a/example/cpp/CMakeLists.txt b/example/cpp/CMakeLists.txt index 46830db21..a76703c17 100644 --- a/example/cpp/CMakeLists.txt +++ b/example/cpp/CMakeLists.txt @@ -10,8 +10,8 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries( ${PROJECT_NAME} PRIVATE - cpp_otterbrix_shared + cpp_otterbrix otterbrix::test_generaty - CONAN_PKG::spdlog - CONAN_PKG::catch2 + spdlog::spdlog + Catch2::Catch2 ) \ No newline at end of file diff --git a/example/cpp/main.cpp b/example/cpp/main.cpp index ba7dfab04..2e7ac398c 100644 --- a/example/cpp/main.cpp +++ b/example/cpp/main.cpp @@ -14,6 +14,7 @@ using id_par = core::parameter_id_t; inline configuration::config make_create_config(const std::filesystem::path& path) { auto config = configuration::config::default_config(); config.log.path = path; + config.log.level = log_t::level::warn; config.disk.path = path; config.wal.path = path; return config; @@ -31,19 +32,21 @@ TEST_CASE("example::sql::base") { config.wal.on = false; otterbrix::otterbrix_ptr otterbrix; - INFO("initialization") { otterbrix = otterbrix::make_otterbrix(config); } + INFO("initialization") { + otterbrix = otterbrix::make_otterbrix(config); + execute_sql(otterbrix, R"_(CREATE DATABASE TestDatabase;)_"); + execute_sql(otterbrix, R"_(CREATE TABLE TestDatabase.TestCollection;)_"); + } INFO("insert") { - { - std::stringstream query; - query << "INSERT INTO TestDatabase.TestCollection (_id, name, count) VALUES "; - for (int num = 0; num < 100; ++num) { - query << "('" << gen_id(num + 1) << "', " - << "'Name " << num << "', " << num << ")" << (num == 99 ? ";" : ", "); - } - auto c = execute_sql(otterbrix, query.str()); - REQUIRE(c->size() == 100); - } + std::stringstream query; + query << "INSERT INTO TestDatabase.TestCollection (_id, name, count) VALUES "; + for (int num = 0; num < 100; ++num) { + query << "('" << gen_id(num + 1) << "', " + << "'Name " << num << "', " << num << ")" << (num == 99 ? ";" : ", "); + } + auto c = execute_sql(otterbrix, query.str()); + REQUIRE(c->size() == 100); } INFO("select") { @@ -130,16 +133,18 @@ TEST_CASE("example::sql::group_by") { otterbrix::otterbrix_ptr otterbrix; INFO("initialization") { - { otterbrix = otterbrix::make_otterbrix(config); } - { - std::stringstream query; - query << "INSERT INTO TestDatabase.TestCollection (_id, name, count) VALUES "; - for (int num = 0; num < 100; ++num) { - query << "('" << gen_id(num + 1) << "', " - << "'Name " << (num % 10) << "', " << (num % 20) << ")" << (num == 99 ? ";" : ", "); - } - execute_sql(otterbrix, query.str()); - } + otterbrix = otterbrix::make_otterbrix(config); + execute_sql(otterbrix, R"_(CREATE DATABASE TestDatabase;)_"); + execute_sql(otterbrix, R"_(CREATE TABLE TestDatabase.TestCollection;)_"); + + std::stringstream query; + query << "INSERT INTO TestDatabase.TestCollection (_id, name, count) VALUES "; + for (int num = 0; num < 100; ++num) { + query << "('" << gen_id(num + 1) << "', " + << "'Name " << (num % 10) << "', " << (num % 20) << ")" << (num == 99 ? ";" : ", "); + } + auto c = execute_sql(otterbrix, query.str()); + REQUIRE(c->is_success()); } INFO("group by") { diff --git a/integration/c/test/CMakeLists.txt b/integration/c/test/CMakeLists.txt index 2aacab642..f8957c188 100644 --- a/integration/c/test/CMakeLists.txt +++ b/integration/c/test/CMakeLists.txt @@ -25,20 +25,20 @@ target_link_libraries( otterbrix::disk otterbrix::locks - CONAN_PKG::spdlog - CONAN_PKG::msgpack-cxx + spdlog::spdlog + msgpackc-cxx #CONAN_PKG::date - CONAN_PKG::catch2 - CONAN_PKG::crc32c - CONAN_PKG::abseil - CONAN_PKG::benchmark - CONAN_PKG::actor-zeta - CONAN_PKG::boost - CONAN_PKG::fmt + Catch2::Catch2 + Crc32c::crc32c + absl::int128 + benchmark::benchmark + actor-zeta::actor-zeta + Boost::boost + fmt::fmt #CONAN_PKG::libcurl - CONAN_PKG::zlib - CONAN_PKG::bzip2 - CONAN_PKG::libbacktrace + ZLIB::ZLIB + BZip2::BZip2 + libbacktrace::libbacktrace ) diff --git a/integration/cpp/CMakeLists.txt b/integration/cpp/CMakeLists.txt index 2b279cf13..beff75cf4 100644 --- a/integration/cpp/CMakeLists.txt +++ b/integration/cpp/CMakeLists.txt @@ -37,26 +37,26 @@ target_link_libraries( ${otterbrix_LIBS} ) -set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "otterbrix") +# set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "otterbrix") add_library(${PROJECT_NAME}_shared SHARED ${${PROJECT_NAME}_sources}) target_link_libraries( ${PROJECT_NAME}_shared PRIVATE ${otterbrix_LIBS} - CONAN_PKG::spdlog - CONAN_PKG::pybind11 - CONAN_PKG::msgpack-cxx + spdlog::spdlog + pybind11::pybind11 + msgpackc-cxx #CONAN_PKG::date - CONAN_PKG::crc32c - CONAN_PKG::abseil - CONAN_PKG::actor-zeta - CONAN_PKG::boost - CONAN_PKG::fmt + Crc32c::crc32c + absl::int128 + actor-zeta::actor-zeta + Boost::boost + fmt::fmt #CONAN_PKG::libcurl - CONAN_PKG::zlib - CONAN_PKG::bzip2 - #CONAN_PKG::libbacktrace + ZLIB::ZLIB + BZip2::BZip2 + #libbacktrace::libbacktrace #CONAN_PKG::openssl ) @@ -86,18 +86,18 @@ if (DEV_MODE OR ALLOW_BENCHMARK) ${otterbrix_LIBS} - CONAN_PKG::spdlog - CONAN_PKG::msgpack-cxx + spdlog::spdlog + msgpackc-cxx #CONAN_PKG::date - CONAN_PKG::crc32c - CONAN_PKG::abseil - CONAN_PKG::actor-zeta - CONAN_PKG::boost - CONAN_PKG::fmt + Crc32c::crc32c + absl::int128 + actor-zeta::actor-zeta + Boost::boost + fmt::fmt #CONAN_PKG::libcurl - CONAN_PKG::zlib - CONAN_PKG::bzip2 - #CONAN_PKG::libbacktrace + ZLIB::ZLIB + BZip2::BZip2 + #libbacktrace::libbacktrace #CONAN_PKG::openssl ) endif() diff --git a/integration/cpp/benchmark/document_read/CMakeLists.txt b/integration/cpp/benchmark/document_read/CMakeLists.txt index 96f2de28e..887e2e1a4 100644 --- a/integration/cpp/benchmark/document_read/CMakeLists.txt +++ b/integration/cpp/benchmark/document_read/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries( ${PROJECT_NAME} PRIVATE - CONAN_PKG::benchmark + benchmark::benchmark otterbrix::document otterbrix::test_generaty ) diff --git a/integration/cpp/benchmark/document_rw/CMakeLists.txt b/integration/cpp/benchmark/document_rw/CMakeLists.txt index 2380f2e48..af2c845b1 100644 --- a/integration/cpp/benchmark/document_rw/CMakeLists.txt +++ b/integration/cpp/benchmark/document_rw/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries( ${PROJECT_NAME} PRIVATE - CONAN_PKG::benchmark + benchmark::benchmark otterbrix::document otterbrix::test_generaty ) diff --git a/integration/cpp/benchmark/document_write/CMakeLists.txt b/integration/cpp/benchmark/document_write/CMakeLists.txt index 063224d6d..6bf6181c0 100644 --- a/integration/cpp/benchmark/document_write/CMakeLists.txt +++ b/integration/cpp/benchmark/document_write/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries( ${PROJECT_NAME} PRIVATE - CONAN_PKG::benchmark + benchmark::benchmark otterbrix::document ) diff --git a/integration/cpp/benchmark/index/CMakeLists.txt b/integration/cpp/benchmark/index/CMakeLists.txt index 173398d2a..b2354c094 100644 --- a/integration/cpp/benchmark/index/CMakeLists.txt +++ b/integration/cpp/benchmark/index/CMakeLists.txt @@ -13,7 +13,7 @@ add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES}) target_link_libraries( ${PROJECT_NAME} PRIVATE - CONAN_PKG::benchmark + benchmark::benchmark cpp_otterbrix otterbrix::test_generaty ) diff --git a/integration/cpp/otterbrix.cpp b/integration/cpp/otterbrix.cpp index 7f5a569f4..046e920ce 100644 --- a/integration/cpp/otterbrix.cpp +++ b/integration/cpp/otterbrix.cpp @@ -1,16 +1,10 @@ #include "otterbrix.hpp" namespace { - static const auto system_database = "system_database"; - static const auto system_collection = "system_collection"; auto base_make_otterbrix(configuration::config cfg = configuration::config::default_config()) -> otterbrix::otterbrix_ptr { auto* ptr = new otterbrix::otterbrix_t(cfg); - auto id = otterbrix::session_id_t(); - ptr->dispatcher()->create_database(id, system_database); - auto id_1 = otterbrix::session_id_t(); - ptr->dispatcher()->create_collection(id_1, system_database, system_collection); return ptr; } diff --git a/integration/cpp/test/CMakeLists.txt b/integration/cpp/test/CMakeLists.txt index fccb63d18..ba2baac27 100644 --- a/integration/cpp/test/CMakeLists.txt +++ b/integration/cpp/test/CMakeLists.txt @@ -32,20 +32,20 @@ target_link_libraries( otterbrix::disk otterbrix::locks - CONAN_PKG::spdlog - CONAN_PKG::msgpack-cxx + spdlog::spdlog + msgpackc-cxx #CONAN_PKG::date - CONAN_PKG::catch2 - CONAN_PKG::crc32c - CONAN_PKG::abseil - CONAN_PKG::benchmark - CONAN_PKG::actor-zeta - CONAN_PKG::boost - CONAN_PKG::fmt + Catch2::Catch2 + Crc32c::crc32c + absl::int128 + benchmark::benchmark + actor-zeta::actor-zeta + Boost::boost + fmt::fmt #CONAN_PKG::libcurl - CONAN_PKG::zlib - CONAN_PKG::bzip2 - CONAN_PKG::libbacktrace + ZLIB::ZLIB + BZip2::BZip2 + libbacktrace::libbacktrace ) diff --git a/integration/python/CMakeLists.txt b/integration/python/CMakeLists.txt index 61ecc5124..39356c5ce 100644 --- a/integration/python/CMakeLists.txt +++ b/integration/python/CMakeLists.txt @@ -44,19 +44,19 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE ${otterbrix_LIBS} cpp_otterbrix - CONAN_PKG::spdlog - CONAN_PKG::pybind11 - CONAN_PKG::msgpack-cxx + spdlog::spdlog + pybind11::pybind11 + msgpackc-cxx #CONAN_PKG::date - CONAN_PKG::crc32c - CONAN_PKG::abseil - CONAN_PKG::actor-zeta - CONAN_PKG::boost - CONAN_PKG::fmt + Crc32c::crc32c + absl::int128 + actor-zeta::actor-zeta + Boost::boost + fmt::fmt #CONAN_PKG::libcurl - CONAN_PKG::zlib - CONAN_PKG::bzip2 - #CONAN_PKG::libbacktrace + ZLIB::ZLIB + BZip2::BZip2 + #libbacktrace::libbacktrace #CONAN_PKG::openssl ) diff --git a/integration/test_utils/convert_int_to_string/CMakeLists.txt b/integration/test_utils/convert_int_to_string/CMakeLists.txt index 6d64d3eee..026ff7bb2 100644 --- a/integration/test_utils/convert_int_to_string/CMakeLists.txt +++ b/integration/test_utils/convert_int_to_string/CMakeLists.txt @@ -4,5 +4,7 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries( ${PROJECT_NAME} PRIVATE + magic_enum::magic_enum + actor-zeta::actor-zeta ) \ No newline at end of file diff --git a/services/collection/CMakeLists.txt b/services/collection/CMakeLists.txt index 42b3fda2a..1ce954063 100644 --- a/services/collection/CMakeLists.txt +++ b/services/collection/CMakeLists.txt @@ -20,13 +20,16 @@ target_link_libraries( otterbrix::types otterbrix::cursor otterbrix::session + otterbrix::context otterbrix::index otterbrix::logical_plan otterbrix::physical_plan_generator - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost - CONAN_PKG::actor-zeta + spdlog::spdlog + absl::int128 + absl::flat_hash_map + absl::node_hash_map + Boost::boost + actor-zeta::actor-zeta ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/services/collection/collection.hpp b/services/collection/collection.hpp index 36b817465..b80caed0e 100644 --- a/services/collection/collection.hpp +++ b/services/collection/collection.hpp @@ -6,12 +6,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/services/collection/session/suspend_plan.hpp b/services/collection/session/suspend_plan.hpp index 81843be3f..03610e615 100644 --- a/services/collection/session/suspend_plan.hpp +++ b/services/collection/session/suspend_plan.hpp @@ -2,8 +2,8 @@ #include "session_type.hpp" #include +#include #include -#include namespace services::collection::sessions { diff --git a/services/collection/tests/CMakeLists.txt b/services/collection/tests/CMakeLists.txt index 0c50ad0e4..0c1cfedfa 100644 --- a/services/collection/tests/CMakeLists.txt +++ b/services/collection/tests/CMakeLists.txt @@ -17,10 +17,11 @@ target_link_libraries( otterbrix::cursor otterbrix::session otterbrix::test_generaty - CONAN_PKG::spdlog - CONAN_PKG::abseil - CONAN_PKG::boost - CONAN_PKG::actor-zeta + spdlog::spdlog + absl::int128 + Boost::boost + Catch2::Catch2 + actor-zeta::actor-zeta ) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/services/disk/CMakeLists.txt b/services/disk/CMakeLists.txt index 69075d78a..7d5366782 100644 --- a/services/disk/CMakeLists.txt +++ b/services/disk/CMakeLists.txt @@ -38,9 +38,9 @@ target_link_libraries( otterbrix::document otterbrix::collection otterbrix::b_plus_tree - CONAN_PKG::spdlog - CONAN_PKG::boost - CONAN_PKG::actor-zeta + spdlog::spdlog + Boost::boost + actor-zeta::actor-zeta ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/services/disk/tests/CMakeLists.txt b/services/disk/tests/CMakeLists.txt index 736c289eb..160f04e93 100644 --- a/services/disk/tests/CMakeLists.txt +++ b/services/disk/tests/CMakeLists.txt @@ -16,9 +16,9 @@ target_link_libraries( otterbrix::document otterbrix::disk otterbrix::test_generaty - CONAN_PKG::boost - CONAN_PKG::catch2 - CONAN_PKG::actor-zeta + Boost::boost + Catch2::Catch2 + actor-zeta::actor-zeta ) include(CTest) diff --git a/services/dispatcher/CMakeLists.txt b/services/dispatcher/CMakeLists.txt index 297cbb587..ce9cb3d9f 100644 --- a/services/dispatcher/CMakeLists.txt +++ b/services/dispatcher/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries( otterbrix::session otterbrix::ql otterbrix::planner - CONAN_PKG::spdlog - CONAN_PKG::actor-zeta + spdlog::spdlog + actor-zeta::actor-zeta ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/services/memory_storage/CMakeLists.txt b/services/memory_storage/CMakeLists.txt index 936ed5268..71324989d 100644 --- a/services/memory_storage/CMakeLists.txt +++ b/services/memory_storage/CMakeLists.txt @@ -19,8 +19,8 @@ target_link_libraries( otterbrix::locks otterbrix::cursor otterbrix::session - CONAN_PKG::spdlog - CONAN_PKG::actor-zeta + spdlog::spdlog + actor-zeta::actor-zeta ) target_include_directories(otterbrix_${PROJECT_NAME} PUBLIC diff --git a/services/wal/CMakeLists.txt b/services/wal/CMakeLists.txt index c09b4fce3..ffcc8972d 100644 --- a/services/wal/CMakeLists.txt +++ b/services/wal/CMakeLists.txt @@ -26,10 +26,10 @@ target_link_libraries( otterbrix::locks otterbrix::file - CONAN_PKG::spdlog - CONAN_PKG::crc32c - CONAN_PKG::actor-zeta - CONAN_PKG::boost + spdlog::spdlog + Crc32c::crc32c + actor-zeta::actor-zeta + Boost::boost ) diff --git a/services/wal/tests/CMakeLists.txt b/services/wal/tests/CMakeLists.txt index a07c6956c..c9ad5e453 100644 --- a/services/wal/tests/CMakeLists.txt +++ b/services/wal/tests/CMakeLists.txt @@ -18,10 +18,10 @@ target_link_libraries( otterbrix::wal otterbrix::test_generaty - CONAN_PKG::catch2 - CONAN_PKG::crc32c - CONAN_PKG::actor-zeta - CONAN_PKG::boost + Catch2::Catch2 + Crc32c::crc32c + actor-zeta::actor-zeta + Boost::boost ) target_include_directories(${PROJECT_NAME} PUBLIC