Merge pull request #4353 from proller/fix10

Fix split link of dbms/programs/odbc-bridge

dbms/CMakeLists.txt

@@ -102,9 +102,6 @@ add_headers_and_sources(dbms src/Interpreters/ClusterProxy)
 add_headers_and_sources(dbms src/Columns)
 add_headers_and_sources(dbms src/Storages)
 add_headers_and_sources(dbms src/Storages/Distributed)
-if(USE_RDKAFKA)
-    add_headers_and_sources(dbms src/Storages/Kafka)
-endif()
 add_headers_and_sources(dbms src/Storages/MergeTree)
 add_headers_and_sources(dbms src/Client)
 add_headers_and_sources(dbms src/Formats)
@@ -297,11 +294,7 @@ if (USE_CAPNP)
 endif ()
 
 if (USE_RDKAFKA)
-    target_link_libraries (dbms PRIVATE ${RDKAFKA_LIBRARY})
-    target_link_libraries (dbms PRIVATE ${CPPKAFKA_LIBRARY})
-    if (NOT USE_INTERNAL_RDKAFKA_LIBRARY)
-        target_include_directories (dbms SYSTEM BEFORE PRIVATE ${RDKAFKA_INCLUDE_DIR})
-    endif ()
+    target_link_libraries (dbms PRIVATE clickhouse_storage_kafka)
 endif ()
 
 target_link_libraries(dbms PRIVATE ${OPENSSL_CRYPTO_LIBRARY} Threads::Threads)

dbms/programs/odbc-bridge/CMakeLists.txt

@@ -1,13 +1,6 @@
-add_library (clickhouse-odbc-bridge-lib ${LINK_MODE}
-    PingHandler.cpp
-    MainHandler.cpp
-    ColumnInfoHandler.cpp
-    IdentifierQuoteHandler.cpp
-    HandlerFactory.cpp
-    ODBCBridge.cpp
-    getIdentifierQuote.cpp
-    validateODBCConnectionString.cpp
-)
+add_headers_and_sources(clickhouse_odbc_bridge .)
+
+add_library (clickhouse-odbc-bridge-lib ${LINK_MODE} ${clickhouse_odbc_bridge_sources})
 
 target_link_libraries (clickhouse-odbc-bridge-lib PRIVATE daemon dbms clickhouse_common_io)
 target_include_directories (clickhouse-odbc-bridge-lib PUBLIC ${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)

dbms/programs/odbc-bridge/MainHandler.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <DataStreams/copyData.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <Dictionaries/ODBCBlockInputStream.h>
+#include "ODBCBlockInputStream.h"
 #include <Formats/BinaryRowInputStream.h>
 #include <Formats/FormatFactory.h>
 #include <IO/WriteBufferFromHTTPServerResponse.h>

dbms/programs/odbc-bridge/ODBCBlockInputStream.h

@@ -6,7 +6,7 @@
 #include <Poco/Data/RecordSet.h>
 #include <Poco/Data/Session.h>
 #include <Poco/Data/Statement.h>
-#include "ExternalResultDescription.h"
+#include <Dictionaries/ExternalResultDescription.h>
 
 
 namespace DB

dbms/src/Storages/CMakeLists.txt

@@ -1,5 +1,6 @@
-add_subdirectory (System)
+add_subdirectory(System)
+add_subdirectory(Kafka)
 
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+if(ENABLE_TESTS)
+    add_subdirectory(tests)
+endif()

dbms/src/Storages/Kafka/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(USE_RDKAFKA)
+    include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+    add_headers_and_sources(clickhouse_storage_kafka .)
+    add_library(clickhouse_storage_kafka ${LINK_MODE} ${clickhouse_storage_kafka_sources})
+    target_link_libraries(clickhouse_storage_kafka PRIVATE clickhouse_common_io ${CPPKAFKA_LIBRARY} ${RDKAFKA_LIBRARY})
+    if(NOT USE_INTERNAL_RDKAFKA_LIBRARY)
+        target_include_directories(clickhouse_storage_kafka SYSTEM BEFORE PRIVATE ${RDKAFKA_INCLUDE_DIR})
+    endif()
+endif()

debian/clickhouse-common-static.install

@@ -1,3 +1,4 @@
 usr/bin/clickhouse
+usr/bin/clickhouse-odbc-bridge
 etc/security/limits.d/clickhouse.conf
 usr/share/clickhouse/*

debian/clickhouse-server.install

@@ -2,7 +2,6 @@ usr/bin/clickhouse-server
 usr/bin/clickhouse-clang
 usr/bin/clickhouse-lld
 usr/bin/clickhouse-copier
-usr/bin/clickhouse-odbc-bridge
 usr/bin/clickhouse-report
 etc/clickhouse-server/config.xml
 etc/clickhouse-server/users.xml