From adb6a20ee264a4b4cbda7734e55ff76b15821345 Mon Sep 17 00:00:00 2001 From: Lloyd-Pottiger <60744015+Lloyd-Pottiger@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:59:06 +0800 Subject: [PATCH] build: refactor cmake (#6875) close pingcap/tiflash#6201 --- .gitignore | 90 ------------------- cmake/print_include_directories.cmake | 2 +- dbms/CMakeLists.txt | 69 +++++++------- dbms/src/AggregateFunctions/CMakeLists.txt | 12 +-- dbms/src/Client/CMakeLists.txt | 6 -- dbms/src/Common/CMakeLists.txt | 2 - dbms/src/Common/Config/CMakeLists.txt | 8 +- dbms/src/Common/StringUtils/CMakeLists.txt | 4 +- dbms/src/Common/tests/CMakeLists.txt | 50 +++++------ dbms/src/Core/tests/CMakeLists.txt | 8 +- dbms/src/DataStreams/tests/CMakeLists.txt | 2 - dbms/src/Functions/CMakeLists.txt | 30 +++---- dbms/src/IO/tests/CMakeLists.txt | 54 +++++------ dbms/src/Parsers/CMakeLists.txt | 8 +- dbms/src/Parsers/tests/CMakeLists.txt | 6 +- dbms/src/Server/CMakeLists.txt | 42 ++++----- dbms/src/Server/config_tools.h.in | 4 +- dbms/src/Server/main.cpp | 10 +-- .../Storages/DeltaMerge/tests/CMakeLists.txt | 22 ++--- .../DeltaMerge/workload/CMakeLists.txt | 2 +- dbms/src/Storages/Page/V3/CMakeLists.txt | 2 +- .../Page/tools/PageCtl/CMakeLists.txt | 8 +- .../Page/tools/PageCtl/PageStorageCtlV2.cpp | 8 +- .../src/Storages/Page/workload/CMakeLists.txt | 3 +- .../workload/PageStorageInMemoryCapacity.h | 2 +- dbms/src/Storages/System/CMakeLists.txt | 4 +- .../Storages/Transaction/tests/CMakeLists.txt | 2 +- .../tests/bench_region_block_reader.cpp | 3 +- dbms/src/TableFunctions/CMakeLists.txt | 10 +-- dbms/src/TestUtils/CMakeLists.txt | 2 +- libs/libdaemon/CMakeLists.txt | 2 +- 31 files changed, 185 insertions(+), 292 deletions(-) diff --git a/.gitignore b/.gitignore index 8f99a2cb33c..7b2b416b0a2 100644 --- a/.gitignore +++ b/.gitignore @@ -60,21 +60,6 @@ __pycache__ *-metrika-yandex test.cpp -utils/compressor/compressor -utils/corrector_utf8/corrector_utf8 -utils/iotest/iotest -utils/iotest/iotest_aio -utils/iotest/iotest_nonblock -utils/config-processor/config-processor -CPackConfig.cmake -CPackSourceConfig.cmake -contrib/libpoco/Poco/ -contrib/libpoco/bin/ -contrib/libpoco/cmake_uninstall.cmake -contrib/libre2/re2_st/ -dbms/src/Client/clickhouse-benchmark -dbms/src/Client/clickhouse-client -dbms/src/Client/tests/test-connect dbms/src/Common/tests/arena_with_free_lists dbms/src/Common/tests/auto_array dbms/src/Common/tests/compact_array @@ -94,26 +79,8 @@ dbms/src/Core/tests/exception dbms/src/Core/tests/field dbms/src/Core/tests/rvo_test dbms/src/Core/tests/string_pool -dbms/src/DataStreams/tests/aggregating_stream -dbms/src/DataStreams/tests/block_row_transforms -dbms/src/DataStreams/tests/block_tab_separated_streams -dbms/src/DataStreams/tests/collapsing_sorted_stream -dbms/src/DataStreams/tests/expression_stream -dbms/src/DataStreams/tests/filter_stream -dbms/src/DataStreams/tests/filter_stream_hitlog -dbms/src/DataStreams/tests/fork_streams -dbms/src/DataStreams/tests/glue_streams -dbms/src/DataStreams/tests/json_streams -dbms/src/DataStreams/tests/native_streams -dbms/src/DataStreams/tests/sorting_stream -dbms/src/DataStreams/tests/tab_separated_streams -dbms/src/DataStreams/tests/union_stream -dbms/src/DataStreams/tests/union_stream2 dbms/src/DataTypes/tests/data_type_string dbms/src/DataTypes/tests/data_types_number_fixed -dbms/src/Functions/tests/functions_arithmetic -dbms/src/Functions/tests/logical_functions_performance -dbms/src/Functions/tests/number_traits dbms/src/IO/tests/async_write dbms/src/IO/tests/cached_compressed_read_buffer dbms/src/IO/tests/compressed_buffer @@ -137,67 +104,10 @@ dbms/src/IO/tests/var_uint dbms/src/IO/tests/write_buffer dbms/src/IO/tests/write_buffer_aio dbms/src/IO/tests/write_buffer_perf -dbms/src/Interpreters/tests/address_patterns -dbms/src/Interpreters/tests/aggregate -dbms/src/Interpreters/tests/compiler_test -dbms/src/Interpreters/tests/create_query -dbms/src/Interpreters/tests/expression -dbms/src/Interpreters/tests/expression_analyzer -dbms/src/Interpreters/tests/hash_map -dbms/src/Interpreters/tests/hash_map2 -dbms/src/Interpreters/tests/hash_map3 -dbms/src/Interpreters/tests/hash_map_string -dbms/src/Interpreters/tests/hash_map_string_2 -dbms/src/Interpreters/tests/hash_map_string_3 -dbms/src/Interpreters/tests/hash_map_string_small -dbms/src/Interpreters/tests/in_join_subqueries_preprocessor -dbms/src/Interpreters/tests/logical_expressions_optimizer -dbms/src/Interpreters/tests/select_query -dbms/src/Interpreters/tests/two_level_hash_map -dbms/src/Interpreters/tests/users dbms/src/Parsers/tests/create_parser dbms/src/Parsers/tests/select_parser -dbms/src/Server/clickhouse-server -dbms/src/Server/clickhouse-server.init dbms/src/Storages/tests/hit_log -dbms/src/Storages/tests/merge_tree -dbms/src/Storages/tests/part_checker -dbms/src/Storages/tests/part_name -dbms/src/Storages/tests/pk_condition dbms/src/Storages/tests/seek_speed_test -dbms/src/Storages/tests/storage_log -dbms/src/Storages/tests/system_numbers -libs/libcommon/src/revision.h -libs/libcommon/src/tests/date_lut2 -libs/libcommon/src/tests/date_lut3 -libs/libcommon/src/tests/date_lut4 -libs/libcommon/src/tests/date_lut_init -libs/libcommon/src/tests/multi_version -libs/libmysqlxx/src/tests/failover -libs/libmysqlxx/src/tests/mysqlxx_test -libs/libzkutil/src/tests/zkutil_expiration_test -libs/libzkutil/src/tests/zkutil_test -libs/libzkutil/src/tests/zkutil_test_async -libs/libzkutil/src/tests/zkutil_test_commands -libs/libzkutil/src/tests/zkutil_test_lock -libs/libzkutil/src/tests/zkutil_zookeeper_holder -utils/zookeeper-create-entry-to-download-part/zookeeper-create-entry-to-download-part -utils/zookeeper-dump-tree/zookeeper-dump-tree -utils/zookeeper-remove-by-list/zookeeper-remove-by-list -dbms/src/Storages/tests/remove_symlink_directory -dbms/tests/queries/1_stateful -debian/control -debian/copyright -debian/tmp/ -libs/libcommon/src/tests/json_test -utils/compressor/zstd_test -utils/wikistat-loader/wikistat-loader -dbms/src/Common/tests/pod_array -debian/clickhouse-benchmark/ -debian/clickhouse-client/ -debian/clickhouse-server-base/ -debian/clickhouse-server-common/ -debian/files dbms/src/Server/data/* dbms/src/Server/metadata/* diff --git a/cmake/print_include_directories.cmake b/cmake/print_include_directories.cmake index b539487d4da..6c26d396f46 100644 --- a/cmake/print_include_directories.cmake +++ b/cmake/print_include_directories.cmake @@ -18,7 +18,7 @@ get_property (dirs1 TARGET dbms PROPERTY INCLUDE_DIRECTORIES) list(APPEND dirs ${dirs1}) -get_property (dirs1 TARGET clickhouse_common_io PROPERTY INCLUDE_DIRECTORIES) +get_property (dirs1 TARGET tiflash_common_io PROPERTY INCLUDE_DIRECTORIES) list(APPEND dirs ${dirs1}) get_property (dirs1 TARGET common PROPERTY INCLUDE_DIRECTORIES) diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt index 628c47fc4b5..c6242452715 100644 --- a/dbms/CMakeLists.txt +++ b/dbms/CMakeLists.txt @@ -54,10 +54,10 @@ set(dbms_sources) include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_common_io src/Common) -add_headers_and_sources(clickhouse_common_io src/Common/HashTable) -add_headers_and_sources(clickhouse_common_io src/Common/SyncPoint) -add_headers_and_sources(clickhouse_common_io src/IO) +add_headers_and_sources(tiflash_common_io src/Common) +add_headers_and_sources(tiflash_common_io src/Common/HashTable) +add_headers_and_sources(tiflash_common_io src/Common/SyncPoint) +add_headers_and_sources(tiflash_common_io src/IO) add_headers_and_sources(dbms src/Analyzers) add_headers_and_sources(dbms src/Core) @@ -118,9 +118,9 @@ check_then_add_sources_compile_flag ( src/DataTypes/DataTypeString.cpp ) -list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD}) -list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON}) -list (APPEND clickhouse_common_io_headers ${fiu_include_dirs}) +list (APPEND tiflash_common_io_sources ${CONFIG_BUILD}) +list (APPEND tiflash_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON}) +list (APPEND tiflash_common_io_headers ${fiu_include_dirs}) list (APPEND dbms_sources src/Functions/IFunction.cpp src/Functions/FunctionFactory.cpp src/Functions/FunctionHelpers.cpp) list (APPEND dbms_headers src/Functions/IFunction.h src/Functions/FunctionFactory.h src/Functions/FunctionHelpers.h) @@ -144,11 +144,11 @@ list (APPEND dbms_headers list (APPEND dbms_sources src/TableFunctions/ITableFunction.cpp src/TableFunctions/TableFunctionFactory.cpp) list (APPEND dbms_headers src/TableFunctions/ITableFunction.h src/TableFunctions/TableFunctionFactory.h) -add_library(clickhouse_common_io ${SPLIT_SHARED} ${clickhouse_common_io_headers} ${clickhouse_common_io_sources}) -target_include_directories(clickhouse_common_io BEFORE PUBLIC ${XXHASH_INCLUDE_DIR}) +add_library(tiflash_common_io ${SPLIT_SHARED} ${tiflash_common_io_headers} ${tiflash_common_io_sources}) +target_include_directories(tiflash_common_io BEFORE PUBLIC ${XXHASH_INCLUDE_DIR}) if (OS_FREEBSD) - target_compile_definitions (clickhouse_common_io PUBLIC CLOCK_MONOTONIC_COARSE=CLOCK_MONOTONIC_FAST) + target_compile_definitions (tiflash_common_io PUBLIC CLOCK_MONOTONIC_COARSE=CLOCK_MONOTONIC_FAST) endif () add_subdirectory(src/Common/Config) @@ -187,7 +187,7 @@ if (NOT ARCH_ARM) set (LINK_LIBRARIES_ONLY_ON_X86_64 cpuid) endif() -target_link_libraries (clickhouse_common_io +target_link_libraries (tiflash_common_io PUBLIC common string_utils @@ -210,12 +210,12 @@ target_link_libraries (clickhouse_common_io libsymbolization ) -target_include_directories (clickhouse_common_io BEFORE PRIVATE ${kvClient_SOURCE_DIR}/include) -target_compile_definitions(clickhouse_common_io PUBLIC -DTIFLASH_SOURCE_PREFIX=\"${TiFlash_SOURCE_DIR}\") +target_include_directories (tiflash_common_io BEFORE PRIVATE ${kvClient_SOURCE_DIR}/include) +target_compile_definitions(tiflash_common_io PUBLIC -DTIFLASH_SOURCE_PREFIX=\"${TiFlash_SOURCE_DIR}\") target_link_libraries (dbms - clickhouse_parsers - clickhouse_common_config - clickhouse_common_io + tiflash_parsers + tiflash_common_config + tiflash_common_io flash_service kvproto kv_client @@ -239,17 +239,17 @@ if (NOT USE_INTERNAL_RE2_LIBRARY) target_include_directories (dbms BEFORE PRIVATE ${RE2_INCLUDE_DIR}) endif () -target_include_directories (clickhouse_common_io BEFORE PUBLIC ${Boost_INCLUDE_DIRS}) +target_include_directories (tiflash_common_io BEFORE PUBLIC ${Boost_INCLUDE_DIRS}) if (Poco_Data_FOUND AND NOT USE_INTERNAL_POCO_LIBRARY) - target_include_directories (clickhouse_common_io PRIVATE ${Poco_Data_INCLUDE_DIRS}) + target_include_directories (tiflash_common_io PRIVATE ${Poco_Data_INCLUDE_DIRS}) target_include_directories (dbms PRIVATE ${Poco_Data_INCLUDE_DIRS}) endif() -# NetSSL headers are exposed in clickhouse_common_io's headers. +# NetSSL headers are exposed in tiflash_common_io's headers. # We mark it public to make the headers available. if (Poco_NetSSL_FOUND) - target_link_libraries (clickhouse_common_io PUBLIC ${Poco_NetSSL_LIBRARY}) + target_link_libraries (tiflash_common_io PUBLIC ${Poco_NetSSL_LIBRARY}) endif() target_link_libraries (dbms ${Poco_Foundation_LIBRARY}) @@ -274,14 +274,14 @@ if (NOT USE_INTERNAL_ZSTD_LIBRARY) endif () target_include_directories (dbms PUBLIC ${DBMS_INCLUDE_DIR}) -target_include_directories (clickhouse_common_io PUBLIC ${DBMS_INCLUDE_DIR}) -target_include_directories (clickhouse_common_io PUBLIC ${PCG_RANDOM_INCLUDE_DIR}) -target_include_directories (clickhouse_common_io BEFORE PUBLIC ${DOUBLE_CONVERSION_INCLUDE_DIR}) +target_include_directories (tiflash_common_io PUBLIC ${DBMS_INCLUDE_DIR}) +target_include_directories (tiflash_common_io PUBLIC ${PCG_RANDOM_INCLUDE_DIR}) +target_include_directories (tiflash_common_io BEFORE PUBLIC ${DOUBLE_CONVERSION_INCLUDE_DIR}) # also for copy_headers.sh: -target_include_directories (clickhouse_common_io BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) +target_include_directories (tiflash_common_io BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) # https://cmake.org/pipermail/cmake/2016-May/063400.html -target_link_libraries (clickhouse_common_io PUBLIC ${TIFLASH_XXHASH_LIBRARY}) +target_link_libraries (tiflash_common_io PUBLIC ${TIFLASH_XXHASH_LIBRARY}) function(add_target_pch context target) if (ENABLE_PCH) @@ -328,7 +328,7 @@ if (ENABLE_TESTS) target_compile_definitions(gtests_dbms PUBLIC DBMS_PUBLIC_GTEST) target_compile_definitions(dbms PUBLIC MULTIPLE_CONTEXT_GTEST) - target_link_libraries(gtests_dbms test_util_gtest_main clickhouse_functions tiflash-dttool-lib) + target_link_libraries(gtests_dbms test_util_gtest_main tiflash_functions tiflash-dttool-lib) install (TARGETS gtests_dbms COMPONENT tiflash-gtest @@ -372,26 +372,19 @@ if (ENABLE_TESTS) ) target_include_directories(bench_dbms BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR} ${benchmark_SOURCE_DIR}/include) target_compile_definitions(bench_dbms PUBLIC DBMS_PUBLIC_GTEST) - - target_link_libraries(bench_dbms gtest dbms test_util_bench_main benchmark clickhouse_functions) - if (ENABLE_TIFLASH_DTWORKLOAD) - target_link_libraries(bench_dbms dt-workload-lib) - endif () - if (ENABLE_TIFLASH_PAGEWORKLOAD) - target_link_libraries(bench_dbms page-workload-lib) - endif () + target_link_libraries(bench_dbms gtest dbms test_util_bench_main benchmark tiflash_functions server_for_test) add_check(bench_dbms) endif () # dbms add_target_pch("pch-dbms.h" flash_service) -add_target_pch("pch-common.h" clickhouse_common_io clickhouse_aggregate_functions) +add_target_pch("pch-common.h" tiflash_common_io tiflash_aggregate_functions) -# disable PCH for `clickhouse_functions`, `dbms` temporarily because some source files need to use specific cxx flags -# add_target_pch("pch-common.h" clickhouse_functions dbms) +# disable PCH for `tiflash_functions`, `dbms` temporarily because some source files need to use specific cxx flags +# add_target_pch("pch-common.h" tiflash_functions dbms) -add_target_pch("pch-common.h" clickhouse_parsers clickhouse_storages_system dt-workload-lib clickhouse-server-lib) +add_target_pch("pch-common.h" tiflash_parsers tiflash_storages_system dt-workload-lib tiflash-server-lib) # common add_target_pch("pch-kvpb.h" kv_client) diff --git a/dbms/src/AggregateFunctions/CMakeLists.txt b/dbms/src/AggregateFunctions/CMakeLists.txt index 73cc904bdeb..d816e014d4f 100644 --- a/dbms/src/AggregateFunctions/CMakeLists.txt +++ b/dbms/src/AggregateFunctions/CMakeLists.txt @@ -13,9 +13,9 @@ # limitations under the License. include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_aggregate_functions .) +add_headers_and_sources(tiflash_aggregate_functions .) -list(REMOVE_ITEM clickhouse_aggregate_functions_sources +list(REMOVE_ITEM tiflash_aggregate_functions_sources AggregateFunctionFactory.cpp AggregateFunctionCombinatorFactory.cpp AggregateFunctionState.cpp @@ -23,7 +23,7 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_sources FactoryHelpers.cpp ) -list(REMOVE_ITEM clickhouse_aggregate_functions_headers +list(REMOVE_ITEM tiflash_aggregate_functions_headers IAggregateFunction.h IAggregateFunctionCombinator.h AggregateFunctionFactory.h @@ -33,6 +33,6 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_headers FactoryHelpers.h ) -add_library(clickhouse_aggregate_functions ${clickhouse_aggregate_functions_sources} AggregateFunctionGroupConcat.h) -target_link_libraries(clickhouse_aggregate_functions dbms) -target_include_directories (clickhouse_aggregate_functions BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) +add_library(tiflash_aggregate_functions ${tiflash_aggregate_functions_sources} AggregateFunctionGroupConcat.h) +target_link_libraries(tiflash_aggregate_functions dbms) +target_include_directories (tiflash_aggregate_functions BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) diff --git a/dbms/src/Client/CMakeLists.txt b/dbms/src/Client/CMakeLists.txt index 37a44839e6b..16810968676 100644 --- a/dbms/src/Client/CMakeLists.txt +++ b/dbms/src/Client/CMakeLists.txt @@ -12,9 +12,3 @@ # See the License for the specific language governing permissions and # limitations under the License. -# TODO: make separate lib datastream, block, ... -#include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -#add_headers_and_sources(clickhouse_client .) -#add_library(clickhouse_client ${SPLIT_SHARED} ${clickhouse_client_headers} ${clickhouse_client_sources}) -#target_link_libraries (clickhouse_client clickhouse_common_io ${Poco_Net_LIBRARY}) -#target_include_directories (clickhouse_client PRIVATE ${DBMS_INCLUDE_DIR}) diff --git a/dbms/src/Common/CMakeLists.txt b/dbms/src/Common/CMakeLists.txt index 660f817216d..8152c74faa8 100644 --- a/dbms/src/Common/CMakeLists.txt +++ b/dbms/src/Common/CMakeLists.txt @@ -13,8 +13,6 @@ # limitations under the License. add_subdirectory(StringUtils) -# after common_io -#add_subdirectory(ConfigProcessor) if (ENABLE_TESTS) add_subdirectory (tests EXCLUDE_FROM_ALL) diff --git a/dbms/src/Common/Config/CMakeLists.txt b/dbms/src/Common/Config/CMakeLists.txt index 2c790013113..dbea4f2579d 100644 --- a/dbms/src/Common/Config/CMakeLists.txt +++ b/dbms/src/Common/Config/CMakeLists.txt @@ -15,9 +15,9 @@ include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_common_config .) +add_headers_and_sources(tiflash_common_config .) -add_library(clickhouse_common_config ${SPLIT_SHARED} ${clickhouse_common_config_headers} ${clickhouse_common_config_sources}) +add_library(tiflash_common_config ${SPLIT_SHARED} ${tiflash_common_config_headers} ${tiflash_common_config_sources}) -target_link_libraries(clickhouse_common_config clickhouse_common_io string_utils cpptoml) -target_include_directories(clickhouse_common_config PRIVATE ${DBMS_INCLUDE_DIR}) +target_link_libraries(tiflash_common_config tiflash_common_io string_utils cpptoml) +target_include_directories(tiflash_common_config PRIVATE ${DBMS_INCLUDE_DIR}) diff --git a/dbms/src/Common/StringUtils/CMakeLists.txt b/dbms/src/Common/StringUtils/CMakeLists.txt index d121325b5c5..4daa97f3577 100644 --- a/dbms/src/Common/StringUtils/CMakeLists.txt +++ b/dbms/src/Common/StringUtils/CMakeLists.txt @@ -14,7 +14,7 @@ include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_common_stringutils .) +add_headers_and_sources(tiflash_common_stringutils .) -add_library(string_utils ${SPLIT_SHARED} ${clickhouse_common_stringutils_headers} ${clickhouse_common_stringutils_sources}) +add_library(string_utils ${SPLIT_SHARED} ${tiflash_common_stringutils_headers} ${tiflash_common_stringutils_sources}) target_include_directories (string_utils PRIVATE ${DBMS_INCLUDE_DIR}) diff --git a/dbms/src/Common/tests/CMakeLists.txt b/dbms/src/Common/tests/CMakeLists.txt index 010109d2258..bde14db9ab5 100644 --- a/dbms/src/Common/tests/CMakeLists.txt +++ b/dbms/src/Common/tests/CMakeLists.txt @@ -16,85 +16,85 @@ add_executable (hashes_test hashes_test.cpp) target_link_libraries (hashes_test dbms) add_executable (sip_hash sip_hash.cpp) -target_link_libraries (sip_hash clickhouse_common_io) +target_link_libraries (sip_hash tiflash_common_io) add_executable (sip_hash_perf sip_hash_perf.cpp) -target_link_libraries (sip_hash_perf clickhouse_common_io) +target_link_libraries (sip_hash_perf tiflash_common_io) add_executable (auto_array auto_array.cpp) -target_link_libraries (auto_array clickhouse_common_io) +target_link_libraries (auto_array tiflash_common_io) add_executable (hash_table hash_table.cpp) -target_link_libraries (hash_table clickhouse_common_io) +target_link_libraries (hash_table tiflash_common_io) add_executable (small_table small_table.cpp) -target_link_libraries (small_table clickhouse_common_io) +target_link_libraries (small_table tiflash_common_io) add_executable (parallel_aggregation parallel_aggregation.cpp) -target_link_libraries (parallel_aggregation clickhouse_common_io) +target_link_libraries (parallel_aggregation tiflash_common_io) add_executable (parallel_aggregation2 parallel_aggregation2.cpp) -target_link_libraries (parallel_aggregation2 clickhouse_common_io) +target_link_libraries (parallel_aggregation2 tiflash_common_io) add_executable (int_hashes_perf int_hashes_perf.cpp AvalancheTest.cpp Random.cpp) -target_link_libraries (int_hashes_perf clickhouse_common_io) +target_link_libraries (int_hashes_perf tiflash_common_io) add_executable (simple_cache simple_cache.cpp) target_include_directories (simple_cache PRIVATE ${DBMS_INCLUDE_DIR}) target_link_libraries (simple_cache common) add_executable (compact_array compact_array.cpp) -target_link_libraries (compact_array clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) +target_link_libraries (compact_array tiflash_common_io ${Boost_FILESYSTEM_LIBRARY}) add_executable (radix_sort radix_sort.cpp) -target_link_libraries (radix_sort clickhouse_common_io) +target_link_libraries (radix_sort tiflash_common_io) add_executable (shell_command_test shell_command_test.cpp) -target_link_libraries (shell_command_test clickhouse_common_io) +target_link_libraries (shell_command_test tiflash_common_io) add_executable (arena_with_free_lists arena_with_free_lists.cpp) -target_link_libraries (arena_with_free_lists clickhouse_common_io) +target_link_libraries (arena_with_free_lists tiflash_common_io) add_executable (pod_array pod_array.cpp) -target_link_libraries (pod_array clickhouse_common_io) +target_link_libraries (pod_array tiflash_common_io) add_executable (thread_creation_latency thread_creation_latency.cpp) -target_link_libraries (thread_creation_latency clickhouse_common_io) +target_link_libraries (thread_creation_latency tiflash_common_io) add_executable (thread_pool thread_pool.cpp) -target_link_libraries (thread_pool clickhouse_common_io) +target_link_libraries (thread_pool tiflash_common_io) add_executable (array_cache array_cache.cpp) -target_link_libraries (array_cache clickhouse_common_io) +target_link_libraries (array_cache tiflash_common_io) add_executable (space_saving space_saving.cpp) -target_link_libraries (space_saving clickhouse_common_io) +target_link_libraries (space_saving tiflash_common_io) add_executable (integer_hash_tables_and_hashes integer_hash_tables_and_hashes.cpp) target_include_directories (integer_hash_tables_and_hashes BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) -target_link_libraries (integer_hash_tables_and_hashes clickhouse_common_io) +target_link_libraries (integer_hash_tables_and_hashes tiflash_common_io) add_executable (cow_columns cow_columns.cpp) -target_link_libraries (cow_columns clickhouse_common_io) +target_link_libraries (cow_columns tiflash_common_io) add_executable (stopwatch stopwatch.cpp) -target_link_libraries (stopwatch clickhouse_common_io) +target_link_libraries (stopwatch tiflash_common_io) add_executable (persisted_container persisted_container.cpp) -target_link_libraries (persisted_container clickhouse_common_io) +target_link_libraries (persisted_container tiflash_common_io) # performance tests add_executable (uint128_perf uint128_perf.cpp) -target_link_libraries (uint128_perf clickhouse_common_io) +target_link_libraries (uint128_perf tiflash_common_io) add_executable (mpmc_queue_perftest mpmc_queue_perftest.cpp) -target_link_libraries (mpmc_queue_perftest clickhouse_common_io) +target_link_libraries (mpmc_queue_perftest tiflash_common_io) add_executable (allocator_perf allocator_perf.cpp) -target_link_libraries (allocator_perf clickhouse_common_io) +target_link_libraries (allocator_perf tiflash_common_io) add_executable(bench_common bench_logger.cpp ) -target_link_libraries(bench_common benchmark::benchmark_main clickhouse_common_io) +target_link_libraries(bench_common benchmark::benchmark_main tiflash_common_io) diff --git a/dbms/src/Core/tests/CMakeLists.txt b/dbms/src/Core/tests/CMakeLists.txt index 65648152c8e..5cd4b6a6a67 100644 --- a/dbms/src/Core/tests/CMakeLists.txt +++ b/dbms/src/Core/tests/CMakeLists.txt @@ -13,20 +13,20 @@ # limitations under the License. add_executable (exception exception.cpp gtest_decimal_comparison.cpp) -target_link_libraries (exception clickhouse_common_io) +target_link_libraries (exception tiflash_common_io) add_executable (string_pool string_pool.cpp) -target_link_libraries (string_pool clickhouse_common_io) +target_link_libraries (string_pool tiflash_common_io) target_include_directories (string_pool BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) add_executable (field field.cpp) target_link_libraries (field dbms) add_executable (move_field move_field.cpp) -target_link_libraries (move_field clickhouse_common_io) +target_link_libraries (move_field tiflash_common_io) add_executable (rvo_test rvo_test.cpp) target_link_libraries (rvo_test Threads::Threads) add_executable (string_ref_hash string_ref_hash.cpp) -target_link_libraries (string_ref_hash clickhouse_common_io) +target_link_libraries (string_ref_hash tiflash_common_io) diff --git a/dbms/src/DataStreams/tests/CMakeLists.txt b/dbms/src/DataStreams/tests/CMakeLists.txt index 944908dcb25..88c2a8570ea 100644 --- a/dbms/src/DataStreams/tests/CMakeLists.txt +++ b/dbms/src/DataStreams/tests/CMakeLists.txt @@ -11,5 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -include_directories (${CMAKE_CURRENT_BINARY_DIR}) diff --git a/dbms/src/Functions/CMakeLists.txt b/dbms/src/Functions/CMakeLists.txt index 562af2bcf40..b5d6b7a9165 100644 --- a/dbms/src/Functions/CMakeLists.txt +++ b/dbms/src/Functions/CMakeLists.txt @@ -14,10 +14,10 @@ include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_functions .) -add_headers_and_sources(clickhouse_functions ./GatherUtils) -add_headers_and_sources(clickhouse_functions ./Conditional) -add_headers_and_sources(clickhouse_functions ${TiFlash_BINARY_DIR}/dbms/src/Functions) +add_headers_and_sources(tiflash_functions .) +add_headers_and_sources(tiflash_functions ./GatherUtils) +add_headers_and_sources(tiflash_functions ./Conditional) +add_headers_and_sources(tiflash_functions ${TiFlash_BINARY_DIR}/dbms/src/Functions) check_then_add_sources_compile_flag ( TIFLASH_ENABLE_ARCH_HASWELL_SUPPORT @@ -25,29 +25,29 @@ check_then_add_sources_compile_flag ( CollationStringOptimized.cpp ) -list(REMOVE_ITEM clickhouse_functions_sources IFunction.cpp FunctionFactory.cpp FunctionHelpers.cpp) -list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h FunctionHelpers.h) +list(REMOVE_ITEM tiflash_functions_sources IFunction.cpp FunctionFactory.cpp FunctionHelpers.cpp) +list(REMOVE_ITEM tiflash_functions_headers IFunction.h FunctionFactory.h FunctionHelpers.h) -add_library(clickhouse_functions ${clickhouse_functions_sources}) +add_library(tiflash_functions ${tiflash_functions_sources}) -target_link_libraries(clickhouse_functions PUBLIC dbms PRIVATE ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES}) +target_link_libraries(tiflash_functions PUBLIC dbms PRIVATE ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES}) -target_include_directories (clickhouse_functions BEFORE PUBLIC ${TiFlash_SOURCE_DIR}/contrib/libfarmhash) -target_include_directories (clickhouse_functions BEFORE PUBLIC ${TiFlash_SOURCE_DIR}/contrib/libmetrohash/src) -target_include_directories (clickhouse_functions BEFORE PUBLIC ${DIVIDE_INCLUDE_DIR}) +target_include_directories (tiflash_functions BEFORE PUBLIC ${TiFlash_SOURCE_DIR}/contrib/libfarmhash) +target_include_directories (tiflash_functions BEFORE PUBLIC ${TiFlash_SOURCE_DIR}/contrib/libmetrohash/src) +target_include_directories (tiflash_functions BEFORE PUBLIC ${DIVIDE_INCLUDE_DIR}) if (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" OR CMAKE_BUILD_TYPE_UC STREQUAL "MINSIZEREL") # Won't generate debug info for files with heavy template instantiation to achieve faster linking and lower size. - target_compile_options(clickhouse_functions PRIVATE "-g0") + target_compile_options(tiflash_functions PRIVATE "-g0") endif () if (USE_ICU) - #target_link_libraries (clickhouse_functions ${ICU_LIBS}) - target_include_directories (clickhouse_functions PRIVATE ${ICU_INCLUDE_DIR}) + #target_link_libraries (tiflash_functions ${ICU_LIBS}) + target_include_directories (tiflash_functions PRIVATE ${ICU_INCLUDE_DIR}) endif () if (USE_VECTORCLASS) - target_include_directories (clickhouse_functions BEFORE PUBLIC ${VECTORCLASS_INCLUDE_DIR}) + target_include_directories (tiflash_functions BEFORE PUBLIC ${VECTORCLASS_INCLUDE_DIR}) endif () if (ENABLE_TESTS) diff --git a/dbms/src/IO/tests/CMakeLists.txt b/dbms/src/IO/tests/CMakeLists.txt index b076882c718..a6cb41366ea 100644 --- a/dbms/src/IO/tests/CMakeLists.txt +++ b/dbms/src/IO/tests/CMakeLists.txt @@ -16,86 +16,86 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}) set(SRCS ) add_executable (read_buffer read_buffer.cpp ${SRCS}) -target_link_libraries (read_buffer clickhouse_common_io) +target_link_libraries (read_buffer tiflash_common_io) add_executable (read_buffer_perf read_buffer_perf.cpp ${SRCS}) -target_link_libraries (read_buffer_perf clickhouse_common_io) +target_link_libraries (read_buffer_perf tiflash_common_io) add_executable (read_float_perf read_float_perf.cpp ${SRCS}) -target_link_libraries (read_float_perf clickhouse_common_io) +target_link_libraries (read_float_perf tiflash_common_io) add_executable (write_buffer write_buffer.cpp ${SRCS}) -target_link_libraries (write_buffer clickhouse_common_io) +target_link_libraries (write_buffer tiflash_common_io) add_executable (write_buffer_perf write_buffer_perf.cpp ${SRCS}) -target_link_libraries (write_buffer_perf clickhouse_common_io) +target_link_libraries (write_buffer_perf tiflash_common_io) add_executable (valid_utf8_perf valid_utf8_perf.cpp ${SRCS}) -target_link_libraries (valid_utf8_perf clickhouse_common_io) +target_link_libraries (valid_utf8_perf tiflash_common_io) add_executable (valid_utf8 valid_utf8.cpp ${SRCS}) -target_link_libraries (valid_utf8 clickhouse_common_io) +target_link_libraries (valid_utf8 tiflash_common_io) add_executable (compressed_buffer compressed_buffer.cpp ${SRCS}) -target_link_libraries (compressed_buffer clickhouse_common_io) +target_link_libraries (compressed_buffer tiflash_common_io) add_executable (var_uint var_uint.cpp ${SRCS}) -target_link_libraries (var_uint clickhouse_common_io) +target_link_libraries (var_uint tiflash_common_io) add_executable (read_escaped_string read_escaped_string.cpp ${SRCS}) -target_link_libraries (read_escaped_string clickhouse_common_io) +target_link_libraries (read_escaped_string tiflash_common_io) add_executable (async_write async_write.cpp ${SRCS}) -target_link_libraries (async_write clickhouse_common_io) +target_link_libraries (async_write tiflash_common_io) add_executable (parse_int_perf parse_int_perf.cpp ${SRCS}) -target_link_libraries (parse_int_perf clickhouse_common_io) +target_link_libraries (parse_int_perf tiflash_common_io) add_executable (parse_int_perf2 parse_int_perf2.cpp ${SRCS}) -target_link_libraries (parse_int_perf2 clickhouse_common_io) +target_link_libraries (parse_int_perf2 tiflash_common_io) add_executable (read_write_int read_write_int.cpp ${SRCS}) -target_link_libraries (read_write_int clickhouse_common_io) +target_link_libraries (read_write_int tiflash_common_io) add_executable (mempbrk mempbrk.cpp ${SRCS}) -target_link_libraries (mempbrk clickhouse_common_io) +target_link_libraries (mempbrk tiflash_common_io) add_executable (cached_compressed_read_buffer cached_compressed_read_buffer.cpp ${SRCS}) -target_link_libraries (cached_compressed_read_buffer clickhouse_common_io) +target_link_libraries (cached_compressed_read_buffer tiflash_common_io) add_executable (o_direct_and_dirty_pages o_direct_and_dirty_pages.cpp ${SRCS}) -target_link_libraries (o_direct_and_dirty_pages clickhouse_common_io) +target_link_libraries (o_direct_and_dirty_pages tiflash_common_io) add_executable (hashing_write_buffer hashing_write_buffer.cpp ${SRCS}) -target_link_libraries (hashing_write_buffer clickhouse_common_io) +target_link_libraries (hashing_write_buffer tiflash_common_io) add_check(hashing_write_buffer) add_executable (hashing_read_buffer hashing_read_buffer.cpp) -target_link_libraries (hashing_read_buffer clickhouse_common_io) +target_link_libraries (hashing_read_buffer tiflash_common_io) add_check (hashing_read_buffer) add_executable (io_operators operators.cpp ${SRCS}) -target_link_libraries (io_operators clickhouse_common_io) +target_link_libraries (io_operators tiflash_common_io) if (NOT OS_DARWIN AND NOT OS_FREEBSD) add_executable(write_buffer_aio write_buffer_aio.cpp) - target_link_libraries (write_buffer_aio clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) + target_link_libraries (write_buffer_aio tiflash_common_io ${Boost_FILESYSTEM_LIBRARY}) add_executable(read_buffer_aio read_buffer_aio.cpp) - target_link_libraries (read_buffer_aio clickhouse_common_io ${Boost_FILESYSTEM_LIBRARY}) + target_link_libraries (read_buffer_aio tiflash_common_io ${Boost_FILESYSTEM_LIBRARY}) endif () add_executable (zlib_buffers zlib_buffers.cpp ${SRCS}) -target_link_libraries (zlib_buffers clickhouse_common_io) +target_link_libraries (zlib_buffers tiflash_common_io) add_executable (remote_read_write_buffer remote_read_write_buffer.cpp ${SRCS}) -target_link_libraries (remote_read_write_buffer clickhouse_common_io) +target_link_libraries (remote_read_write_buffer tiflash_common_io) add_executable (limit_read_buffer limit_read_buffer.cpp ${SRCS}) -target_link_libraries (limit_read_buffer clickhouse_common_io) +target_link_libraries (limit_read_buffer tiflash_common_io) add_executable (limit_read_buffer2 limit_read_buffer2.cpp ${SRCS}) -target_link_libraries (limit_read_buffer2 clickhouse_common_io) +target_link_libraries (limit_read_buffer2 tiflash_common_io) add_executable (parse_date_time_best_effort parse_date_time_best_effort.cpp ${SRCS}) -target_link_libraries (parse_date_time_best_effort clickhouse_common_io) +target_link_libraries (parse_date_time_best_effort tiflash_common_io) diff --git a/dbms/src/Parsers/CMakeLists.txt b/dbms/src/Parsers/CMakeLists.txt index 84c59bf03a2..7705ebf7c9b 100644 --- a/dbms/src/Parsers/CMakeLists.txt +++ b/dbms/src/Parsers/CMakeLists.txt @@ -13,10 +13,10 @@ # limitations under the License. include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_parsers .) -add_library(clickhouse_parsers ${SPLIT_SHARED} ${clickhouse_parsers_headers} ${clickhouse_parsers_sources}) -target_link_libraries (clickhouse_parsers clickhouse_common_io) -target_include_directories (clickhouse_parsers PUBLIC ${DBMS_INCLUDE_DIR}) +add_headers_and_sources(tiflash_parsers .) +add_library(tiflash_parsers ${SPLIT_SHARED} ${tiflash_parsers_headers} ${tiflash_parsers_sources}) +target_link_libraries (tiflash_parsers tiflash_common_io) +target_include_directories (tiflash_parsers PUBLIC ${DBMS_INCLUDE_DIR}) if (ENABLE_TESTS) add_subdirectory (tests EXCLUDE_FROM_ALL) diff --git a/dbms/src/Parsers/tests/CMakeLists.txt b/dbms/src/Parsers/tests/CMakeLists.txt index 485948d0ed1..7fa9933753c 100644 --- a/dbms/src/Parsers/tests/CMakeLists.txt +++ b/dbms/src/Parsers/tests/CMakeLists.txt @@ -17,11 +17,11 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}) set(SRCS ) add_executable (lexer lexer.cpp ${SRCS}) -target_link_libraries (lexer clickhouse_parsers) +target_link_libraries (lexer tiflash_parsers) add_executable (select_parser select_parser.cpp ${SRCS}) -target_link_libraries (select_parser clickhouse_parsers) +target_link_libraries (select_parser tiflash_parsers) add_executable (create_parser create_parser.cpp ${SRCS}) -target_link_libraries (create_parser clickhouse_parsers) +target_link_libraries (create_parser tiflash_parsers) diff --git a/dbms/src/Server/CMakeLists.txt b/dbms/src/Server/CMakeLists.txt index 3020ee8cf55..8b35feaeefc 100644 --- a/dbms/src/Server/CMakeLists.txt +++ b/dbms/src/Server/CMakeLists.txt @@ -17,13 +17,13 @@ # each of them is built and linked as a separate library, defined below. -option(ENABLE_CLICKHOUSE_ALL "Enable all tools" ON) -option(ENABLE_CLICKHOUSE_SERVER "Enable server" ${ENABLE_CLICKHOUSE_ALL}) -option(ENABLE_CLICKHOUSE_CLIENT "Enable client" ${ENABLE_CLICKHOUSE_ALL}) -option(ENABLE_TIFLASH_DTTOOL "Enable dttool: tools to manage dmfile" ${ENABLE_CLICKHOUSE_ALL}) -option(ENABLE_TIFLASH_DTWORKLOAD "Enable dtworkload: tools to test and stress DeltaTree" ${ENABLE_CLICKHOUSE_ALL}) -option(ENABLE_TIFLASH_PAGEWORKLOAD "Enable pageworkload: tools to test and stress PageStorage" ${ENABLE_CLICKHOUSE_ALL}) -option(ENABLE_TIFLASH_PAGECTL "Enable pagectl: tools to debug page storage" ${ENABLE_CLICKHOUSE_ALL}) +option(ENABLE_TIFLASH_ALL "Enable all tools" ON) +option(ENABLE_TIFLASH_SERVER "Enable server" ${ENABLE_TIFLASH_ALL}) +option(ENABLE_TIFLASH_CLIENT "Enable client" ${ENABLE_TIFLASH_ALL}) +option(ENABLE_TIFLASH_DTTOOL "Enable dttool: tools to manage dmfile" ${ENABLE_TIFLASH_ALL}) +option(ENABLE_TIFLASH_DTWORKLOAD "Enable dtworkload: tools to test and stress DeltaTree" ${ENABLE_TIFLASH_ALL}) +option(ENABLE_TIFLASH_PAGEWORKLOAD "Enable pageworkload: tools to test and stress PageStorage" ${ENABLE_TIFLASH_ALL}) +option(ENABLE_TIFLASH_PAGECTL "Enable pagectl: tools to debug page storage" ${ENABLE_TIFLASH_ALL}) configure_file (config_tools.h.in ${CMAKE_CURRENT_BINARY_DIR}/config_tools.h) @@ -31,10 +31,10 @@ add_library(server_for_test FlashGrpcServerHolder.cpp ) -target_link_libraries (server_for_test PUBLIC clickhouse_common_io clickhouse_storages_system) +target_link_libraries (server_for_test PUBLIC tiflash_common_io tiflash_storages_system) target_include_directories(server_for_test PRIVATE ${TiFlash_SOURCE_DIR}/contrib/grpc/) -add_library (clickhouse-server-lib +add_library (tiflash-server-lib HTTPHandler.cpp CertificateReloader.cpp MetricsTransmitter.cpp @@ -50,17 +50,17 @@ add_library (clickhouse-server-lib UserConfigParser.cpp RaftConfigParser.cpp) -target_link_libraries(clickhouse-server-lib PRIVATE ${TIFLASH_PROXY_LIBRARY}) +target_link_libraries(tiflash-server-lib PRIVATE ${TIFLASH_PROXY_LIBRARY}) -target_link_libraries (clickhouse-server-lib PUBLIC server_for_test clickhouse_common_io daemon clickhouse_storages_system clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions) -target_include_directories (clickhouse-server-lib PUBLIC ${TiFlash_SOURCE_DIR}/libs/libdaemon/include) +target_link_libraries (tiflash-server-lib PUBLIC server_for_test tiflash_common_io daemon tiflash_storages_system tiflash_functions tiflash_aggregate_functions tiflash_table_functions) +target_include_directories (tiflash-server-lib PUBLIC ${TiFlash_SOURCE_DIR}/libs/libdaemon/include) -add_library (clickhouse-client-lib Client.cpp) -target_link_libraries (clickhouse-client-lib clickhouse_functions clickhouse_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) -target_include_directories (clickhouse-client-lib PRIVATE ${READLINE_INCLUDE_DIR}) +add_library (tiflash-client-lib Client.cpp) +target_link_libraries (tiflash-client-lib tiflash_functions tiflash_aggregate_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_include_directories (tiflash-client-lib PRIVATE ${READLINE_INCLUDE_DIR}) add_library(tiflash-dttool-lib ${SPLIT_SHARED} DTTool/DTToolBench.cpp DTTool/DTToolMigrate.cpp DTTool/DTToolInspect.cpp) -target_link_libraries(tiflash-dttool-lib PUBLIC dbms daemon clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(tiflash-dttool-lib PUBLIC dbms daemon tiflash_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_include_directories(tiflash-dttool-lib PUBLIC ${TiFlash_SOURCE_DIR}/libs/libdaemon/include) add_library(tiflash-dttool-entry-object STATIC DTTool/DTTool.cpp) @@ -144,15 +144,15 @@ endif () include(CMakePrintHelpers) cmake_print_properties(TARGETS tiflash PROPERTIES BUILD_RPATH INSTALL_RPATH) -target_link_libraries (tiflash clickhouse_common_io) +target_link_libraries (tiflash tiflash_common_io) target_include_directories (tiflash BEFORE PRIVATE ${COMMON_INCLUDE_DIR}) target_include_directories (tiflash PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -if (ENABLE_CLICKHOUSE_SERVER) - target_link_libraries (tiflash clickhouse-server-lib) +if (ENABLE_TIFLASH_SERVER) + target_link_libraries (tiflash tiflash-server-lib) endif () -if (ENABLE_CLICKHOUSE_CLIENT) - target_link_libraries (tiflash clickhouse-client-lib) +if (ENABLE_TIFLASH_CLIENT) + target_link_libraries (tiflash tiflash-client-lib) endif () if (ENABLE_TIFLASH_DTTOOL) target_link_libraries(tiflash tiflash-dttool-entry-object) diff --git a/dbms/src/Server/config_tools.h.in b/dbms/src/Server/config_tools.h.in index 03a478a6473..a90191454da 100644 --- a/dbms/src/Server/config_tools.h.in +++ b/dbms/src/Server/config_tools.h.in @@ -2,8 +2,8 @@ // .h autogenerated by cmake ! -#cmakedefine01 ENABLE_CLICKHOUSE_SERVER -#cmakedefine01 ENABLE_CLICKHOUSE_CLIENT +#cmakedefine01 ENABLE_TIFLASH_SERVER +#cmakedefine01 ENABLE_TIFLASH_CLIENT #cmakedefine01 ENABLE_TIFLASH_DTTOOL #cmakedefine01 ENABLE_TIFLASH_DTWORKLOAD #cmakedefine01 ENABLE_TIFLASH_PAGEWORKLOAD diff --git a/dbms/src/Server/main.cpp b/dbms/src/Server/main.cpp index 83629eda1ae..965f7f0aab3 100644 --- a/dbms/src/Server/main.cpp +++ b/dbms/src/Server/main.cpp @@ -25,7 +25,7 @@ #include /// pair #include -#if ENABLE_CLICKHOUSE_SERVER +#if ENABLE_TIFLASH_SERVER #include "Server.h" #endif #if ENABLE_TIFLASH_DTTOOL @@ -44,10 +44,10 @@ #include /// Universal executable for various clickhouse applications -#if ENABLE_CLICKHOUSE_SERVER +#if ENABLE_TIFLASH_SERVER int mainEntryClickHouseServer(int argc, char ** argv); #endif -#if ENABLE_CLICKHOUSE_CLIENT +#if ENABLE_TIFLASH_CLIENT int mainEntryClickHouseClient(int argc, char ** argv); #endif @@ -94,10 +94,10 @@ using MainFunc = int (*)(int, char **); /// Add an item here to register new application std::pair clickhouse_applications[] = { -#if ENABLE_CLICKHOUSE_CLIENT +#if ENABLE_TIFLASH_CLIENT {"client", mainEntryClickHouseClient}, #endif -#if ENABLE_CLICKHOUSE_SERVER +#if ENABLE_TIFLASH_SERVER {"server", mainEntryClickHouseServer}, #endif #if ENABLE_TIFLASH_DTTOOL diff --git a/dbms/src/Storages/DeltaMerge/tests/CMakeLists.txt b/dbms/src/Storages/DeltaMerge/tests/CMakeLists.txt index 868e0955dcf..5bd5544160a 100644 --- a/dbms/src/Storages/DeltaMerge/tests/CMakeLists.txt +++ b/dbms/src/Storages/DeltaMerge/tests/CMakeLists.txt @@ -22,7 +22,7 @@ endmacro() # attach all dm gtest sources grep_gtest_sources(${TiFlash_SOURCE_DIR}/dbms/src/Storages/DeltaMerge/tests dm_gtest_sources) add_executable(gtests_dm EXCLUDE_FROM_ALL ${dm_gtest_sources} DMTestEnv.h) -target_link_libraries(gtests_dm gtest_main dbms clickhouse_functions) +target_link_libraries(gtests_dm gtest_main dbms tiflash_functions) add_check(gtests_dm) # add unit test manually @@ -35,33 +35,33 @@ target_link_libraries(dm_test_storage_delta_merge ${Poco_Net_LIBRARY} ${Poco_Data_LIBRARY} common - clickhouse_common_io - clickhouse_functions + tiflash_common_io + tiflash_functions ) add_executable(dm_test_delta_merge_store EXCLUDE_FROM_ALL gtest_dm_delta_merge_store.cpp) -target_link_libraries(dm_test_delta_merge_store dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_delta_merge_store dbms gtest_main tiflash_functions) add_executable(dm_test_delta_merge_store_for_fast_scan EXCLUDE_FROM_ALL gtest_dm_delta_merge_store_for_fast_scan.cpp) -target_link_libraries(dm_test_delta_merge_store_for_fast_scan dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_delta_merge_store_for_fast_scan dbms gtest_main tiflash_functions) add_executable(dm_test_segment EXCLUDE_FROM_ALL gtest_dm_segment.cpp) -target_link_libraries(dm_test_segment dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_segment dbms gtest_main tiflash_functions) add_executable(dm_test_delta_tree EXCLUDE_FROM_ALL gtest_dm_delta_tree.cpp) target_link_libraries(dm_test_delta_tree dbms gtest_main) add_executable(dm_test_dmfile EXCLUDE_FROM_ALL gtest_dm_file.cpp) -target_link_libraries(dm_test_dmfile dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_dmfile dbms gtest_main tiflash_functions) add_executable(dm_test_minmax_index EXCLUDE_FROM_ALL gtest_dm_minmax_index.cpp) -target_link_libraries(dm_test_minmax_index dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_minmax_index dbms gtest_main tiflash_functions) add_executable(dm_test_delta_index_manager EXCLUDE_FROM_ALL gtest_dm_delta_index_manager.cpp) -target_link_libraries(dm_test_delta_index_manager dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_delta_index_manager dbms gtest_main tiflash_functions) add_executable(dm_test_delta_value_space EXCLUDE_FROM_ALL gtest_dm_delta_value_space.cpp) -target_link_libraries(dm_test_delta_value_space dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_delta_value_space dbms gtest_main tiflash_functions) add_executable(dm_test_column_file EXCLUDE_FROM_ALL gtest_dm_column_file.cpp) -target_link_libraries(dm_test_column_file dbms gtest_main clickhouse_functions) +target_link_libraries(dm_test_column_file dbms gtest_main tiflash_functions) diff --git a/dbms/src/Storages/DeltaMerge/workload/CMakeLists.txt b/dbms/src/Storages/DeltaMerge/workload/CMakeLists.txt index 7a83cbec57c..738c2838713 100644 --- a/dbms/src/Storages/DeltaMerge/workload/CMakeLists.txt +++ b/dbms/src/Storages/DeltaMerge/workload/CMakeLists.txt @@ -17,4 +17,4 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}) set(dt-workload-src MainEntry.cpp DTWorkload.cpp KeyGenerator.cpp TableGenerator.cpp DataGenerator.cpp Limiter.cpp Options.cpp Utils.cpp ${TiFlash_SOURCE_DIR}/dbms/src/TestUtils/TiFlashTestEnv.cpp) add_library(dt-workload-lib ${dt-workload-src}) -target_link_libraries(dt-workload-lib dbms clickhouse_functions clickhouse-server-lib) +target_link_libraries(dt-workload-lib dbms) diff --git a/dbms/src/Storages/Page/V3/CMakeLists.txt b/dbms/src/Storages/Page/V3/CMakeLists.txt index 43209c24162..571c7476733 100644 --- a/dbms/src/Storages/Page/V3/CMakeLists.txt +++ b/dbms/src/Storages/Page/V3/CMakeLists.txt @@ -27,4 +27,4 @@ add_library(page_storage_v3 EXCLUDE_FROM_ALL ${io_base_headers} ${io_base_sources} ) target_include_directories(page_storage_v3 PUBLIC ${TiFlash_SOURCE_DIR}/contrib/tiflash-proxy/raftstore-proxy/ffi/src) -target_link_libraries(page_storage_v3 clickhouse_common_io cpptoml kv_client tipb) \ No newline at end of file +target_link_libraries(page_storage_v3 tiflash_common_io cpptoml kv_client tipb) \ No newline at end of file diff --git a/dbms/src/Storages/Page/tools/PageCtl/CMakeLists.txt b/dbms/src/Storages/Page/tools/PageCtl/CMakeLists.txt index d9b0ae34bf0..98e442e3569 100644 --- a/dbms/src/Storages/Page/tools/PageCtl/CMakeLists.txt +++ b/dbms/src/Storages/Page/tools/PageCtl/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}) -add_library(page-ctl-lib MainEntry.cpp PageStorageCtlV3.cpp PageStorageCtlV2.cpp ${page-ctl-src}) -target_include_directories(page-ctl-lib PUBLIC ${TiFlash_SOURCE_DIR}/libs/libdaemon/include) -target_link_libraries(page-ctl-lib dbms daemon tiflash-dttool-entry-object clickhouse-server-lib) -target_compile_options(page-ctl-lib PRIVATE -Wno-format) +add_library (page-ctl-lib MainEntry.cpp PageStorageCtlV3.cpp PageStorageCtlV2.cpp ${page-ctl-src}) +target_include_directories (page-ctl-lib PUBLIC ${TiFlash_SOURCE_DIR}/libs/libdaemon/include) +target_link_libraries (page-ctl-lib dbms tiflash-dttool-entry-object) +target_compile_options(page-ctl-lib PRIVATE -Wno-format) diff --git a/dbms/src/Storages/Page/tools/PageCtl/PageStorageCtlV2.cpp b/dbms/src/Storages/Page/tools/PageCtl/PageStorageCtlV2.cpp index 76875802f7d..8a918145e5e 100644 --- a/dbms/src/Storages/Page/tools/PageCtl/PageStorageCtlV2.cpp +++ b/dbms/src/Storages/Page/tools/PageCtl/PageStorageCtlV2.cpp @@ -48,8 +48,8 @@ Usage: void printPageEntry(const DB::PageIdU64 pid, const DB::PageEntry & entry) { - printf("\tpid:%9lld\t\t" - "%9llu\t%9u\t%9u\t%9llu\t%9llu\t%016llx\n", + printf("\tpid:%9llu\t\t" + "%9llu\t%9u\t%9llu\t%9llu\t%9llu\t%016llu\n", pid, // entry.file_id, entry.level, @@ -260,13 +260,13 @@ void dump_all_entries(PageFileSet & page_files, int32_t mode) id_and_caches.emplace_back(std::make_pair(record.page_id, record.entry)); break; case DB::WriteBatchWriteType::DEL: - printf("DEL\t%lld\t%llu\t%u\n", // + printf("DEL\t%llu\t%llu\t%u\n", // record.page_id, page_file.getFileId(), page_file.getLevel()); break; case DB::WriteBatchWriteType::REF: - printf("REF\t%lld\t%lld\t\t%llu\t%u\n", // + printf("REF\t%llu\t%llu\t\t%llu\t%u\n", // record.page_id, record.ori_page_id, page_file.getFileId(), diff --git a/dbms/src/Storages/Page/workload/CMakeLists.txt b/dbms/src/Storages/Page/workload/CMakeLists.txt index 0ecbc1c3685..7d15805c6c9 100644 --- a/dbms/src/Storages/Page/workload/CMakeLists.txt +++ b/dbms/src/Storages/Page/workload/CMakeLists.txt @@ -17,5 +17,4 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}) set (page-workload-src MainEntry.cpp PSBackground.cpp PSRunnable.cpp PSStressEnv.cpp PSWorkload.cpp) add_library (page-workload-lib ${page-workload-src}) -target_link_libraries (page-workload-lib dbms clickhouse_functions clickhouse-server-lib) -target_compile_options (page-workload-lib PRIVATE -Wno-format) \ No newline at end of file +target_link_libraries (page-workload-lib dbms) \ No newline at end of file diff --git a/dbms/src/Storages/Page/workload/PageStorageInMemoryCapacity.h b/dbms/src/Storages/Page/workload/PageStorageInMemoryCapacity.h index 632f99bcb5a..8f94b9f5def 100644 --- a/dbms/src/Storages/Page/workload/PageStorageInMemoryCapacity.h +++ b/dbms/src/Storages/Page/workload/PageStorageInMemoryCapacity.h @@ -97,7 +97,7 @@ class PageStorageInMemoryCapacity : public StressWorkload while (fgets(buffer, 128, file)) { if ((strncmp((buffer), (MEMORY_TOTAL_LABEL), strlen(MEMORY_TOTAL_LABEL)) == 0) - && sscanf(buffer + strlen(MEMORY_TOTAL_LABEL), " %32llu kB", &total_mem)) // NOLINT + && sscanf(buffer + strlen(MEMORY_TOTAL_LABEL), " %32lu kB", &total_mem)) // NOLINT { break; } diff --git a/dbms/src/Storages/System/CMakeLists.txt b/dbms/src/Storages/System/CMakeLists.txt index 11f2310c0d9..9a57742137c 100644 --- a/dbms/src/Storages/System/CMakeLists.txt +++ b/dbms/src/Storages/System/CMakeLists.txt @@ -15,5 +15,5 @@ include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) add_headers_and_sources(storages_system .) -add_library(clickhouse_storages_system ${storages_system_headers} ${storages_system_sources}) -target_link_libraries(clickhouse_storages_system dbms) +add_library(tiflash_storages_system ${storages_system_headers} ${storages_system_sources}) +target_link_libraries(tiflash_storages_system dbms) diff --git a/dbms/src/Storages/Transaction/tests/CMakeLists.txt b/dbms/src/Storages/Transaction/tests/CMakeLists.txt index 6fc4857747e..91107a31dfe 100644 --- a/dbms/src/Storages/Transaction/tests/CMakeLists.txt +++ b/dbms/src/Storages/Transaction/tests/CMakeLists.txt @@ -25,6 +25,6 @@ grep_gtest_sources (${TiFlash_SOURCE_DIR}/dbms/src/Storages/Transaction/tests gt add_executable (gtests_tmt EXCLUDE_FROM_ALL ${gtests_tmt_sources}) target_include_directories (gtests_tmt BEFORE PRIVATE ${SPARCEHASH_INCLUDE_DIR}) -target_link_libraries (gtests_tmt gtest_main dbms clickhouse_functions) +target_link_libraries (gtests_tmt gtest_main dbms tiflash_functions) target_compile_options (gtests_tmt PRIVATE -Wno-unknown-pragmas) add_check (gtests_tmt) diff --git a/dbms/src/Storages/Transaction/tests/bench_region_block_reader.cpp b/dbms/src/Storages/Transaction/tests/bench_region_block_reader.cpp index 05ab637de7f..fdcc0bfa859 100644 --- a/dbms/src/Storages/Transaction/tests/bench_region_block_reader.cpp +++ b/dbms/src/Storages/Transaction/tests/bench_region_block_reader.cpp @@ -13,6 +13,7 @@ // limitations under the License. #include +#include #include #include #include @@ -74,7 +75,7 @@ class RegionBlockReaderBenchTest : public benchmark::Fixture for (size_t i = 0; i < primary_index_info.idx_cols.size(); i++) { auto idx = column_name_columns_index_map[primary_index_info.idx_cols[i].name]; - EncodeDatum(pk_fields[i], table_info.columns[idx].getCodecFlag(), pk_buf); + DB::EncodeDatum(pk_fields[i], table_info.columns[idx].getCodecFlag(), pk_buf); } } else diff --git a/dbms/src/TableFunctions/CMakeLists.txt b/dbms/src/TableFunctions/CMakeLists.txt index fe5ec933bed..3cd2084fc26 100644 --- a/dbms/src/TableFunctions/CMakeLists.txt +++ b/dbms/src/TableFunctions/CMakeLists.txt @@ -13,10 +13,10 @@ # limitations under the License. include(${TiFlash_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) -add_headers_and_sources(clickhouse_table_functions .) +add_headers_and_sources(tiflash_table_functions .) -list(REMOVE_ITEM clickhouse_table_functions_sources ITableFunction.cpp TableFunctionFactory.cpp) -list(REMOVE_ITEM clickhouse_table_functions_headers ITableFunction.h TableFunctionFactory.h) +list(REMOVE_ITEM tiflash_table_functions_sources ITableFunction.cpp TableFunctionFactory.cpp) +list(REMOVE_ITEM tiflash_table_functions_headers ITableFunction.h TableFunctionFactory.h) -add_library(clickhouse_table_functions ${clickhouse_table_functions_sources}) -target_link_libraries(clickhouse_table_functions clickhouse_storages_system dbms ${Poco_Foundation_LIBRARY}) +add_library(tiflash_table_functions ${tiflash_table_functions_sources}) +target_link_libraries(tiflash_table_functions tiflash_storages_system dbms ${Poco_Foundation_LIBRARY}) diff --git a/dbms/src/TestUtils/CMakeLists.txt b/dbms/src/TestUtils/CMakeLists.txt index 822c086f59b..56b8a012ffe 100644 --- a/dbms/src/TestUtils/CMakeLists.txt +++ b/dbms/src/TestUtils/CMakeLists.txt @@ -18,7 +18,7 @@ add_headers_and_sources(test_util .) list(REMOVE_ITEM test_util_sources "bench_dbms_main.cpp" "gtests_dbms_main.cpp") add_library(test_util_gtest_main ${test_util_headers} ${test_util_sources} gtests_dbms_main.cpp) -target_link_libraries(test_util_gtest_main dbms gtest_main clickhouse_aggregate_functions server_for_test) +target_link_libraries(test_util_gtest_main dbms gtest_main tiflash_aggregate_functions server_for_test) add_library(test_util_bench_main ${test_util_headers} ${test_util_sources} bench_dbms_main.cpp) target_link_libraries(test_util_bench_main dbms gtest_main benchmark) diff --git a/libs/libdaemon/CMakeLists.txt b/libs/libdaemon/CMakeLists.txt index 8c93bf8659d..89073c3d1b7 100644 --- a/libs/libdaemon/CMakeLists.txt +++ b/libs/libdaemon/CMakeLists.txt @@ -35,7 +35,7 @@ endif () target_include_directories (daemon PUBLIC include) target_include_directories (daemon PRIVATE ${TiFlash_SOURCE_DIR}/libs/libpocoext/include) -target_link_libraries (daemon clickhouse_common_io clickhouse_common_config grpc grpc++ ${EXECINFO_LIBRARY}) +target_link_libraries (daemon tiflash_common_io tiflash_common_config grpc grpc++ ${EXECINFO_LIBRARY}) if (ENABLE_TESTS) add_subdirectory (src/tests EXCLUDE_FROM_ALL) endif ()