From 05accbdcbef3469aad529c4207d3c4ebd011bfa1 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 19 Jun 2017 23:06:35 +0300 Subject: [PATCH] Removed cyclic dependency [#DEVTOOLS-3381]. --- dbms/CMakeLists.txt | 3 ++- dbms/src/Common/CMakeLists.txt | 2 ++ dbms/src/Common/ConfigProcessor.cpp | 2 +- dbms/src/Common/ZooKeeper/CMakeLists.txt | 3 +++ .../zkutil => dbms/src/Common/ZooKeeper}/Common.h | 2 +- .../zkutil => dbms/src/Common/ZooKeeper}/Increment.h | 2 +- .../src/Common/ZooKeeper}/KeeperException.h | 2 +- .../src/Common/ZooKeeper}/LeaderElection.h | 2 +- .../src => dbms/src/Common/ZooKeeper}/Lock.cpp | 2 +- .../zkutil => dbms/src/Common/ZooKeeper}/Lock.h | 2 +- .../src => dbms/src/Common/ZooKeeper}/RWLock.cpp | 2 +- .../zkutil => dbms/src/Common/ZooKeeper}/RWLock.h | 4 ++-- .../src/Common/ZooKeeper}/SingleBarrier.cpp | 4 ++-- .../src/Common/ZooKeeper}/SingleBarrier.h | 2 +- .../zkutil => dbms/src/Common/ZooKeeper}/Types.h | 0 .../src => dbms/src/Common/ZooKeeper}/ZooKeeper.cpp | 2 +- .../zkutil => dbms/src/Common/ZooKeeper}/ZooKeeper.h | 4 ++-- .../src/Common/ZooKeeper}/ZooKeeperHolder.cpp | 2 +- .../src/Common/ZooKeeper}/ZooKeeperHolder.h | 2 +- .../src/Common/ZooKeeper}/ZooKeeperNodeCache.cpp | 2 +- .../src/Common/ZooKeeper}/ZooKeeperNodeCache.h | 4 ++-- .../src/Common/ZooKeeper}/tests/CMakeLists.txt | 12 ++++++------ .../ZooKeeper}/tests/zk_many_watches_reconnect.cpp | 2 +- .../ZooKeeper}/tests/zkutil_expiration_test.cpp | 2 +- .../Common/ZooKeeper}/tests/zkutil_test_async.cpp | 2 +- .../Common/ZooKeeper}/tests/zkutil_test_commands.cpp | 2 +- .../src/Common/ZooKeeper}/tests/zkutil_test_lock.cpp | 2 +- .../ZooKeeper}/tests/zkutil_zookeeper_holder.cpp | 2 +- dbms/src/Databases/DatabaseCloud.cpp | 2 +- dbms/src/Interpreters/Context.cpp | 2 +- dbms/src/Interpreters/DDLWorker.cpp | 4 ++-- dbms/src/Interpreters/InterpreterCreateQuery.cpp | 2 +- dbms/src/Interpreters/tests/CMakeLists.txt | 2 +- dbms/src/Server/ConfigReloader.h | 4 ++-- dbms/src/Server/ExtractFromConfig.cpp | 2 +- dbms/src/Server/Server.cpp | 4 ++-- .../Storages/MergeTree/AbandonableLockInZooKeeper.h | 2 +- .../MergeTree/ReplicatedMergeTreeAlterThread.h | 2 +- .../MergeTree/ReplicatedMergeTreeLogEntry.cpp | 2 +- .../Storages/MergeTree/ReplicatedMergeTreeQueue.h | 2 +- .../MergeTree/ReplicatedMergeTreeQuorumEntry.h | 2 +- dbms/src/Storages/MergeTree/ReshardingWorker.cpp | 2 +- dbms/src/Storages/MergeTree/ReshardingWorker.h | 4 ++-- dbms/src/Storages/StorageReplicatedMergeTree.cpp | 4 ++-- dbms/src/Storages/StorageReplicatedMergeTree.h | 4 ++-- dbms/src/Storages/StorageTrivialBuffer.h | 2 +- dbms/src/Storages/System/StorageSystemZooKeeper.cpp | 2 +- libs/CMakeLists.txt | 1 - utils/CMakeLists.txt | 1 + utils/config-processor/CMakeLists.txt | 2 +- .../libzkutil => utils}/zookeeper-cli/CMakeLists.txt | 2 +- .../zookeeper-cli/zookeeper-cli.cpp | 4 ++-- .../CMakeLists.txt | 2 +- .../zookeeper-create-entry-to-download-part/main.cpp | 2 +- utils/zookeeper-dump-tree/CMakeLists.txt | 2 +- utils/zookeeper-dump-tree/main.cpp | 2 +- utils/zookeeper-remove-by-list/CMakeLists.txt | 2 +- utils/zookeeper-remove-by-list/main.cpp | 2 +- 58 files changed, 76 insertions(+), 70 deletions(-) create mode 100644 dbms/src/Common/ZooKeeper/CMakeLists.txt rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/Common.h (73%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/Increment.h (96%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/KeeperException.h (98%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/LeaderElection.h (99%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/Lock.cpp (99%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/Lock.h (98%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/RWLock.cpp (99%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/RWLock.h (97%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/SingleBarrier.cpp (98%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/SingleBarrier.h (98%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/Types.h (100%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/ZooKeeper.cpp (99%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/ZooKeeper.h (99%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/ZooKeeperHolder.cpp (97%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/ZooKeeperHolder.h (98%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/ZooKeeperNodeCache.cpp (98%) rename {libs/libzkutil/include/zkutil => dbms/src/Common/ZooKeeper}/ZooKeeperNodeCache.h (94%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/CMakeLists.txt (53%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zk_many_watches_reconnect.cpp (98%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zkutil_expiration_test.cpp (98%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zkutil_test_async.cpp (95%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zkutil_test_commands.cpp (97%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zkutil_test_lock.cpp (93%) rename {libs/libzkutil/src => dbms/src/Common/ZooKeeper}/tests/zkutil_zookeeper_holder.cpp (94%) rename {libs/libzkutil => utils}/zookeeper-cli/CMakeLists.txt (67%) rename {libs/libzkutil => utils}/zookeeper-cli/zookeeper-cli.cpp (98%) diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt index ab7517c925..3be15989fa 100644 --- a/dbms/CMakeLists.txt +++ b/dbms/CMakeLists.txt @@ -55,6 +55,7 @@ add_headers_and_sources(dbms src/Interpreters) add_headers_and_sources(dbms src/Interpreters/ClusterProxy) add_headers_and_sources(dbms src/Common) add_headers_and_sources(dbms src/Common/HashTable) +add_headers_and_sources(dbms src/Common/ZooKeeper) add_headers_and_sources(dbms src/IO) add_headers_and_sources(dbms src/Columns) add_headers_and_sources(dbms src/Storages) @@ -168,11 +169,11 @@ endif() target_link_libraries (dbms common - zkutil ${MYSQLXX_LIBRARY} cityhash farmhash metrohash ${LZ4_LIBRARY} ${ZSTD_LIBRARY} + ${ZOOKEEPER_LIBRARY} string_utils ${DOUBLE_CONVERSION_LIBRARY} ${ZLIB_LIBRARIES} diff --git a/dbms/src/Common/CMakeLists.txt b/dbms/src/Common/CMakeLists.txt index 6517235664..a2e7e3b4fb 100644 --- a/dbms/src/Common/CMakeLists.txt +++ b/dbms/src/Common/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(ZooKeeper) + if (ENABLE_TESTS) add_subdirectory (tests) endif () diff --git a/dbms/src/Common/ConfigProcessor.cpp b/dbms/src/Common/ConfigProcessor.cpp index ba9a73189e..e0202b559b 100644 --- a/dbms/src/Common/ConfigProcessor.cpp +++ b/dbms/src/Common/ConfigProcessor.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include using namespace Poco::XML; diff --git a/dbms/src/Common/ZooKeeper/CMakeLists.txt b/dbms/src/Common/ZooKeeper/CMakeLists.txt new file mode 100644 index 0000000000..6517235664 --- /dev/null +++ b/dbms/src/Common/ZooKeeper/CMakeLists.txt @@ -0,0 +1,3 @@ +if (ENABLE_TESTS) + add_subdirectory (tests) +endif () diff --git a/libs/libzkutil/include/zkutil/Common.h b/dbms/src/Common/ZooKeeper/Common.h similarity index 73% rename from libs/libzkutil/include/zkutil/Common.h rename to dbms/src/Common/ZooKeeper/Common.h index d9d4bba23b..19f55d8d31 100644 --- a/libs/libzkutil/include/zkutil/Common.h +++ b/dbms/src/Common/ZooKeeper/Common.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace zkutil diff --git a/libs/libzkutil/include/zkutil/Increment.h b/dbms/src/Common/ZooKeeper/Increment.h similarity index 96% rename from libs/libzkutil/include/zkutil/Increment.h rename to dbms/src/Common/ZooKeeper/Increment.h index f85d11c3c0..7e010589d3 100644 --- a/libs/libzkutil/include/zkutil/Increment.h +++ b/dbms/src/Common/ZooKeeper/Increment.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace zkutil { diff --git a/libs/libzkutil/include/zkutil/KeeperException.h b/dbms/src/Common/ZooKeeper/KeeperException.h similarity index 98% rename from libs/libzkutil/include/zkutil/KeeperException.h rename to dbms/src/Common/ZooKeeper/KeeperException.h index 6be13633b3..2a6e509652 100644 --- a/libs/libzkutil/include/zkutil/KeeperException.h +++ b/dbms/src/Common/ZooKeeper/KeeperException.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include diff --git a/libs/libzkutil/include/zkutil/LeaderElection.h b/dbms/src/Common/ZooKeeper/LeaderElection.h similarity index 99% rename from libs/libzkutil/include/zkutil/LeaderElection.h rename to dbms/src/Common/ZooKeeper/LeaderElection.h index a5480f131f..6d0b157de4 100644 --- a/libs/libzkutil/include/zkutil/LeaderElection.h +++ b/dbms/src/Common/ZooKeeper/LeaderElection.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/libs/libzkutil/src/Lock.cpp b/dbms/src/Common/ZooKeeper/Lock.cpp similarity index 99% rename from libs/libzkutil/src/Lock.cpp rename to dbms/src/Common/ZooKeeper/Lock.cpp index b30e7a9fd1..541446e7ac 100644 --- a/libs/libzkutil/src/Lock.cpp +++ b/dbms/src/Common/ZooKeeper/Lock.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace zkutil; diff --git a/libs/libzkutil/include/zkutil/Lock.h b/dbms/src/Common/ZooKeeper/Lock.h similarity index 98% rename from libs/libzkutil/include/zkutil/Lock.h rename to dbms/src/Common/ZooKeeper/Lock.h index c53d7d0256..dbacc2d62f 100644 --- a/libs/libzkutil/include/zkutil/Lock.h +++ b/dbms/src/Common/ZooKeeper/Lock.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/libs/libzkutil/src/RWLock.cpp b/dbms/src/Common/ZooKeeper/RWLock.cpp similarity index 99% rename from libs/libzkutil/src/RWLock.cpp rename to dbms/src/Common/ZooKeeper/RWLock.cpp index 4dcd015c6b..75bbe56991 100644 --- a/libs/libzkutil/src/RWLock.cpp +++ b/dbms/src/Common/ZooKeeper/RWLock.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/libs/libzkutil/include/zkutil/RWLock.h b/dbms/src/Common/ZooKeeper/RWLock.h similarity index 97% rename from libs/libzkutil/include/zkutil/RWLock.h rename to dbms/src/Common/ZooKeeper/RWLock.h index b9bd354bf1..b26c3a989b 100644 --- a/libs/libzkutil/include/zkutil/RWLock.h +++ b/dbms/src/Common/ZooKeeper/RWLock.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/libs/libzkutil/src/SingleBarrier.cpp b/dbms/src/Common/ZooKeeper/SingleBarrier.cpp similarity index 98% rename from libs/libzkutil/src/SingleBarrier.cpp rename to dbms/src/Common/ZooKeeper/SingleBarrier.cpp index 28af15a160..ba6e21e079 100644 --- a/libs/libzkutil/src/SingleBarrier.cpp +++ b/dbms/src/Common/ZooKeeper/SingleBarrier.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/libs/libzkutil/include/zkutil/SingleBarrier.h b/dbms/src/Common/ZooKeeper/SingleBarrier.h similarity index 98% rename from libs/libzkutil/include/zkutil/SingleBarrier.h rename to dbms/src/Common/ZooKeeper/SingleBarrier.h index 2fc1a233e9..aae58a7f41 100644 --- a/libs/libzkutil/include/zkutil/SingleBarrier.h +++ b/dbms/src/Common/ZooKeeper/SingleBarrier.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/libs/libzkutil/include/zkutil/Types.h b/dbms/src/Common/ZooKeeper/Types.h similarity index 100% rename from libs/libzkutil/include/zkutil/Types.h rename to dbms/src/Common/ZooKeeper/Types.h diff --git a/libs/libzkutil/src/ZooKeeper.cpp b/dbms/src/Common/ZooKeeper/ZooKeeper.cpp similarity index 99% rename from libs/libzkutil/src/ZooKeeper.cpp rename to dbms/src/Common/ZooKeeper/ZooKeeper.cpp index 8db8ab7647..c1fcb86a86 100644 --- a/libs/libzkutil/src/ZooKeeper.cpp +++ b/dbms/src/Common/ZooKeeper/ZooKeeper.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/libs/libzkutil/include/zkutil/ZooKeeper.h b/dbms/src/Common/ZooKeeper/ZooKeeper.h similarity index 99% rename from libs/libzkutil/include/zkutil/ZooKeeper.h rename to dbms/src/Common/ZooKeeper/ZooKeeper.h index c414f99af2..8385d495c2 100644 --- a/libs/libzkutil/include/zkutil/ZooKeeper.h +++ b/dbms/src/Common/ZooKeeper/ZooKeeper.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/libs/libzkutil/src/ZooKeeperHolder.cpp b/dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp similarity index 97% rename from libs/libzkutil/src/ZooKeeperHolder.cpp rename to dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp index f60022d2c1..b5889a8518 100644 --- a/libs/libzkutil/src/ZooKeeperHolder.cpp +++ b/dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace zkutil; diff --git a/libs/libzkutil/include/zkutil/ZooKeeperHolder.h b/dbms/src/Common/ZooKeeper/ZooKeeperHolder.h similarity index 98% rename from libs/libzkutil/include/zkutil/ZooKeeperHolder.h rename to dbms/src/Common/ZooKeeper/ZooKeeperHolder.h index 8482e77860..831cd44200 100644 --- a/libs/libzkutil/include/zkutil/ZooKeeperHolder.h +++ b/dbms/src/Common/ZooKeeper/ZooKeeperHolder.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/libs/libzkutil/src/ZooKeeperNodeCache.cpp b/dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp similarity index 98% rename from libs/libzkutil/src/ZooKeeperNodeCache.cpp rename to dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp index ae855902a8..4fdd387daf 100644 --- a/libs/libzkutil/src/ZooKeeperNodeCache.cpp +++ b/dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp @@ -1,4 +1,4 @@ -#include +#include namespace zkutil { diff --git a/libs/libzkutil/include/zkutil/ZooKeeperNodeCache.h b/dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h similarity index 94% rename from libs/libzkutil/include/zkutil/ZooKeeperNodeCache.h rename to dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h index 6941c19552..1761cd2dad 100644 --- a/libs/libzkutil/include/zkutil/ZooKeeperNodeCache.h +++ b/dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include namespace DB { diff --git a/libs/libzkutil/src/tests/CMakeLists.txt b/dbms/src/Common/ZooKeeper/tests/CMakeLists.txt similarity index 53% rename from libs/libzkutil/src/tests/CMakeLists.txt rename to dbms/src/Common/ZooKeeper/tests/CMakeLists.txt index d2d1fa0920..82da63e8ab 100644 --- a/libs/libzkutil/src/tests/CMakeLists.txt +++ b/dbms/src/Common/ZooKeeper/tests/CMakeLists.txt @@ -1,17 +1,17 @@ add_executable(zkutil_test_commands zkutil_test_commands.cpp) -target_link_libraries(zkutil_test_commands zkutil dbms) +target_link_libraries(zkutil_test_commands dbms) add_executable(zkutil_test_lock zkutil_test_lock.cpp) -target_link_libraries(zkutil_test_lock zkutil dbms) +target_link_libraries(zkutil_test_lock dbms) add_executable(zkutil_expiration_test zkutil_expiration_test.cpp) -target_link_libraries(zkutil_expiration_test zkutil dbms) +target_link_libraries(zkutil_expiration_test dbms) add_executable(zkutil_test_async zkutil_test_async.cpp) -target_link_libraries(zkutil_test_async zkutil dbms) +target_link_libraries(zkutil_test_async dbms) add_executable(zkutil_zookeeper_holder zkutil_zookeeper_holder.cpp) -target_link_libraries(zkutil_zookeeper_holder zkutil dbms) +target_link_libraries(zkutil_zookeeper_holder dbms) add_executable (zk_many_watches_reconnect zk_many_watches_reconnect.cpp) -target_link_libraries (zk_many_watches_reconnect zkutil dbms) +target_link_libraries (zk_many_watches_reconnect dbms) diff --git a/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp b/dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp similarity index 98% rename from libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp rename to dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp index b11e81cf9a..8794e45aba 100644 --- a/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/libs/libzkutil/src/tests/zkutil_expiration_test.cpp b/dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp similarity index 98% rename from libs/libzkutil/src/tests/zkutil_expiration_test.cpp rename to dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp index 556969a16f..b612e60172 100644 --- a/libs/libzkutil/src/tests/zkutil_expiration_test.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/libs/libzkutil/src/tests/zkutil_test_async.cpp b/dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp similarity index 95% rename from libs/libzkutil/src/tests/zkutil_test_async.cpp rename to dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp index 5713526ecd..a1dc2df4ed 100644 --- a/libs/libzkutil/src/tests/zkutil_test_async.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/libs/libzkutil/src/tests/zkutil_test_commands.cpp b/dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp similarity index 97% rename from libs/libzkutil/src/tests/zkutil_test_commands.cpp rename to dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp index 258d1b9729..d9718c6f7f 100644 --- a/libs/libzkutil/src/tests/zkutil_test_commands.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/libs/libzkutil/src/tests/zkutil_test_lock.cpp b/dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp similarity index 93% rename from libs/libzkutil/src/tests/zkutil_test_lock.cpp rename to dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp index 98891b3ea5..8b668db052 100644 --- a/libs/libzkutil/src/tests/zkutil_test_lock.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp @@ -1,5 +1,5 @@ #include -#include +#include int main() { diff --git a/libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp b/dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp similarity index 94% rename from libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp rename to dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp index 55b966e8f2..9473ec4df0 100644 --- a/libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp +++ b/dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/dbms/src/Databases/DatabaseCloud.cpp b/dbms/src/Databases/DatabaseCloud.cpp index c27e44a69d..1c4e311474 100644 --- a/dbms/src/Databases/DatabaseCloud.cpp +++ b/dbms/src/Databases/DatabaseCloud.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp index b41665f3a3..1296f3129a 100644 --- a/dbms/src/Interpreters/Context.cpp +++ b/dbms/src/Interpreters/Context.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include diff --git a/dbms/src/Interpreters/DDLWorker.cpp b/dbms/src/Interpreters/DDLWorker.cpp index bf0fd5c082..78f69dcd81 100644 --- a/dbms/src/Interpreters/DDLWorker.cpp +++ b/dbms/src/Interpreters/DDLWorker.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp index 70a01a253e..919f2f7fd2 100644 --- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp +++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include namespace DB { diff --git a/dbms/src/Interpreters/tests/CMakeLists.txt b/dbms/src/Interpreters/tests/CMakeLists.txt index e9a25f7453..30701602ce 100644 --- a/dbms/src/Interpreters/tests/CMakeLists.txt +++ b/dbms/src/Interpreters/tests/CMakeLists.txt @@ -48,4 +48,4 @@ target_link_libraries (in_join_subqueries_preprocessor dbms) add_check(in_join_subqueries_preprocessor) add_executable (users users.cpp) -target_link_libraries (users dbms ${Boost_FILESYSTEM_LIBRARY} zkutil dbms) +target_link_libraries (users dbms ${Boost_FILESYSTEM_LIBRARY} dbms) diff --git a/dbms/src/Server/ConfigReloader.h b/dbms/src/Server/ConfigReloader.h index 158373e611..470b5378de 100644 --- a/dbms/src/Server/ConfigReloader.h +++ b/dbms/src/Server/ConfigReloader.h @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/dbms/src/Server/ExtractFromConfig.cpp b/dbms/src/Server/ExtractFromConfig.cpp index 570ac4774e..bbd0677a98 100644 --- a/dbms/src/Server/ExtractFromConfig.cpp +++ b/dbms/src/Server/ExtractFromConfig.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index 0f7461bff6..d696e81c68 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h b/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h index bdb0defe8d..fc66eda988 100644 --- a/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h +++ b/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h index a5830a8ebc..af177cdd10 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp index 89d046bacd..88628df556 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h index 577ef36581..56b2e0543e 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace DB diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h index d2ab304f02..d1cdba5ac9 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace DB diff --git a/dbms/src/Storages/MergeTree/ReshardingWorker.cpp b/dbms/src/Storages/MergeTree/ReshardingWorker.cpp index 809d632177..ad87ab4406 100644 --- a/dbms/src/Storages/MergeTree/ReshardingWorker.cpp +++ b/dbms/src/Storages/MergeTree/ReshardingWorker.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/dbms/src/Storages/MergeTree/ReshardingWorker.h b/dbms/src/Storages/MergeTree/ReshardingWorker.h index 46a37dc6c8..43db7c9fb7 100644 --- a/dbms/src/Storages/MergeTree/ReshardingWorker.h +++ b/dbms/src/Storages/MergeTree/ReshardingWorker.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp index 53e2030057..e13ccdcb41 100644 --- a/dbms/src/Storages/StorageReplicatedMergeTree.cpp +++ b/dbms/src/Storages/StorageReplicatedMergeTree.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.h b/dbms/src/Storages/StorageReplicatedMergeTree.h index 6ba92fa39f..9b4cf2f5a8 100644 --- a/dbms/src/Storages/StorageReplicatedMergeTree.h +++ b/dbms/src/Storages/StorageReplicatedMergeTree.h @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include namespace DB diff --git a/dbms/src/Storages/StorageTrivialBuffer.h b/dbms/src/Storages/StorageTrivialBuffer.h index c40bf76e48..5cb1cbae5c 100644 --- a/dbms/src/Storages/StorageTrivialBuffer.h +++ b/dbms/src/Storages/StorageTrivialBuffer.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace Poco { class Logger; } diff --git a/dbms/src/Storages/System/StorageSystemZooKeeper.cpp b/dbms/src/Storages/System/StorageSystemZooKeeper.cpp index 67c391c2ca..4b0e15d9dc 100644 --- a/dbms/src/Storages/System/StorageSystemZooKeeper.cpp +++ b/dbms/src/Storages/System/StorageSystemZooKeeper.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace DB diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 9f62cb3e37..c1371bc67e 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -5,7 +5,6 @@ endif () add_subdirectory (libcommon) add_subdirectory (libpocoext) -add_subdirectory (libzkutil) add_subdirectory (libdaemon) if (MYSQL_FOUND) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 50256b1c1d..a89c156e0b 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -9,6 +9,7 @@ add_subdirectory (compressor) add_subdirectory (iotest) add_subdirectory (corrector_utf8) add_subdirectory (config-processor) +add_subdirectory (zookeeper-cli) add_subdirectory (zookeeper-dump-tree) add_subdirectory (zookeeper-remove-by-list) add_subdirectory (zookeeper-create-entry-to-download-part) diff --git a/utils/config-processor/CMakeLists.txt b/utils/config-processor/CMakeLists.txt index 9f78a67969..50b744a0a1 100644 --- a/utils/config-processor/CMakeLists.txt +++ b/utils/config-processor/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable (config-processor config-processor.cpp) -target_link_libraries (config-processor dbms zkutil dbms) +target_link_libraries (config-processor dbms) INSTALL(TARGETS config-processor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT config-processor) diff --git a/libs/libzkutil/zookeeper-cli/CMakeLists.txt b/utils/zookeeper-cli/CMakeLists.txt similarity index 67% rename from libs/libzkutil/zookeeper-cli/CMakeLists.txt rename to utils/zookeeper-cli/CMakeLists.txt index 86bce111b0..bd230fdeb5 100644 --- a/libs/libzkutil/zookeeper-cli/CMakeLists.txt +++ b/utils/zookeeper-cli/CMakeLists.txt @@ -1,3 +1,3 @@ add_executable(clickhouse-zookeeper-cli zookeeper-cli.cpp) -target_link_libraries(clickhouse-zookeeper-cli zkutil dbms ${LINE_EDITING_LIBS}) +target_link_libraries(clickhouse-zookeeper-cli dbms ${LINE_EDITING_LIBS}) INSTALL(TARGETS clickhouse-zookeeper-cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-utils) diff --git a/libs/libzkutil/zookeeper-cli/zookeeper-cli.cpp b/utils/zookeeper-cli/zookeeper-cli.cpp similarity index 98% rename from libs/libzkutil/zookeeper-cli/zookeeper-cli.cpp rename to utils/zookeeper-cli/zookeeper-cli.cpp index b7682163aa..d6d49116ff 100644 --- a/libs/libzkutil/zookeeper-cli/zookeeper-cli.cpp +++ b/utils/zookeeper-cli/zookeeper-cli.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/utils/zookeeper-create-entry-to-download-part/CMakeLists.txt b/utils/zookeeper-create-entry-to-download-part/CMakeLists.txt index 39e6f84308..4b59b838d6 100644 --- a/utils/zookeeper-create-entry-to-download-part/CMakeLists.txt +++ b/utils/zookeeper-create-entry-to-download-part/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable (zookeeper-create-entry-to-download-part main.cpp ${SRCS}) -target_link_libraries (zookeeper-create-entry-to-download-part zkutil dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries (zookeeper-create-entry-to-download-part dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) diff --git a/utils/zookeeper-create-entry-to-download-part/main.cpp b/utils/zookeeper-create-entry-to-download-part/main.cpp index c5174b954e..050672956f 100644 --- a/utils/zookeeper-create-entry-to-download-part/main.cpp +++ b/utils/zookeeper-create-entry-to-download-part/main.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include diff --git a/utils/zookeeper-dump-tree/CMakeLists.txt b/utils/zookeeper-dump-tree/CMakeLists.txt index 299f326fcf..7510d21579 100644 --- a/utils/zookeeper-dump-tree/CMakeLists.txt +++ b/utils/zookeeper-dump-tree/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable (zookeeper-dump-tree main.cpp ${SRCS}) -target_link_libraries (zookeeper-dump-tree zkutil dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries (zookeeper-dump-tree dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) diff --git a/utils/zookeeper-dump-tree/main.cpp b/utils/zookeeper-dump-tree/main.cpp index 6ee68fcf1a..4c05127300 100644 --- a/utils/zookeeper-dump-tree/main.cpp +++ b/utils/zookeeper-dump-tree/main.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include /** Outputs paths of all ZK nodes in arbitrary order. Possibly only in specified directory. diff --git a/utils/zookeeper-remove-by-list/CMakeLists.txt b/utils/zookeeper-remove-by-list/CMakeLists.txt index 084f06ae16..08d2780f94 100644 --- a/utils/zookeeper-remove-by-list/CMakeLists.txt +++ b/utils/zookeeper-remove-by-list/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable (zookeeper-remove-by-list main.cpp ${SRCS}) -target_link_libraries (zookeeper-remove-by-list zkutil dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries (zookeeper-remove-by-list dbms ${Boost_PROGRAM_OPTIONS_LIBRARY}) diff --git a/utils/zookeeper-remove-by-list/main.cpp b/utils/zookeeper-remove-by-list/main.cpp index b03890e23c..74e46c42e1 100644 --- a/utils/zookeeper-remove-by-list/main.cpp +++ b/utils/zookeeper-remove-by-list/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include -- GitLab