thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move AggregateFunctionCount out from clickhouse_aggregate_functions to dbms

Browse Source 
As suggested by @alexey-milovidov
This commit is contained in:
Azat Khuzhin 2020-06-18 11:21:01 +03:00
parent 65c17f0c2c
commit 2bd05baa7a
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/odbc-bridge/CMakeLists.txt
View File

@ -14,6 +14,7 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
set (CLICKHOUSE_ODBC_BRIDGE_LINK set (CLICKHOUSE_ODBC_BRIDGE_LINK
PRIVATE PRIVATE
clickhouse_parsers clickhouse_parsers
clickhouse_aggregate_functions
daemon daemon
dbms dbms
Poco::Data Poco::Data

2
src/AggregateFunctions/CMakeLists.txt
View File

@ -4,6 +4,7 @@ add_headers_and_sources(clickhouse_aggregate_functions .)
list(REMOVE_ITEM clickhouse_aggregate_functions_sources list(REMOVE_ITEM clickhouse_aggregate_functions_sources
AggregateFunctionFactory.cpp AggregateFunctionFactory.cpp
AggregateFunctionCombinatorFactory.cpp AggregateFunctionCombinatorFactory.cpp
AggregateFunctionCount.cpp
AggregateFunctionState.cpp AggregateFunctionState.cpp
parseAggregateFunctionParameters.cpp parseAggregateFunctionParameters.cpp
FactoryHelpers.cpp FactoryHelpers.cpp
@ -14,6 +15,7 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_headers
IAggregateFunctionCombinator.h IAggregateFunctionCombinator.h
AggregateFunctionFactory.h AggregateFunctionFactory.h
AggregateFunctionCombinatorFactory.h AggregateFunctionCombinatorFactory.h
AggregateFunctionCount.h
AggregateFunctionState.h AggregateFunctionState.h
parseAggregateFunctionParameters.h parseAggregateFunctionParameters.h
FactoryHelpers.h FactoryHelpers.h

3
src/CMakeLists.txt
View File

@ -88,6 +88,7 @@ list (APPEND dbms_sources
AggregateFunctions/AggregateFunctionFactory.cpp AggregateFunctions/AggregateFunctionFactory.cpp
AggregateFunctions/AggregateFunctionCombinatorFactory.cpp AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
AggregateFunctions/AggregateFunctionState.cpp AggregateFunctions/AggregateFunctionState.cpp
AggregateFunctions/AggregateFunctionCount.cpp
AggregateFunctions/parseAggregateFunctionParameters.cpp) AggregateFunctions/parseAggregateFunctionParameters.cpp)
list (APPEND dbms_headers list (APPEND dbms_headers
@ -96,6 +97,7 @@ list (APPEND dbms_headers
AggregateFunctions/AggregateFunctionFactory.h AggregateFunctions/AggregateFunctionFactory.h
AggregateFunctions/AggregateFunctionCombinatorFactory.h AggregateFunctions/AggregateFunctionCombinatorFactory.h
AggregateFunctions/AggregateFunctionState.h AggregateFunctions/AggregateFunctionState.h
AggregateFunctions/AggregateFunctionCount.cpp
AggregateFunctions/FactoryHelpers.h AggregateFunctions/FactoryHelpers.h
AggregateFunctions/parseAggregateFunctionParameters.h) AggregateFunctions/parseAggregateFunctionParameters.h)
@ -171,7 +173,6 @@ else()
# force all split libs to be linked # force all split libs to be linked
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed") set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
endif () endif ()
target_link_libraries (dbms INTERFACE clickhouse_aggregate_functions)
macro (dbms_target_include_directories) macro (dbms_target_include_directories)
foreach (module ${all_modules}) foreach (module ${all_modules})

4
src/Interpreters/tests/CMakeLists.txt
View File

@ -34,11 +34,11 @@ target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARSEHAS
target_link_libraries (two_level_hash_map PRIVATE dbms) target_link_libraries (two_level_hash_map PRIVATE dbms)
add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp) add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp)
target_link_libraries (in_join_subqueries_preprocessor PRIVATE dbms clickhouse_parsers) target_link_libraries (in_join_subqueries_preprocessor PRIVATE clickhouse_aggregate_functions dbms clickhouse_parsers)
add_check(in_join_subqueries_preprocessor) add_check(in_join_subqueries_preprocessor)
add_executable (users users.cpp) add_executable (users users.cpp)
target_link_libraries (users PRIVATE dbms clickhouse_common_config) target_link_libraries (users PRIVATE clickhouse_aggregate_functions dbms clickhouse_common_config)
if (OS_LINUX) if (OS_LINUX)
add_executable (internal_iotop internal_iotop.cpp) add_executable (internal_iotop internal_iotop.cpp)