Remove unbundled rocksdb support

CMakeLists.txt

@@ -528,7 +528,6 @@ include (cmake/find/fastops.cmake)
 include (cmake/find/odbc.cmake)
 include (cmake/find/nanodbc.cmake)
 include (cmake/find/sqlite.cmake)
-include (cmake/find/rocksdb.cmake)
 include (cmake/find/libpqxx.cmake)
 include (cmake/find/nuraft.cmake)
 include (cmake/find/yaml-cpp.cmake)

cmake/find/rocksdb.cmake

@@ -1,63 +0,0 @@
-if (OS_DARWIN AND ARCH_AARCH64)
-    set (ENABLE_ROCKSDB OFF CACHE INTERNAL "")
-endif()
-
-option(ENABLE_ROCKSDB "Enable ROCKSDB" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_ROCKSDB)
-    if (USE_INTERNAL_ROCKSDB_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal rocksdb library with ENABLE_ROCKSDB=OFF")
-    endif()
-    return()
-endif()
-
-option(USE_INTERNAL_ROCKSDB_LIBRARY "Set to FALSE to use system ROCKSDB library instead of bundled" ON)
-
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include")
-    if (USE_INTERNAL_ROCKSDB_LIBRARY)
-        message (WARNING "submodule contrib is missing. to fix try run: \n git submodule update --init")
-        message(${RECONFIGURE_MESSAGE_LEVEL} "cannot find internal rocksdb")
-    endif()
-    set (MISSING_INTERNAL_ROCKSDB 1)
-endif ()
-
-if (NOT USE_INTERNAL_ROCKSDB_LIBRARY)
-    find_library (ROCKSDB_LIBRARY rocksdb)
-    find_path (ROCKSDB_INCLUDE_DIR NAMES rocksdb/db.h PATHS ${ROCKSDB_INCLUDE_PATHS})
-    if (NOT ROCKSDB_LIBRARY OR NOT ROCKSDB_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system rocksdb library")
-    endif()
-
-    if (NOT SNAPPY_LIBRARY)
-        include(cmake/find/snappy.cmake)
-    endif()
-
-    find_package(BZip2)
-    find_library(LZ4_LIBRARY lz4)
-    find_library(GFLAGS_LIBRARY gflags)
-
-    if(SNAPPY_LIBRARY AND LZ4_LIBRARY AND BZIP2_FOUND AND GFLAGS_LIBRARY)
-        list (APPEND ROCKSDB_LIBRARY ${SNAPPY_LIBRARY})
-        list (APPEND ROCKSDB_LIBRARY ${LZ4_LIBRARY})
-        list (APPEND ROCKSDB_LIBRARY ${BZIP2_LIBRARY})
-        list (APPEND ROCKSDB_LIBRARY ${GFLAGS_LIBRARY})
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL}
-                 "Can't find system rocksdb: snappy=${SNAPPY_LIBRARY} ;"
-                 " lz4=${LZ4_LIBRARY} ;"
-                 " bz2=${BZIP2_LIBRARY} ;"
-                 " gflags=${GFLAGS_LIBRARY} ;")
-    endif()
-endif ()
-
-if(ROCKSDB_LIBRARY AND ROCKSDB_INCLUDE_DIR)
-    set(USE_ROCKSDB 1)
-elseif (NOT MISSING_INTERNAL_ROCKSDB)
-    set (USE_INTERNAL_ROCKSDB_LIBRARY 1)
-
-    set (ROCKSDB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include")
-    set (ROCKSDB_LIBRARY "rocksdb")
-    set (USE_ROCKSDB 1)
-endif ()
-
-message (STATUS "Using ROCKSDB=${USE_ROCKSDB}: ${ROCKSDB_INCLUDE_DIR} : ${ROCKSDB_LIBRARY}")

contrib/CMakeLists.txt

@@ -58,6 +58,7 @@ add_subdirectory (poco-cmake)
 add_subdirectory (croaring-cmake)
 add_subdirectory (zstd-cmake)
 add_subdirectory (zlib-ng-cmake)
+add_subdirectory (rocksdb-cmake)
 
 # TODO: refactor the contrib libraries below this comment.
 
@@ -258,9 +259,6 @@ if (USE_KRB5)
     endif()
 endif()
 
-if (USE_INTERNAL_ROCKSDB_LIBRARY)
-    add_subdirectory(rocksdb-cmake)
-endif()
 
 if (USE_LIBPQXX)
     add_subdirectory (libpq-cmake)

contrib/rocksdb-cmake/CMakeLists.txt

@@ -1,3 +1,10 @@
+option (ENABLE_ROCKSDB "Enable rocksdb library" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_ROCKSDB)
+  message (STATUS "Not using rocksdb")
+  return()
+endif()
+
 ## this file is extracted from `contrib/rocksdb/CMakeLists.txt`
 set(ROCKSDB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb")
 list(APPEND CMAKE_MODULE_PATH "${ROCKSDB_SOURCE_DIR}/cmake/modules/")
@@ -538,8 +545,8 @@ if(WITH_FOLLY_DISTRIBUTED_MUTEX)
     "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp")
 endif()
 
-set(ROCKSDB_STATIC_LIB rocksdb)
-
-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
-  ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+add_library(_rocksdb STATIC ${SOURCES})
+add_library(ch_contrib::rocksdb ALIAS _rocksdb)
+target_link_libraries(_rocksdb PRIVATE ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+# SYSTEM is required to overcome some issues
+target_include_directories(_rocksdb SYSTEM BEFORE INTERFACE "${ROCKSDB_SOURCE_DIR}/include")

src/CMakeLists.txt

@@ -23,6 +23,7 @@ set (CONFIG_COMMON "${CMAKE_CURRENT_BINARY_DIR}/Common/config.h")
 
 include (../cmake/version.cmake)
 message (STATUS "Will build ${VERSION_FULL} revision ${VERSION_REVISION} ${VERSION_OFFICIAL}")
+include (configure_config.cmake)
 configure_file (Common/config.h.in ${CONFIG_COMMON})
 configure_file (Common/config_version.h.in ${CONFIG_VERSION})
 configure_file (Core/config_core.h.in "${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h")
@@ -100,7 +101,7 @@ if (USE_LIBPQXX)
     add_headers_and_sources(dbms Storages/PostgreSQL)
 endif()
 
-if (USE_ROCKSDB)
+if (TARGET ch_contrib::rocksdb)
     add_headers_and_sources(dbms Storages/RocksDB)
 endif()
 
@@ -510,9 +511,8 @@ if (USE_ORC)
     dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/contrib/orc/c++/include")
 endif ()
 
-if (USE_ROCKSDB)
-    dbms_target_link_libraries(PUBLIC ${ROCKSDB_LIBRARY})
-    dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR})
+if (TARGET ch_contrib::rocksdb)
+    dbms_target_link_libraries(PUBLIC ch_contrib::rocksdb)
 endif()
 
 if (USE_LIBPQXX)

src/configure_config.cmake

@@ -0,0 +1,3 @@
+if (TARGET ch_contrib::rocksdb)
+    set(USE_ROCKSDB 1)
+endif()