Prepare to new poco (PocoData renamed to PocoSQL) (#2158)

cmake/find_poco.cmake

@@ -9,7 +9,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/poco/CMakeLists.txt")
 endif ()
 
 if (NOT USE_INTERNAL_POCO_LIBRARY)
-    find_package (Poco COMPONENTS Net NetSSL XML Data Crypto DataODBC MongoDB)
+    find_package (Poco COMPONENTS Net NetSSL XML SQL Data Crypto DataODBC MongoDB)
 endif ()
 
 if (Poco_INCLUDE_DIRS AND Poco_Foundation_LIBRARY)
@@ -24,6 +24,15 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
     set (ENABLE_DATA_SQLITE 0 CACHE BOOL "")
     set (ENABLE_DATA_MYSQL 0 CACHE BOOL "")
     set (ENABLE_DATA_POSTGRESQL 0 CACHE BOOL "")
+    # new after 2.0.0:
+    set (POCO_ENABLE_ZIP 0 CACHE BOOL "")
+    set (POCO_ENABLE_PAGECOMPILER 0 CACHE BOOL "")
+    set (POCO_ENABLE_PAGECOMPILER_FILE2PAGE 0 CACHE BOOL "")
+    set (POCO_ENABLE_REDIS 0 CACHE BOOL "")
+    set (POCO_ENABLE_SQL_SQLITE 0 CACHE BOOL "")
+    set (POCO_ENABLE_SQL_MYSQL 0 CACHE BOOL "")
+    set (POCO_ENABLE_SQL_POSTGRESQL 0 CACHE BOOL "")
+
     set (POCO_UNBUNDLED 1 CACHE BOOL "")
     set (POCO_UNBUNDLED_PCRE 0 CACHE BOOL "")
     set (POCO_UNBUNDLED_EXPAT 0 CACHE BOOL "")
@@ -44,9 +53,25 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
     endif ()
 
     if (ODBC_FOUND)
-        set (Poco_DataODBC_FOUND 1)
+        if (EXISTS "${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/ODBC/include/")
-        set (Poco_DataODBC_LIBRARY PocoDataODBC ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
+            set (Poco_SQL_FOUND 1)
-        set (Poco_DataODBC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/")
+            set (Poco_SQLODBC_FOUND 1)
+            set (Poco_SQL_INCLUDE_DIRS
+                "${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/include"
+                "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/include"
+                )
+            set (Poco_SQLODBC_INCLUDE_DIRS
+                "${ClickHouse_SOURCE_DIR}/contrib/poco/SQL/ODBC/include/"
+                "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/"
+                )
+            set (Poco_SQL_LIBRARY PocoSQL)
+            set (Poco_SQLODBC_LIBRARY PocoSQLODBC ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
+        else ()
+            set (Poco_DataODBC_FOUND 1)
+            set (Poco_DataODBC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/ODBC/include/" "${ClickHouse_SOURCE_DIR}/contrib/poco/Data/include")
+            set (Poco_Data_LIBRARY PocoData)
+            set (Poco_DataODBC_LIBRARY PocoDataODBC ${ODBC_LIBRARIES} ${LTDL_LIBRARY})
+        endif ()
     endif ()
 
     # TODO! fix internal ssl
@@ -66,7 +91,6 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
     set (Poco_Foundation_LIBRARY PocoFoundation)
     set (Poco_Util_LIBRARY PocoUtil)
     set (Poco_Net_LIBRARY PocoNet)
-    set (Poco_Data_LIBRARY PocoData)
     set (Poco_XML_LIBRARY PocoXML)
 endif ()
 

dbms/CMakeLists.txt

@@ -161,11 +161,20 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (clickhouse_common_io BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
 endif ()
 
-if (Poco_DataODBC_FOUND)
+if (Poco_SQLODBC_FOUND)
-    target_link_libraries (dbms ${Poco_DataODBC_LIBRARY})
+    target_link_libraries (clickhouse_common_io ${Poco_SQL_LIBRARY})
-    target_include_directories (dbms PRIVATE ${ODBC_INCLUDE_DIRECTORIES})
+    target_include_directories (clickhouse_common_io PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQL_INCLUDE_DIRS})
+    target_link_libraries (dbms ${Poco_SQLODBC_LIBRARY} ${Poco_SQL_LIBRARY})
+    target_include_directories (dbms PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIRS} PUBLIC ${Poco_SQL_INCLUDE_DIRS})
 endif()
 
+if (Poco_DataODBC_FOUND)
+    target_link_libraries (clickhouse_common_io ${Poco_Data_LIBRARY})
+    target_link_libraries (dbms ${Poco_DataODBC_LIBRARY})
+    target_include_directories (dbms PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIRS})
+endif()
+
+
 if (Poco_MongoDB_FOUND)
     target_link_libraries (dbms ${Poco_MongoDB_LIBRARY})
 endif()
@@ -212,6 +221,7 @@ endif ()
 target_include_directories (dbms PUBLIC ${DBMS_INCLUDE_DIR})
 target_include_directories (clickhouse_common_io PUBLIC ${DBMS_INCLUDE_DIR})
 target_include_directories (clickhouse_common_io PUBLIC ${PCG_RANDOM_INCLUDE_DIR})
+target_include_directories (clickhouse_common_io PUBLIC ${Poco_DataODBC_INCLUDE_DIRS})
 target_include_directories (clickhouse_common_io BEFORE PUBLIC ${DOUBLE_CONVERSION_INCLUDE_DIR})
 
 # also for copy_headers.sh:

dbms/src/Common/config.h.in

@@ -9,6 +9,7 @@
 #cmakedefine01 USE_RDKAFKA
 #cmakedefine01 USE_CAPNP
 #cmakedefine01 USE_EMBEDDED_COMPILER
+#cmakedefine01 Poco_SQLODBC_FOUND
 #cmakedefine01 Poco_DataODBC_FOUND
 #cmakedefine01 Poco_MongoDB_FOUND
 #cmakedefine01 Poco_NetSSL_FOUND

dbms/src/Common/config_build.cpp.in

@@ -34,6 +34,7 @@ const char * auto_config_build[]
     "USE_VECTORCLASS", "@USE_VECTORCLASS@",
     "USE_RDKAFKA", "@USE_RDKAFKA@",
     "USE_CAPNP", "@USE_CAPNP@",
+    "USE_Poco_SQLODBC", "@Poco_SQLODBC_FOUND@",
     "USE_Poco_DataODBC", "@Poco_DataODBC_FOUND@",
     "USE_Poco_MongoDB", "@Poco_MongoDB_FOUND@",
     "USE_Poco_NetSSL", "@Poco_NetSSL_FOUND@",

dbms/src/Dictionaries/DictionarySourceFactory.cpp

@@ -19,7 +19,7 @@
 #if Poco_MongoDB_FOUND
     #include <Dictionaries/MongoDBDictionarySource.h>
 #endif
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
     #include <Poco/Data/ODBC/Connector.h>
@@ -89,7 +89,7 @@ Block createSampleBlock(const DictionaryStructure & dict_struct)
 DictionarySourceFactory::DictionarySourceFactory()
     : log(&Poco::Logger::get("DictionarySourceFactory"))
 {
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
     Poco::Data::ODBC::Connector::registerConnector();
 #endif
 }
@@ -154,7 +154,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     }
     else if ("odbc" == source_type)
     {
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
         return std::make_unique<ODBCDictionarySource>(dict_struct, config, config_prefix + ".odbc", sample_block, context);
 #else
         throw Exception{"Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.",

dbms/src/Dictionaries/ODBCDictionarySource.h

@@ -1,17 +1,15 @@
 #pragma once
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include <Poco/Data/SessionPool.h>
+#pragma GCC diagnostic pop
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/ExternalQueryBuilder.h>
 #include <Dictionaries/DictionaryStructure.h>
 
-
 namespace Poco
 {
-    namespace Data
-    {
-        class SessionPool;
-    }
-
     namespace Util
     {
         class AbstractConfiguration;

dbms/src/Storages/StorageODBC.h

@@ -1,17 +1,13 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.h>
-
 #include <Storages/IStorage.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+    #include <Poco/Data/SessionPool.h>
+#pragma GCC diagnostic pop
 
-namespace Poco
-{
-    namespace Data
-    {
-        class SessionPool;
-    }
-}
 
 
 namespace DB

dbms/src/Storages/registerStorages.cpp

@@ -23,7 +23,7 @@ void registerStorageJoin(StorageFactory & factory);
 void registerStorageView(StorageFactory & factory);
 void registerStorageMaterializedView(StorageFactory & factory);
 
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
 void registerStorageODBC(StorageFactory & factory);
 #endif
 
@@ -56,7 +56,7 @@ void registerStorages()
     registerStorageView(factory);
     registerStorageMaterializedView(factory);
 
-    #if Poco_DataODBC_FOUND
+    #if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
     registerStorageODBC(factory);
     #endif
 

dbms/src/TableFunctions/CMakeLists.txt

@@ -6,7 +6,13 @@ list(REMOVE_ITEM clickhouse_table_functions_headers ITableFunction.h TableFuncti
 
 add_library(clickhouse_table_functions ${clickhouse_table_functions_sources})
 target_link_libraries(clickhouse_table_functions dbms clickhouse_storages_system ${Poco_Foundation_LIBRARY})
+
+if (Poco_SQLODBC_FOUND)
+    target_link_libraries (clickhouse_table_functions ${Poco_SQLODBC_LIBRARY})
+    target_include_directories (clickhouse_table_functions PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_SQLODBC_INCLUDE_DIRS})
+endif ()
+
 if (Poco_DataODBC_FOUND)
     target_link_libraries (clickhouse_table_functions ${Poco_DataODBC_LIBRARY})
-    target_include_directories (clickhouse_table_functions PRIVATE ${ODBC_INCLUDE_DIRECTORIES})
+    target_include_directories (clickhouse_table_functions PRIVATE ${ODBC_INCLUDE_DIRECTORIES} ${Poco_DataODBC_INCLUDE_DIRS})
 endif ()

dbms/src/TableFunctions/TableFunctionODBC.cpp

@@ -1,6 +1,6 @@
 #include <TableFunctions/TableFunctionODBC.h>
 
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
 #include <type_traits>
 #include <ext/scope_guard.h>
 

dbms/src/TableFunctions/TableFunctionODBC.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/config.h>
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
 
 #include <TableFunctions/ITableFunction.h>
 

dbms/src/TableFunctions/registerTableFunctions.cpp

@@ -11,7 +11,7 @@ void registerTableFunctionRemote(TableFunctionFactory & factory);
 void registerTableFunctionShardByHash(TableFunctionFactory & factory);
 void registerTableFunctionNumbers(TableFunctionFactory & factory);
 void registerTableFunctionCatBoostPool(TableFunctionFactory & factory);
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
 void registerTableFunctionODBC(TableFunctionFactory & factory);
 #endif
 
@@ -30,7 +30,7 @@ void registerTableFunctions()
     registerTableFunctionNumbers(factory);
     registerTableFunctionCatBoostPool(factory);
 
-#if Poco_DataODBC_FOUND
+#if Poco_SQLODBC_FOUND || Poco_DataODBC_FOUND
     registerTableFunctionODBC(factory);
 #endif