Skip to content

Commit

Permalink
Merge branch 'master' into decouple_flashService
Browse files Browse the repository at this point in the history
  • Loading branch information
ywqzzy authored Jul 26, 2022
2 parents c38ee21 + a476307 commit 7571729
Show file tree
Hide file tree
Showing 227 changed files with 4,966 additions and 40,129 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ endif()
find_program (LLD_PATH NAMES "lld${COMPILER_POSTFIX}" "lld")
find_program (GOLD_PATH NAMES "gold")

if (NOT LINKER_NAME)
if (NOT LINKER_NAME AND NOT APPLE)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND LLD_PATH)
set (LINKER_NAME "lld")
elseif (GOLD_PATH)
Expand Down Expand Up @@ -439,7 +439,6 @@ option (ENABLE_UNWIND "Enable libunwind (better stacktraces)" ON)
include (libs/libdaemon/cmake/find_unwind.cmake)

# Need to process before "contrib" dir:
include (libs/libcommon/cmake/find_gperftools.cmake)
include (libs/libcommon/cmake/find_jemalloc.cmake)
include (libs/libcommon/cmake/find_mimalloc.cmake)
include (libs/libcommon/cmake/find_cctz.cmake)
Expand Down
5 changes: 0 additions & 5 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ Revision: 21d37dbaa45742c0bd23cc1e5a70b52cbc27f809
Address: https://github.com/ClickHouse/ClickHouse/tree/b13313eecca9455f4fdc923f597fe863df409742/contrib/libsparsehash
License: https://github.com/ClickHouse/ClickHouse/blob/b13313eecca9455f4fdc923f597fe863df409742/contrib/libsparsehash/COPYING
--------------------------------------
tcmalloc
Revision: dde32f8bbc95312379f9f5a651799815bb6327c5
Address: https://github.com/ClickHouse/ClickHouse/tree/b13313eecca9455f4fdc923f597fe863df409742/contrib/libtcmalloc
License: https://github.com/ClickHouse/ClickHouse/blob/b13313eecca9455f4fdc923f597fe863df409742/contrib/libtcmalloc/COPYING
--------------------------------------
libunwind
Revision: 19a2c01b1e8ac20871ea09d20f596d425ba53aed
Address: https://github.com/libunwind/libunwind
Expand Down
75 changes: 0 additions & 75 deletions cmake/Modules/FindGperftools.cmake

This file was deleted.

9 changes: 3 additions & 6 deletions contrib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ if (USE_INTERNAL_TIFLASH_PROXY)
add_subdirectory (tiflash-proxy-cmake)
endif ()

# TODO: remove tcmalloc
if (ENABLE_TCMALLOC AND USE_INTERNAL_GPERFTOOLS_LIBRARY)
add_subdirectory (libtcmalloc)
endif ()

if (ENABLE_JEMALLOC AND USE_INTERNAL_JEMALLOC_LIBRARY)
add_subdirectory (jemalloc-cmake)
endif ()
Expand Down Expand Up @@ -164,7 +159,9 @@ SET (BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Disable google-benchmark testi
add_subdirectory(benchmark)

set (BUILD_TESTING OFF CACHE BOOL "Disable cpu-features testing" FORCE)
add_subdirectory(cpu_features)
if (NOT (APPLE AND ARCH_AARCH64))
add_subdirectory(cpu_features)
endif()

if (ARCH_AARCH64 AND ARCH_LINUX)
add_subdirectory(arm-optimized-routines-cmake)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libtcmalloc/AUTHORS

This file was deleted.

81 changes: 0 additions & 81 deletions contrib/libtcmalloc/CMakeLists.txt

This file was deleted.

28 changes: 0 additions & 28 deletions contrib/libtcmalloc/COPYING

This file was deleted.

8 changes: 0 additions & 8 deletions contrib/libtcmalloc/README

This file was deleted.

Loading

0 comments on commit 7571729

Please sign in to comment.