mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
4ffbca2d8c
* Log query id in executeQuery; Better type mismatch error; change format in report tool * Better log query_id * fix message * Use c++11 thread_local instaed of gcc's __thread * lock mutex before notifying waiting thread in sync insertion into distributed [#CLICKHOUSE-3379] * Cmake: fix build without downloaded submodules (#1379) * fix * ZooKeeper: fixed stack smashing with tryGet() The tryGet() operation creates a 1MB buffer on stack. This may or may not work depending on the default stack size for threads, whether the stack protector is enabled or not, recursion depth, and the actual value size. This is probably going to slow down some ZK operations, but I don't see how else this could work reliably with the existing API. * increased timeout for test_insertion_sync_fails_with_timeout * Update CHANGELOG_RU.md * Update ZooKeeper.cpp * Fix warnings * Fixes * Dont strip debug info from asan, tsan and other builds except releases * Fix asan error causd by test 00144 * Fix empty log message (#CLICKHOUSE-3378)
95 lines
3.7 KiB
CMake
95 lines
3.7 KiB
CMake
option (USE_INTERNAL_POCO_LIBRARY "Set to FALSE to use system poco library instead of bundled" ${NOT_UNBUNDLED})
|
|
|
|
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/poco/CMakeLists.txt")
|
|
message (WARNING "submodule contrib/poco is missing. to fix try run: \n git submodule update --init --recursive")
|
|
set (USE_INTERNAL_POCO_LIBRARY 0)
|
|
endif ()
|
|
|
|
if (NOT USE_INTERNAL_POCO_LIBRARY)
|
|
find_package (Poco COMPONENTS Net NetSSL XML Data Crypto DataODBC MongoDB)
|
|
endif ()
|
|
|
|
if (Poco_INCLUDE_DIRS AND Poco_Foundation_LIBRARY)
|
|
#include_directories (${Poco_INCLUDE_DIRS})
|
|
else ()
|
|
|
|
set (USE_INTERNAL_POCO_LIBRARY 1)
|
|
|
|
set (ENABLE_ZIP 0 CACHE BOOL "")
|
|
set (ENABLE_PAGECOMPILER 0 CACHE BOOL "")
|
|
set (ENABLE_PAGECOMPILER_FILE2PAGE 0 CACHE BOOL "")
|
|
set (ENABLE_REDIS 0 CACHE BOOL "")
|
|
set (ENABLE_DATA_SQLITE 0 CACHE BOOL "")
|
|
set (ENABLE_DATA_MYSQL 0 CACHE BOOL "")
|
|
set (ENABLE_DATA_POSTGRESQL 0 CACHE BOOL "")
|
|
set (POCO_UNBUNDLED 1 CACHE BOOL "")
|
|
set (POCO_UNBUNDLED_PCRE 0 CACHE BOOL "")
|
|
set (POCO_UNBUNDLED_EXPAT 0 CACHE BOOL "")
|
|
set (POCO_STATIC ${MAKE_STATIC_LIBRARIES} CACHE BOOL "")
|
|
set (POCO_VERBOSE_MESSAGES 1 CACHE BOOL "")
|
|
|
|
include (${ClickHouse_SOURCE_DIR}/cmake/find_ltdl.cmake)
|
|
include (${ClickHouse_SOURCE_DIR}/contrib/poco/cmake/FindODBC.cmake)
|
|
|
|
# used in internal compiler
|
|
list (APPEND Poco_INCLUDE_DIRS
|
|
"${ClickHouse_SOURCE_DIR}/contrib/poco/Foundation/include/"
|
|
"${ClickHouse_SOURCE_DIR}/contrib/poco/Util/include/"
|
|
)
|
|
|
|
if (NOT DEFINED POCO_ENABLE_MONGODB OR POCO_ENABLE_MONGODB)
|
|
set (Poco_MongoDB_FOUND 1)
|
|
set (Poco_MongoDB_LIBRARY PocoMongoDB)
|
|
set (Poco_MongoDB_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/poco/MongoDB/include/")
|
|
endif ()
|
|
|
|
if (ODBC_FOUND)
|
|
set (Poco_DataODBC_FOUND 1)
|
|
set (Poco_DataODBC_LIBRARY PocoDataODBC)
|
|
list (APPEND Poco_DataODBC_LIBRARY ${LTDL_LIB})
|
|
set (Poco_DataODBC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/")
|
|
endif ()
|
|
|
|
if (OPENSSL_FOUND)
|
|
set (Poco_NetSSL_FOUND 1)
|
|
set (Poco_NetSSL_LIBRARY PocoNetSSL)
|
|
set (Poco_Crypto_LIBRARY PocoCrypto)
|
|
set (Poco_NetSSL_INCLUDE_DIRS
|
|
"${ClickHouse_SOURCE_DIR}/contrib/poco/NetSSL_OpenSSL/include/"
|
|
"${ClickHouse_SOURCE_DIR}/contrib/poco/Crypto/include/"
|
|
)
|
|
endif ()
|
|
|
|
if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY)
|
|
list (APPEND Poco_INCLUDE_DIRS
|
|
"${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/"
|
|
"${ClickHouse_BINARY_DIR}/contrib/libzlib-ng/"
|
|
)
|
|
endif ()
|
|
|
|
set (Poco_Foundation_LIBRARY PocoFoundation)
|
|
set (Poco_Util_LIBRARY PocoUtil)
|
|
set (Poco_Net_LIBRARY PocoNet)
|
|
set (Poco_Data_LIBRARY PocoData)
|
|
set (Poco_XML_LIBRARY PocoXML)
|
|
|
|
#include_directories (BEFORE ${Poco_INCLUDE_DIRS})
|
|
|
|
endif ()
|
|
|
|
message(STATUS "Using Poco: ${Poco_INCLUDE_DIRS} : ${Poco_Foundation_LIBRARY},${Poco_Util_LIBRARY},${Poco_Net_LIBRARY},${Poco_NetSSL_LIBRARY},${Poco_XML_LIBRARY},${Poco_Data_LIBRARY},${Poco_DataODBC_LIBRARY},${Poco_MongoDB_LIBRARY}; MongoDB=${Poco_MongoDB_FOUND}, DataODBC=${Poco_DataODBC_FOUND}, NetSSL=${Poco_NetSSL_FOUND}")
|
|
|
|
# How to make sutable poco:
|
|
# use branch:
|
|
# develop OR poco-1.7.9-release + 6a49c94d18c654d7a20b8c8ea47071b1fdd4813b
|
|
# and merge:
|
|
# ClickHouse-Extras/clickhouse_unbundled
|
|
# ClickHouse-Extras/clickhouse_unbundled_zlib
|
|
# ClickHouse-Extras/clickhouse_task # uses c++11, can't push to poco
|
|
# ClickHouse-Extras/clickhouse_misc
|
|
# ClickHouse-Extras/clickhouse_anl
|
|
# ClickHouse-Extras/clickhouse_http_header https://github.com/pocoproject/poco/pull/1574
|
|
# ClickHouse-Extras/clickhouse_socket
|
|
# ClickHouse-Extras/clickhouse_warning
|
|
|