thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unbundled base64 support

Browse Source
This commit is contained in:
Azat Khuzhin 2022-01-17 23:32:13 +03:00
parent a30ef87d65
commit 126aa4b65c
7 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -499,7 +499,6 @@ include (cmake/find/pdqsort.cmake)
include (cmake/find/miniselect.cmake) include (cmake/find/miniselect.cmake)
include (cmake/find/curl.cmake) include (cmake/find/curl.cmake)
include (cmake/find/s3.cmake) include (cmake/find/s3.cmake)
include (cmake/find/base64.cmake)
include (cmake/find/fast_float.cmake) include (cmake/find/fast_float.cmake)
include (cmake/find/fastops.cmake) include (cmake/find/fastops.cmake)
include (cmake/find/odbc.cmake) include (cmake/find/odbc.cmake)

25
cmake/find/base64.cmake
View File

@ -1,25 +0,0 @@
if(ARCH_AMD64 OR ARCH_ARM)
option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
elseif(ENABLE_BASE64)
message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")
endif()
if (NOT ENABLE_BASE64)
return()
endif()
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64/LICENSE")
set (MISSING_INTERNAL_BASE64_LIBRARY 1)
message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init")
endif ()
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64")
message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init")
else()
set (BASE64_LIBRARY base64)
set (USE_BASE64 1)
endif()
if (NOT USE_BASE64)
message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable base64")
endif()

5
contrib/CMakeLists.txt vendored
View File

@ -135,10 +135,7 @@ if (USE_INTERNAL_AWS_S3_LIBRARY)
endif () endif ()
if (USE_BASE64) add_subdirectory (base64-cmake)
add_subdirectory (base64-cmake)
endif()
add_subdirectory (simdjson-cmake) add_subdirectory (simdjson-cmake)
if (USE_FASTOPS) if (USE_FASTOPS)

13
contrib/base64-cmake/CMakeLists.txt
View File

@ -1,3 +1,14 @@
if(ARCH_AMD64 OR ARCH_ARM)
option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
elseif(ENABLE_BASE64)
message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")
endif()
if (NOT ENABLE_BASE64)
message(STATUS "Not using base64")
return()
endif()
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64") SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
add_library(base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c") add_library(base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
@ -41,3 +52,5 @@ if (XCODE OR XCODE_VERSION)
endif () endif ()
target_sources(base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c") target_sources(base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
endif () endif ()
add_library(ch_contrib::base64 ALIAS base64)

4
programs/server/Server.cpp
View File

@ -114,10 +114,6 @@
# include <Server/KeeperTCPHandlerFactory.h> # include <Server/KeeperTCPHandlerFactory.h>
#endif #endif
#if USE_BASE64
# include <turbob64.h>
#endif
#if USE_JEMALLOC #if USE_JEMALLOC
# include <jemalloc/jemalloc.h> # include <jemalloc/jemalloc.h>
#endif #endif

5
src/Functions/CMakeLists.txt
View File

@ -12,7 +12,6 @@ add_library(clickhouse_functions ${clickhouse_functions_sources})
target_link_libraries(clickhouse_functions target_link_libraries(clickhouse_functions
PUBLIC PUBLIC
${BASE64_LIBRARY}
ch_contrib::cityhash ch_contrib::cityhash
ch_contrib::farmhash ch_contrib::farmhash
${FASTOPS_LIBRARY} ${FASTOPS_LIBRARY}
@ -72,8 +71,8 @@ if (USE_EMBEDDED_COMPILER)
target_include_directories(clickhouse_functions SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS}) target_include_directories(clickhouse_functions SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
endif () endif ()
if(USE_BASE64) if (TARGET ch_contrib::base64)
target_include_directories(clickhouse_functions SYSTEM PRIVATE ${BASE64_INCLUDE_DIR}) target_link_libraries(clickhouse_functions PRIVATE ch_contrib::base64)
endif() endif()
target_link_libraries(clickhouse_functions PRIVATE ch_contrib::lz4) target_link_libraries(clickhouse_functions PRIVATE ch_contrib::lz4)

3
src/configure_config.cmake
View File

@ -49,3 +49,6 @@ endif()
if (TARGET ch_contrib::cassandra) if (TARGET ch_contrib::cassandra)
set(USE_CASSANDRA 1) set(USE_CASSANDRA 1)
endif() endif()
if (TARGET ch_contrib::base64)
set(USE_BASE64 1)
endif()