remove: redis in poco, Dictionaries, Storages...

chdb-io · Mar 9, 2024 · f21f14b · f21f14b
1 parent c652837
commit f21f14b
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 3 deletions.
diff --git a/base/poco/CMakeLists.txt b/base/poco/CMakeLists.txt
@@ -8,6 +8,8 @@ if (ENABLE_MONGODB)
 endif ()
 add_subdirectory (Net)
 add_subdirectory (NetSSL_OpenSSL)
-add_subdirectory (Redis)
+if (ENABLE_REDIS)
+    add_subdirectory (Redis)
+endif ()
 add_subdirectory (Util)
 add_subdirectory (XML)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -398,13 +398,16 @@ dbms_target_link_libraries (
     PUBLIC
         boost::system
         clickhouse_common_io
-        Poco::Redis
 )
 
 if (ENABLE_MONGODB)
   dbms_target_link_libraries(PUBLIC Poco::MongoDB)
 endif()
 
+if (ENABLE_REDIS)
+  dmbs_target_link_libraries(PUBLIC Poco::Redis)
+endif()
+
 if (TARGET ch::mysqlxx)
     dbms_target_link_libraries (PUBLIC ch::mysqlxx)
 endif()

diff --git a/src/Dictionaries/CMakeLists.txt b/src/Dictionaries/CMakeLists.txt
@@ -36,13 +36,16 @@ target_link_libraries(clickhouse_dictionaries
         clickhouse_common_io
         dbms
         Poco::Data
-        Poco::Redis
         string_utils
 )
 if (ENABLE_MONGODB)
     target_link_libraries(clickhouse_dictionaries PRIVATE Poco::MongoDB)
 endif()
 
+if (ENABLE_REDIS)
+    target_link_libraries(clickhouse_dictionaries PRIVATE Poco::Redis)
+endif()
+
 target_link_libraries(clickhouse_dictionaries PUBLIC ch_contrib::abseil_swiss_tables)
 
 if (TARGET ch_contrib::cassandra)

diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #include "RedisDictionarySource.h"
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
@@ -179,3 +180,4 @@ namespace DB
     }
 
 }
+#endif
diff --git a/src/Dictionaries/RedisSource.cpp b/src/Dictionaries/RedisSource.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #include "RedisSource.h"
 
 #include <vector>
@@ -216,3 +217,4 @@ namespace DB
         return Chunk(std::move(columns), num_rows);
     }
 }
+#endif
diff --git a/src/Dictionaries/RedisSource.h b/src/Dictionaries/RedisSource.h
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #pragma once
 
 #include <Core/Block.h>
@@ -39,3 +40,4 @@ namespace DB
 
 }
 
+#endif
diff --git a/src/Storages/RedisCommon.cpp b/src/Storages/RedisCommon.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #include "RedisCommon.h"
 #include <Common/Exception.h>
 #include <Common/parseAddress.h>
@@ -148,3 +149,4 @@ RedisArrayPtr getRedisHashMapKeys(const RedisConnectionPtr & connection, RedisAr
 }
 
 }
+#endif
diff --git a/src/Storages/RedisCommon.h b/src/Storages/RedisCommon.h
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #pragma once
 
 #include <Poco/Redis/Client.h>
@@ -76,3 +77,4 @@ RedisConnectionPtr getRedisConnection(RedisPoolPtr pool, const RedisConfiguratio
 RedisArrayPtr getRedisHashMapKeys(const RedisConnectionPtr & connection, RedisArray & keys);
 
 }
+#endif
diff --git a/src/Storages/StorageRedis.cpp b/src/Storages/StorageRedis.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #include <unordered_set>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/MutationsInterpreter.h>
@@ -584,3 +585,4 @@ void registerStorageRedis(StorageFactory & factory)
 }
 
 }
+#endif
diff --git a/src/Storages/StorageRedis.h b/src/Storages/StorageRedis.h
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #pragma once
 
 #include <Poco/Redis/Redis.h>
@@ -81,3 +82,4 @@ class StorageRedis : public IStorage, public IKeyValueEntity, WithContext
 };
 
 }
+#endif
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
@@ -60,7 +60,9 @@ void registerStorageMySQL(StorageFactory & factory);
 #ifdef MONGODB
 void registerStorageMongoDB(StorageFactory & factory);
 #endif
+#ifdef USE_REDIS
 void registerStorageRedis(StorageFactory & factory);
+#endif
 
 
 #if USE_RDKAFKA
@@ -162,7 +164,9 @@ void registerStorages()
     #ifdef MONGODB
     registerStorageMongoDB(factory);
     #endif
+    #ifdef USE_REDIS
     registerStorageRedis(factory);
+    #endif
 
     #if USE_RDKAFKA
     registerStorageKafka(factory);

diff --git a/src/TableFunctions/TableFunctionRedis.cpp b/src/TableFunctions/TableFunctionRedis.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #include <TableFunctions/TableFunctionRedis.h>
 
 #include <Common/Exception.h>
@@ -92,3 +93,4 @@ void registerTableFunctionRedis(TableFunctionFactory & factory)
 }
 
 }
+#endif
diff --git a/src/TableFunctions/TableFunctionRedis.h b/src/TableFunctions/TableFunctionRedis.h
@@ -1,3 +1,4 @@
+#ifdef USE_REDIS
 #pragma once
 
 #include <Storages/StorageRedis.h>
@@ -32,3 +33,4 @@ class TableFunctionRedis : public ITableFunction
 };
 
 }
+#endif