thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 837daf0fd0 into b94a7167a8

Browse Source
This commit is contained in:
Raúl Marín 2024-09-18 23:24:00 +03:00 committed by GitHub
commit 169c31e82a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/boost-cmake/CMakeLists.txt
View File

@ -69,6 +69,11 @@ set (SRCS_PROGRAM_OPTIONS
"${LIBRARY_DIR}/libs/program_options/src/winmain.cpp" "${LIBRARY_DIR}/libs/program_options/src/winmain.cpp"
) )
# Always compile this file with the highest possible level of optimizations, even in Debug builds.
# Otherwise the client takes too long to start and SQL stateless tests (many options to parse)
# https://github.com/ClickHouse/ClickHouse/issues/65745
set_source_files_properties(${SRCS_PROGRAM_OPTIONS} PROPERTIES COMPILE_FLAGS "-O3")
add_library (_boost_program_options ${SRCS_PROGRAM_OPTIONS}) add_library (_boost_program_options ${SRCS_PROGRAM_OPTIONS})
add_library (boost::program_options ALIAS _boost_program_options) add_library (boost::program_options ALIAS _boost_program_options)
target_include_directories (_boost_program_options SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}) target_include_directories (_boost_program_options SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})

18
contrib/jemalloc-cmake/CMakeLists.txt
View File

@ -164,14 +164,16 @@ target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
# Because our coverage callbacks call malloc, and recursive call of malloc could not work. # Because our coverage callbacks call malloc, and recursive call of malloc could not work.
target_compile_options(_jemalloc PRIVATE ${WITHOUT_COVERAGE_FLAGS_LIST}) target_compile_options(_jemalloc PRIVATE ${WITHOUT_COVERAGE_FLAGS_LIST})
if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG") # We don't enable Jemalloc DEBUG and log anymore since those have a big impact in performance, specially noticeable
target_compile_definitions(_jemalloc PRIVATE # when starting the process (really common in stateless tests with the client)
-DJEMALLOC_DEBUG=1 #if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
# Usage examples: # target_compile_definitions(_jemalloc PRIVATE
# - MALLOC_CONF=log:. # -DJEMALLOC_DEBUG=1
# - MALLOC_CONF='log:core.malloc.exit|core.sallocx.entry|core.sdallocx.entry' # # Usage examples:
-DJEMALLOC_LOG=1) # # - MALLOC_CONF=log:.
endif () # # - MALLOC_CONF='log:core.malloc.exit|core.sallocx.entry|core.sdallocx.entry'
# -DJEMALLOC_LOG=1)
#endif ()
target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_PROF=1) target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_PROF=1)