Fix split build finally

base/CMakeLists.txt

@@ -8,6 +8,7 @@ add_subdirectory (loggers)
 add_subdirectory (pcg-random)
 add_subdirectory (widechar_width)
 add_subdirectory (readpassphrase)
+add_subdirectory (bridge)
 
 if (USE_MYSQL)
     add_subdirectory (mysqlxx)

base/bridge/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library (bridge
+    IBridge.cpp
+)
+
+target_include_directories (daemon PUBLIC ..)
+target_link_libraries (bridge PRIVATE daemon dbms)
+

programs/library-bridge/CMakeLists.txt

@@ -18,7 +18,7 @@ target_link_libraries(clickhouse-library-bridge PRIVATE
     daemon
     dbms
     clickhouse_parsers
-    clickhouse_common_bridge
+    bridge
 )
 
 set_target_properties(clickhouse-library-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)

programs/library-bridge/LibraryBridge.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Interpreters/Context.h>
-#include <Common/Bridge/IBridge.h>
+#include <bridge/IBridge.h>
 #include "HandlerFactory.h"
 
 

src/Bridge/LibraryBridgeHelper.h

@@ -5,7 +5,7 @@
 #include <Poco/Logger.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
-#include <Common/IBridgeHelper.h>
+#include <Bridge/IBridgeHelper.h>
 
 
 namespace DB

src/Bridge/XDBCBridgeHelper.h

@@ -15,7 +15,7 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <common/logger_useful.h>
 #include <ext/range.h>
-#include <Common/IBridgeHelper.h>
+#include <Bridge/IBridgeHelper.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>

src/CMakeLists.txt

@@ -149,7 +149,6 @@ endif()
 
 add_subdirectory(Common/ZooKeeper)
 add_subdirectory(Common/Config)
-add_subdirectory(Common/Bridge)
 
 set (all_modules)
 macro(add_object_library name common_path)
@@ -181,6 +180,7 @@ add_object_library(clickhouse_storages_distributed Storages/Distributed)
 add_object_library(clickhouse_storages_mergetree Storages/MergeTree)
 add_object_library(clickhouse_storages_liveview Storages/LiveView)
 add_object_library(clickhouse_client Client)
+add_object_library(clickhouse_bridge Bridge)
 add_object_library(clickhouse_server Server)
 add_object_library(clickhouse_server_http Server/HTTP)
 add_object_library(clickhouse_formats Formats)

src/Common/Bridge/CMakeLists.txt

@@ -1,8 +0,0 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
-
-add_headers_and_sources(clickhouse_common_bridge .)
-
-add_library(clickhouse_common_bridge ${clickhouse_common_bridge_headers} ${clickhouse_common_bridge_sources})
-
-target_link_libraries (clickhouse_common_bridge PUBLIC clickhouse_common_io common PRIVATE daemon Poco::Util)
-

src/Common/ya.make

@@ -28,7 +28,6 @@ SRCS(
     ActionLock.cpp
     AlignedBuffer.cpp
     Allocator.cpp
-    Bridge/IBridge.cpp
     ClickHouseRevision.cpp
     Config/AbstractConfigurationComparison.cpp
     Config/ConfigProcessor.cpp
@@ -46,10 +45,8 @@ SRCS(
     ExternalLoaderStatus.cpp
     FieldVisitors.cpp
     FileChecker.cpp
-    IBridgeHelper.cpp
     IPv6ToBinary.cpp
     IntervalKind.cpp
-    LibraryBridgeHelper.cpp
     Macros.cpp
     MemoryStatisticsOS.cpp
     MemoryTracker.cpp

src/Dictionaries/LibraryDictionarySource.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/SharedLibrary.h>
-#include <Common/LibraryBridgeHelper.h>
+#include <Bridge/LibraryBridgeHelper.h>
 #include <common/LocalDateTime.h>
 #include <Common/thread_local_rng.h>
 #include "DictionaryStructure.h"

src/Dictionaries/XDBCDictionarySource.h

@@ -3,7 +3,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Data/SessionPool.h>
 #include <Poco/URI.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 #include "DictionaryStructure.h"
 #include "ExternalQueryBuilder.h"
 #include "IDictionarySource.h"

src/Storages/StorageXDBC.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/StorageURL.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 
 namespace DB

src/TableFunctions/ITableFunctionXDBC.h

@@ -3,7 +3,7 @@
 #include <Storages/StorageXDBC.h>
 #include <TableFunctions/ITableFunction.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>