Remove unbundled cassandra support

CMakeLists.txt

@@ -510,7 +510,6 @@ include (cmake/find/yaml-cpp.cmake)
 include (cmake/find/nlp.cmake)
 include (cmake/find/filelog.cmake)
 include (cmake/find/msgpack.cmake)
-include (cmake/find/cassandra.cmake)
 include (cmake/find/sentry.cmake)
 include (cmake/find/datasketches.cmake)
 

cmake/find/cassandra.cmake

@@ -1,34 +0,0 @@
-if (MISSING_INTERNAL_LIBUV_LIBRARY)
-    message (WARNING "Disabling cassandra due to missing libuv")
-    set (ENABLE_CASSANDRA OFF CACHE INTERNAL "")
-endif()
-
-option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_CASSANDRA)
-    return()
-endif()
-
-if (APPLE)
-    set(CMAKE_MACOSX_RPATH ON)
-endif()
-
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
-    message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal Cassandra")
-    set (USE_CASSANDRA 0)
-    return()
-endif()
-
-set (USE_CASSANDRA 1)
-set (CASSANDRA_INCLUDE_DIR
-        "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
-if (MAKE_STATIC_LIBRARIES)
-    set (CASSANDRA_LIBRARY cassandra_static)
-else()
-    set (CASSANDRA_LIBRARY cassandra)
-endif()
-
-set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
-
-message (STATUS "Using cassandra=${USE_CASSANDRA}: ${CASSANDRA_INCLUDE_DIR} : ${CASSANDRA_LIBRARY}")

contrib/CMakeLists.txt

@@ -149,9 +149,7 @@ endif()
 
 add_subdirectory (libuv-cmake)
 add_subdirectory (amqpcpp-cmake) # requires: libuv
-if (USE_CASSANDRA)
-    add_subdirectory (cassandra-cmake)
-endif()
+add_subdirectory (cassandra-cmake) # requires: libuv
 
 # Should go before:
 # - sentry-native

contrib/cassandra-cmake/CMakeLists.txt

@@ -1,3 +1,14 @@
+option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_CASSANDRA)
+    message(STATUS "Not using cassandra")
+    return()
+endif()
+
+if (APPLE)
+    set(CMAKE_MACOSX_RPATH ON)
+endif()
+
 # Need to use C++17 since the compilation is not possible with C++20 currently.
 set (CMAKE_CXX_STANDARD 17)
 
@@ -108,20 +119,22 @@ configure_file(
   ${CMAKE_CURRENT_BINARY_DIR}/driver_config.hpp)
 
 
-add_library(cassandra
+add_library(_cassandra
     ${SOURCES}
     $<TARGET_OBJECTS:curl_hostcheck>
     $<TARGET_OBJECTS:hdr_histogram>
     $<TARGET_OBJECTS:http-parser>
     $<TARGET_OBJECTS:minizip>)
 
-target_link_libraries(cassandra ch_contrib::zlib)
-add_library(cassandra_static ALIAS cassandra)
-target_include_directories(cassandra PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${INCLUDE_DIRS})
-target_compile_definitions(cassandra PRIVATE CASS_BUILDING)
+target_link_libraries(_cassandra ch_contrib::zlib)
+target_include_directories(_cassandra PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${INCLUDE_DIRS})
+target_include_directories(_cassandra SYSTEM BEFORE PUBLIC ${CASS_INCLUDE_DIR})
+target_compile_definitions(_cassandra PRIVATE CASS_BUILDING)
 
-target_link_libraries(cassandra uv)
+target_link_libraries(_cassandra ch_contrib::uv)
 
 if(CASS_USE_OPENSSL)
-    target_link_libraries(cassandra ssl)
+    target_link_libraries(_cassandra OpenSSL::SSL)
 endif()
+
+add_library(ch_contrib::cassandra ALIAS _cassandra)

src/Dictionaries/CMakeLists.txt

@@ -37,8 +37,8 @@ target_link_libraries(clickhouse_dictionaries
     PUBLIC
         abseil_swiss_tables)
 
-if(USE_CASSANDRA)
-    target_include_directories(clickhouse_dictionaries SYSTEM PRIVATE ${CASSANDRA_INCLUDE_DIR})
+if (TARGET ch_contrib::cassandra)
+    target_link_libraries(clickhouse_dictionaries PRIVATE ch_contrib::cassandra)
 endif()
 
 add_subdirectory(Embedded)

src/configure_config.cmake

@@ -46,3 +46,6 @@ endif()
 if (TARGET ch_contrib::amqp_cpp)
     set(USE_AMQPCPP 1)
 endif()
+if (TARGET ch_contrib::cassandra)
+    set(USE_CASSANDRA 1)
+endif()