Removed cyclic dependency [#DEVTOOLS-3381].

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}

dbms/src/Common/CMakeLists.txt

+add_subdirectory(ZooKeeper)
+
 if (ENABLE_TESTS)
     add_subdirectory (tests)
 endif ()

dbms/src/Common/ConfigProcessor.cpp

@@ -10,7 +10,7 @@
 #include <Poco/DOM/Comment.h>
 #include <Poco/Util/XMLConfiguration.h>
 
-#include <zkutil/ZooKeeperNodeCache.h>
+#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 
 using namespace Poco::XML;
 

dbms/src/Common/ZooKeeper/CMakeLists.txt

+if (ENABLE_TESTS)
+    add_subdirectory (tests)
+endif ()

libs/libzkutil/include/zkutil/Common.h → dbms/src/Common/ZooKeeper/Common.h

 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <functional>
 
 namespace zkutil

libs/libzkutil/include/zkutil/Increment.h → dbms/src/Common/ZooKeeper/Increment.h

 #pragma once
 
-#include <zkutil/ZooKeeperHolder.h>
+#include <Common/ZooKeeper/ZooKeeperHolder.h>
 
 namespace zkutil
 {

libs/libzkutil/include/zkutil/KeeperException.h → dbms/src/Common/ZooKeeper/KeeperException.h

 #pragma once
 #include <Common/Exception.h>
-#include <zkutil/Types.h>
+#include <Common/ZooKeeper/Types.h>
 #include <Common/ProfileEvents.h>
 
 

libs/libzkutil/include/zkutil/LeaderElection.h → dbms/src/Common/ZooKeeper/LeaderElection.h

 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <functional>
 #include <memory>
 #include <common/logger_useful.h>

libs/libzkutil/src/Lock.cpp → dbms/src/Common/ZooKeeper/Lock.cpp

-#include <zkutil/Lock.h>
+#include <Common/ZooKeeper/Lock.h>
 
 using namespace zkutil;
 

libs/libzkutil/include/zkutil/Lock.h → dbms/src/Common/ZooKeeper/Lock.h

 #pragma once
 
-#include <zkutil/ZooKeeperHolder.h>
+#include <Common/ZooKeeper/ZooKeeperHolder.h>
 #include <common/logger_useful.h>
 #include <Common/Exception.h>
 

libs/libzkutil/src/RWLock.cpp → dbms/src/Common/ZooKeeper/RWLock.cpp

-#include <zkutil/RWLock.h>
+#include <Common/ZooKeeper/RWLock.h>
 #include <Common/StringUtils.h>
 #include <algorithm>
 #include <iterator>

libs/libzkutil/include/zkutil/RWLock.h → dbms/src/Common/ZooKeeper/RWLock.h

 #pragma once
 
-#include <zkutil/ZooKeeper.h>
-#include <zkutil/Common.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/Common.h>
 #include <Common/Exception.h>
 #include <Poco/Event.h>
 #include <string>

libs/libzkutil/src/SingleBarrier.cpp → dbms/src/Common/ZooKeeper/SingleBarrier.cpp

-#include <zkutil/SingleBarrier.h>
-#include <zkutil/RWLock.h>
+#include <Common/ZooKeeper/SingleBarrier.h>
+#include <Common/ZooKeeper/RWLock.h>
 #include <Common/getFQDNOrHostName.h>
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>

libs/libzkutil/include/zkutil/SingleBarrier.h → dbms/src/Common/ZooKeeper/SingleBarrier.h

 #pragma once
 
-#include <zkutil/Common.h>
+#include <Common/ZooKeeper/Common.h>
 #include <string>
 #include <functional>
 

libs/libzkutil/src/ZooKeeper.cpp → dbms/src/Common/ZooKeeper/ZooKeeper.cpp

 #include <functional>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/StringUtils.h>

libs/libzkutil/include/zkutil/ZooKeeper.h → dbms/src/Common/ZooKeeper/ZooKeeper.h

 #pragma once
 
-#include <zkutil/Types.h>
-#include <zkutil/KeeperException.h>
+#include <Common/ZooKeeper/Types.h>
+#include <Common/ZooKeeper/KeeperException.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <unordered_set>
 #include <future>

libs/libzkutil/src/ZooKeeperHolder.cpp → dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp

-#include <zkutil/ZooKeeperHolder.h>
+#include <Common/ZooKeeper/ZooKeeperHolder.h>
 
 using namespace zkutil;
 

libs/libzkutil/include/zkutil/ZooKeeperHolder.h → dbms/src/Common/ZooKeeper/ZooKeeperHolder.h

 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <mutex>
 #include <boost/noncopyable.hpp>
 

libs/libzkutil/src/ZooKeeperNodeCache.cpp → dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp

-#include <zkutil/ZooKeeperNodeCache.h>
+#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 
 namespace zkutil
 {

libs/libzkutil/include/zkutil/ZooKeeperNodeCache.h → dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h

@@ -6,8 +6,8 @@
 #include <memory>
 #include <experimental/optional>
 #include <Poco/Event.h>
-#include <zkutil/ZooKeeper.h>
-#include <zkutil/Common.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/Common.h>
 
 namespace DB
 {

libs/libzkutil/src/tests/CMakeLists.txt → dbms/src/Common/ZooKeeper/tests/CMakeLists.txt

 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)

libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp → dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp

 #include <Common/ConfigProcessor.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Poco/Event.h>
 #include <iostream>
 

libs/libzkutil/src/tests/zkutil_expiration_test.cpp → dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp

 #include <iostream>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Poco/ConsoleChannel.h>
 
 

libs/libzkutil/src/tests/zkutil_test_async.cpp → dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp

-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <IO/ReadHelpers.h>
 
 

libs/libzkutil/src/tests/zkutil_test_commands.cpp → dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp

-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <iostream>
 #include <unistd.h>
 

libs/libzkutil/src/tests/zkutil_test_lock.cpp → dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp

 #include <iostream>
-#include <zkutil/Lock.h>
+#include <Common/ZooKeeper/Lock.h>
 
 int main()
 {

libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp → dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp

-#include <zkutil/ZooKeeperHolder.h>
+#include <Common/ZooKeeper/ZooKeeperHolder.h>
 #include <iostream>
 
 #include <Poco/Util/Application.h>

dbms/src/Databases/DatabaseCloud.cpp

-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Interpreters/Context.h>
 #include <Common/escapeForFileName.h>
 #include <Common/SipHash.h>

dbms/src/Interpreters/Context.cpp

@@ -44,7 +44,7 @@
 #include <Databases/IDatabase.h>
 
 #include <Common/ConfigProcessor.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <common/logger_useful.h>
 
 

dbms/src/Interpreters/DDLWorker.cpp

@@ -28,8 +28,8 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
 
-#include <zkutil/ZooKeeper.h>
-#include <zkutil/Lock.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/Lock.h>
 #include <Poco/Timestamp.h>
 
 #include <experimental/optional>

dbms/src/Interpreters/InterpreterCreateQuery.cpp

@@ -41,7 +41,7 @@
 #include <Databases/DatabaseFactory.h>
 #include <Databases/IDatabase.h>
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 namespace DB
 {

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)

dbms/src/Server/ConfigReloader.h

 #pragma once
 
 #include <Common/ConfigProcessor.h>
-#include <zkutil/Common.h>
-#include <zkutil/ZooKeeperNodeCache.h>
+#include <Common/ZooKeeper/Common.h>
+#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 
 #include <time.h>
 #include <string>

dbms/src/Server/ExtractFromConfig.cpp

@@ -8,7 +8,7 @@
 #include <Poco/AutoPtr.h>
 #include <Poco/Util/XMLConfiguration.h>
 
-#include <zkutil/ZooKeeperNodeCache.h>
+#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 #include <Common/ConfigProcessor.h>
 #include <Common/Exception.h>
 

dbms/src/Server/Server.cpp

@@ -10,8 +10,8 @@
 #include <common/ApplicationServerExt.h>
 #include <common/ErrorHandlers.h>
 #include <ext/scope_guard.h>
-#include <zkutil/ZooKeeper.h>
-#include <zkutil/ZooKeeperNodeCache.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
 #include <Common/Macros.h>
 #include <Common/StringUtils.h>
 #include <Common/getFQDNOrHostName.h>

dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h

 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
 #include <IO/ReadHelpers.h>
 

dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h

 #pragma once
 
 #include <thread>
-#include <zkutil/Types.h>
+#include <Common/ZooKeeper/Types.h>
 #include <Core/Types.h>
 #include <common/logger_useful.h>
 

dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp

-#include <zkutil/Types.h>
+#include <Common/ZooKeeper/Types.h>
 
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <IO/Operators.h>

dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h

@@ -2,7 +2,7 @@
 #include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 
 namespace DB

dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h

@@ -7,7 +7,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 
 namespace DB

dbms/src/Storages/MergeTree/ReshardingWorker.cpp

@@ -24,7 +24,7 @@
 
 #include <Common/ThreadPool.h>
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 #include <Poco/Event.h>
 #include <Poco/DirectoryIterator.h>

dbms/src/Storages/MergeTree/ReshardingWorker.h

@@ -4,8 +4,8 @@
 #include <Storages/AlterCommands.h>
 #include <common/logger_useful.h>
 
-#include <zkutil/RWLock.h>
-#include <zkutil/SingleBarrier.h>
+#include <Common/ZooKeeper/RWLock.h>
+#include <Common/ZooKeeper/SingleBarrier.h>
 
 #include <Poco/Util/LayeredConfiguration.h>
 

dbms/src/Storages/StorageReplicatedMergeTree.cpp

-#include <zkutil/Types.h>
-#include <zkutil/KeeperException.h>
+#include <Common/ZooKeeper/Types.h>
+#include <Common/ZooKeeper/KeeperException.h>
 
 #include <Core/FieldVisitors.h>
 

dbms/src/Storages/StorageReplicatedMergeTree.h

@@ -21,8 +21,8 @@
 #include <Storages/MergeTree/RemoteQueryExecutor.h>
 #include <Storages/MergeTree/RemotePartChecker.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <zkutil/ZooKeeper.h>
-#include <zkutil/LeaderElection.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/LeaderElection.h>
 
 
 namespace DB

dbms/src/Storages/StorageTrivialBuffer.h

@@ -10,7 +10,7 @@
 #include <Poco/Event.h>
 #include <Storages/IStorage.h>
 
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 namespace Poco { class Logger; }
 

dbms/src/Storages/System/StorageSystemZooKeeper.cpp

@@ -11,7 +11,7 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Interpreters/Context.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 
 namespace DB

libs/CMakeLists.txt

@@ -5,7 +5,6 @@ endif ()
 
 add_subdirectory (libcommon)
 add_subdirectory (libpocoext)
-add_subdirectory (libzkutil)
 add_subdirectory (libdaemon)
 
 if (MYSQL_FOUND)

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)

utils/config-processor/CMakeLists.txt

 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)

libs/libzkutil/zookeeper-cli/CMakeLists.txt → utils/zookeeper-cli/CMakeLists.txt

 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)

libs/libzkutil/zookeeper-cli/zookeeper-cli.cpp → utils/zookeeper-cli/zookeeper-cli.cpp

-#include <zkutil/ZooKeeper.h>
-#include <zkutil/KeeperException.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/KeeperException.h>
 #include <iostream>
 #include <sstream>
 #include <Poco/ConsoleChannel.h>

utils/zookeeper-create-entry-to-download-part/CMakeLists.txt

 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})

utils/zookeeper-create-entry-to-download-part/main.cpp

 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <boost/program_options.hpp>
 
 

utils/zookeeper-dump-tree/CMakeLists.txt

 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})

utils/zookeeper-dump-tree/main.cpp

@@ -2,7 +2,7 @@
 #include <boost/program_options.hpp>
 #include <Common/Exception.h>
 #include <Poco/Event.h>
-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 
 
 /** Outputs paths of all ZK nodes in arbitrary order. Possibly only in specified directory.

utils/zookeeper-remove-by-list/CMakeLists.txt

 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})

utils/zookeeper-remove-by-list/main.cpp

-#include <zkutil/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <boost/program_options.hpp>