Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
05accbdc
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05accbdc
编写于
6月 19, 2017
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed cyclic dependency [#DEVTOOLS-3381].
上级
1cd217ba
变更
58
隐藏空白更改
内联
并排
Showing
58 changed file
with
76 addition
and
70 deletion
+76
-70
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+2
-1
dbms/src/Common/CMakeLists.txt
dbms/src/Common/CMakeLists.txt
+2
-0
dbms/src/Common/ConfigProcessor.cpp
dbms/src/Common/ConfigProcessor.cpp
+1
-1
dbms/src/Common/ZooKeeper/CMakeLists.txt
dbms/src/Common/ZooKeeper/CMakeLists.txt
+3
-0
dbms/src/Common/ZooKeeper/Common.h
dbms/src/Common/ZooKeeper/Common.h
+1
-1
dbms/src/Common/ZooKeeper/Increment.h
dbms/src/Common/ZooKeeper/Increment.h
+1
-1
dbms/src/Common/ZooKeeper/KeeperException.h
dbms/src/Common/ZooKeeper/KeeperException.h
+1
-1
dbms/src/Common/ZooKeeper/LeaderElection.h
dbms/src/Common/ZooKeeper/LeaderElection.h
+1
-1
dbms/src/Common/ZooKeeper/Lock.cpp
dbms/src/Common/ZooKeeper/Lock.cpp
+1
-1
dbms/src/Common/ZooKeeper/Lock.h
dbms/src/Common/ZooKeeper/Lock.h
+1
-1
dbms/src/Common/ZooKeeper/RWLock.cpp
dbms/src/Common/ZooKeeper/RWLock.cpp
+1
-1
dbms/src/Common/ZooKeeper/RWLock.h
dbms/src/Common/ZooKeeper/RWLock.h
+2
-2
dbms/src/Common/ZooKeeper/SingleBarrier.cpp
dbms/src/Common/ZooKeeper/SingleBarrier.cpp
+2
-2
dbms/src/Common/ZooKeeper/SingleBarrier.h
dbms/src/Common/ZooKeeper/SingleBarrier.h
+1
-1
dbms/src/Common/ZooKeeper/Types.h
dbms/src/Common/ZooKeeper/Types.h
+0
-0
dbms/src/Common/ZooKeeper/ZooKeeper.cpp
dbms/src/Common/ZooKeeper/ZooKeeper.cpp
+1
-1
dbms/src/Common/ZooKeeper/ZooKeeper.h
dbms/src/Common/ZooKeeper/ZooKeeper.h
+2
-2
dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp
dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp
+1
-1
dbms/src/Common/ZooKeeper/ZooKeeperHolder.h
dbms/src/Common/ZooKeeper/ZooKeeperHolder.h
+1
-1
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp
+1
-1
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h
+2
-2
dbms/src/Common/ZooKeeper/tests/CMakeLists.txt
dbms/src/Common/ZooKeeper/tests/CMakeLists.txt
+6
-6
dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp
.../src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp
+1
-1
dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp
dbms/src/Common/ZooKeeper/tests/zkutil_expiration_test.cpp
+1
-1
dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp
dbms/src/Common/ZooKeeper/tests/zkutil_test_async.cpp
+1
-1
dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp
dbms/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp
+1
-1
dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp
dbms/src/Common/ZooKeeper/tests/zkutil_test_lock.cpp
+1
-1
dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp
dbms/src/Common/ZooKeeper/tests/zkutil_zookeeper_holder.cpp
+1
-1
dbms/src/Databases/DatabaseCloud.cpp
dbms/src/Databases/DatabaseCloud.cpp
+1
-1
dbms/src/Interpreters/Context.cpp
dbms/src/Interpreters/Context.cpp
+1
-1
dbms/src/Interpreters/DDLWorker.cpp
dbms/src/Interpreters/DDLWorker.cpp
+2
-2
dbms/src/Interpreters/InterpreterCreateQuery.cpp
dbms/src/Interpreters/InterpreterCreateQuery.cpp
+1
-1
dbms/src/Interpreters/tests/CMakeLists.txt
dbms/src/Interpreters/tests/CMakeLists.txt
+1
-1
dbms/src/Server/ConfigReloader.h
dbms/src/Server/ConfigReloader.h
+2
-2
dbms/src/Server/ExtractFromConfig.cpp
dbms/src/Server/ExtractFromConfig.cpp
+1
-1
dbms/src/Server/Server.cpp
dbms/src/Server/Server.cpp
+2
-2
dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
+1
-1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
+1
-1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+1
-1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+1
-1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
+1
-1
dbms/src/Storages/MergeTree/ReshardingWorker.cpp
dbms/src/Storages/MergeTree/ReshardingWorker.cpp
+1
-1
dbms/src/Storages/MergeTree/ReshardingWorker.h
dbms/src/Storages/MergeTree/ReshardingWorker.h
+2
-2
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+2
-2
dbms/src/Storages/StorageReplicatedMergeTree.h
dbms/src/Storages/StorageReplicatedMergeTree.h
+2
-2
dbms/src/Storages/StorageTrivialBuffer.h
dbms/src/Storages/StorageTrivialBuffer.h
+1
-1
dbms/src/Storages/System/StorageSystemZooKeeper.cpp
dbms/src/Storages/System/StorageSystemZooKeeper.cpp
+1
-1
libs/CMakeLists.txt
libs/CMakeLists.txt
+0
-1
utils/CMakeLists.txt
utils/CMakeLists.txt
+1
-0
utils/config-processor/CMakeLists.txt
utils/config-processor/CMakeLists.txt
+1
-1
utils/zookeeper-cli/CMakeLists.txt
utils/zookeeper-cli/CMakeLists.txt
+1
-1
utils/zookeeper-cli/zookeeper-cli.cpp
utils/zookeeper-cli/zookeeper-cli.cpp
+2
-2
utils/zookeeper-create-entry-to-download-part/CMakeLists.txt
utils/zookeeper-create-entry-to-download-part/CMakeLists.txt
+1
-1
utils/zookeeper-create-entry-to-download-part/main.cpp
utils/zookeeper-create-entry-to-download-part/main.cpp
+1
-1
utils/zookeeper-dump-tree/CMakeLists.txt
utils/zookeeper-dump-tree/CMakeLists.txt
+1
-1
utils/zookeeper-dump-tree/main.cpp
utils/zookeeper-dump-tree/main.cpp
+1
-1
utils/zookeeper-remove-by-list/CMakeLists.txt
utils/zookeeper-remove-by-list/CMakeLists.txt
+1
-1
utils/zookeeper-remove-by-list/main.cpp
utils/zookeeper-remove-by-list/main.cpp
+1
-1
未找到文件。
dbms/CMakeLists.txt
浏览文件 @
05accbdc
...
@@ -55,6 +55,7 @@ add_headers_and_sources(dbms src/Interpreters)
...
@@ -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/Interpreters/ClusterProxy
)
add_headers_and_sources
(
dbms src/Common
)
add_headers_and_sources
(
dbms src/Common
)
add_headers_and_sources
(
dbms src/Common/HashTable
)
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/IO
)
add_headers_and_sources
(
dbms src/Columns
)
add_headers_and_sources
(
dbms src/Columns
)
add_headers_and_sources
(
dbms src/Storages
)
add_headers_and_sources
(
dbms src/Storages
)
...
@@ -168,11 +169,11 @@ endif()
...
@@ -168,11 +169,11 @@ endif()
target_link_libraries
(
dbms
target_link_libraries
(
dbms
common
common
zkutil
${
MYSQLXX_LIBRARY
}
${
MYSQLXX_LIBRARY
}
cityhash farmhash metrohash
cityhash farmhash metrohash
${
LZ4_LIBRARY
}
${
LZ4_LIBRARY
}
${
ZSTD_LIBRARY
}
${
ZSTD_LIBRARY
}
${
ZOOKEEPER_LIBRARY
}
string_utils
string_utils
${
DOUBLE_CONVERSION_LIBRARY
}
${
DOUBLE_CONVERSION_LIBRARY
}
${
ZLIB_LIBRARIES
}
${
ZLIB_LIBRARIES
}
...
...
dbms/src/Common/CMakeLists.txt
浏览文件 @
05accbdc
add_subdirectory
(
ZooKeeper
)
if
(
ENABLE_TESTS
)
if
(
ENABLE_TESTS
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
endif
()
dbms/src/Common/ConfigProcessor.cpp
浏览文件 @
05accbdc
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
#include <Poco/DOM/Comment.h>
#include <Poco/DOM/Comment.h>
#include <Poco/Util/XMLConfiguration.h>
#include <Poco/Util/XMLConfiguration.h>
#include <
zkutil
/ZooKeeperNodeCache.h>
#include <
Common/ZooKeeper
/ZooKeeperNodeCache.h>
using
namespace
Poco
::
XML
;
using
namespace
Poco
::
XML
;
...
...
dbms/src/Common/ZooKeeper/CMakeLists.txt
0 → 100644
浏览文件 @
05accbdc
if
(
ENABLE_TESTS
)
add_subdirectory
(
tests
)
endif
()
libs/libzkutil/include/zkutil
/Common.h
→
dbms/src/Common/ZooKeeper
/Common.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <functional>
#include <functional>
namespace
zkutil
namespace
zkutil
...
...
libs/libzkutil/include/zkutil
/Increment.h
→
dbms/src/Common/ZooKeeper
/Increment.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeperHolder.h>
#include <
Common/ZooKeeper
/ZooKeeperHolder.h>
namespace
zkutil
namespace
zkutil
{
{
...
...
libs/libzkutil/include/zkutil
/KeeperException.h
→
dbms/src/Common/ZooKeeper
/KeeperException.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <Common/Exception.h>
#include <Common/Exception.h>
#include <
zkutil
/Types.h>
#include <
Common/ZooKeeper
/Types.h>
#include <Common/ProfileEvents.h>
#include <Common/ProfileEvents.h>
...
...
libs/libzkutil/include/zkutil
/LeaderElection.h
→
dbms/src/Common/ZooKeeper
/LeaderElection.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <functional>
#include <functional>
#include <memory>
#include <memory>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
...
...
libs/libzkutil/src
/Lock.cpp
→
dbms/src/Common/ZooKeeper
/Lock.cpp
浏览文件 @
05accbdc
#include <
zkutil
/Lock.h>
#include <
Common/ZooKeeper
/Lock.h>
using
namespace
zkutil
;
using
namespace
zkutil
;
...
...
libs/libzkutil/include/zkutil
/Lock.h
→
dbms/src/Common/ZooKeeper
/Lock.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeperHolder.h>
#include <
Common/ZooKeeper
/ZooKeeperHolder.h>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
#include <Common/Exception.h>
#include <Common/Exception.h>
...
...
libs/libzkutil/src
/RWLock.cpp
→
dbms/src/Common/ZooKeeper
/RWLock.cpp
浏览文件 @
05accbdc
#include <
zkutil
/RWLock.h>
#include <
Common/ZooKeeper
/RWLock.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils.h>
#include <algorithm>
#include <algorithm>
#include <iterator>
#include <iterator>
...
...
libs/libzkutil/include/zkutil
/RWLock.h
→
dbms/src/Common/ZooKeeper
/RWLock.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/Common.h>
#include <
Common/ZooKeeper
/Common.h>
#include <Common/Exception.h>
#include <Common/Exception.h>
#include <Poco/Event.h>
#include <Poco/Event.h>
#include <string>
#include <string>
...
...
libs/libzkutil/src
/SingleBarrier.cpp
→
dbms/src/Common/ZooKeeper
/SingleBarrier.cpp
浏览文件 @
05accbdc
#include <
zkutil
/SingleBarrier.h>
#include <
Common/ZooKeeper
/SingleBarrier.h>
#include <
zkutil
/RWLock.h>
#include <
Common/ZooKeeper
/RWLock.h>
#include <Common/getFQDNOrHostName.h>
#include <Common/getFQDNOrHostName.h>
#include <Common/Exception.h>
#include <Common/Exception.h>
#include <Common/Stopwatch.h>
#include <Common/Stopwatch.h>
...
...
libs/libzkutil/include/zkutil
/SingleBarrier.h
→
dbms/src/Common/ZooKeeper
/SingleBarrier.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/Common.h>
#include <
Common/ZooKeeper
/Common.h>
#include <string>
#include <string>
#include <functional>
#include <functional>
...
...
libs/libzkutil/include/zkutil
/Types.h
→
dbms/src/Common/ZooKeeper
/Types.h
浏览文件 @
05accbdc
文件已移动
libs/libzkutil/src
/ZooKeeper.cpp
→
dbms/src/Common/ZooKeeper
/ZooKeeper.cpp
浏览文件 @
05accbdc
#include <functional>
#include <functional>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
#include <Common/ProfileEvents.h>
#include <Common/ProfileEvents.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils.h>
...
...
libs/libzkutil/include/zkutil
/ZooKeeper.h
→
dbms/src/Common/ZooKeeper
/ZooKeeper.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/Types.h>
#include <
Common/ZooKeeper
/Types.h>
#include <
zkutil
/KeeperException.h>
#include <
Common/ZooKeeper
/KeeperException.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <unordered_set>
#include <unordered_set>
#include <future>
#include <future>
...
...
libs/libzkutil/src
/ZooKeeperHolder.cpp
→
dbms/src/Common/ZooKeeper
/ZooKeeperHolder.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeperHolder.h>
#include <
Common/ZooKeeper
/ZooKeeperHolder.h>
using
namespace
zkutil
;
using
namespace
zkutil
;
...
...
libs/libzkutil/include/zkutil
/ZooKeeperHolder.h
→
dbms/src/Common/ZooKeeper
/ZooKeeperHolder.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <mutex>
#include <mutex>
#include <boost/noncopyable.hpp>
#include <boost/noncopyable.hpp>
...
...
libs/libzkutil/src
/ZooKeeperNodeCache.cpp
→
dbms/src/Common/ZooKeeper
/ZooKeeperNodeCache.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeperNodeCache.h>
#include <
Common/ZooKeeper
/ZooKeeperNodeCache.h>
namespace
zkutil
namespace
zkutil
{
{
...
...
libs/libzkutil/include/zkutil
/ZooKeeperNodeCache.h
→
dbms/src/Common/ZooKeeper
/ZooKeeperNodeCache.h
浏览文件 @
05accbdc
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
#include <memory>
#include <memory>
#include <experimental/optional>
#include <experimental/optional>
#include <Poco/Event.h>
#include <Poco/Event.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/Common.h>
#include <
Common/ZooKeeper
/Common.h>
namespace
DB
namespace
DB
{
{
...
...
libs/libzkutil/src
/tests/CMakeLists.txt
→
dbms/src/Common/ZooKeeper
/tests/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
zkutil_test_commands zkutil_test_commands.cpp
)
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
)
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
)
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
)
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
)
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
)
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
浏览文件 @
05accbdc
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <Poco/Event.h>
#include <Poco/Event.h>
#include <iostream>
#include <iostream>
...
...
libs/libzkutil/src
/tests/zkutil_expiration_test.cpp
→
dbms/src/Common/ZooKeeper
/tests/zkutil_expiration_test.cpp
浏览文件 @
05accbdc
#include <iostream>
#include <iostream>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <Poco/ConsoleChannel.h>
#include <Poco/ConsoleChannel.h>
...
...
libs/libzkutil/src
/tests/zkutil_test_async.cpp
→
dbms/src/Common/ZooKeeper
/tests/zkutil_test_async.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <IO/ReadHelpers.h>
#include <IO/ReadHelpers.h>
...
...
libs/libzkutil/src
/tests/zkutil_test_commands.cpp
→
dbms/src/Common/ZooKeeper
/tests/zkutil_test_commands.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <iostream>
#include <iostream>
#include <unistd.h>
#include <unistd.h>
...
...
libs/libzkutil/src
/tests/zkutil_test_lock.cpp
→
dbms/src/Common/ZooKeeper
/tests/zkutil_test_lock.cpp
浏览文件 @
05accbdc
#include <iostream>
#include <iostream>
#include <
zkutil
/Lock.h>
#include <
Common/ZooKeeper
/Lock.h>
int
main
()
int
main
()
{
{
...
...
libs/libzkutil/src
/tests/zkutil_zookeeper_holder.cpp
→
dbms/src/Common/ZooKeeper
/tests/zkutil_zookeeper_holder.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeperHolder.h>
#include <
Common/ZooKeeper
/ZooKeeperHolder.h>
#include <iostream>
#include <iostream>
#include <Poco/Util/Application.h>
#include <Poco/Util/Application.h>
...
...
dbms/src/Databases/DatabaseCloud.cpp
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <Interpreters/Context.h>
#include <Interpreters/Context.h>
#include <Common/escapeForFileName.h>
#include <Common/escapeForFileName.h>
#include <Common/SipHash.h>
#include <Common/SipHash.h>
...
...
dbms/src/Interpreters/Context.cpp
浏览文件 @
05accbdc
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
#include <Databases/IDatabase.h>
#include <Databases/IDatabase.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
...
...
dbms/src/Interpreters/DDLWorker.cpp
浏览文件 @
05accbdc
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
#include <Columns/ColumnString.h>
#include <Columns/ColumnString.h>
#include <Columns/ColumnArray.h>
#include <Columns/ColumnArray.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/Lock.h>
#include <
Common/ZooKeeper
/Lock.h>
#include <Poco/Timestamp.h>
#include <Poco/Timestamp.h>
#include <experimental/optional>
#include <experimental/optional>
...
...
dbms/src/Interpreters/InterpreterCreateQuery.cpp
浏览文件 @
05accbdc
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
#include <Databases/DatabaseFactory.h>
#include <Databases/DatabaseFactory.h>
#include <Databases/IDatabase.h>
#include <Databases/IDatabase.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
namespace
DB
namespace
DB
{
{
...
...
dbms/src/Interpreters/tests/CMakeLists.txt
浏览文件 @
05accbdc
...
@@ -48,4 +48,4 @@ target_link_libraries (in_join_subqueries_preprocessor dbms)
...
@@ -48,4 +48,4 @@ target_link_libraries (in_join_subqueries_preprocessor dbms)
add_check
(
in_join_subqueries_preprocessor
)
add_check
(
in_join_subqueries_preprocessor
)
add_executable
(
users users.cpp
)
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
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor.h>
#include <
zkutil
/Common.h>
#include <
Common/ZooKeeper
/Common.h>
#include <
zkutil
/ZooKeeperNodeCache.h>
#include <
Common/ZooKeeper
/ZooKeeperNodeCache.h>
#include <time.h>
#include <time.h>
#include <string>
#include <string>
...
...
dbms/src/Server/ExtractFromConfig.cpp
浏览文件 @
05accbdc
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include <Poco/AutoPtr.h>
#include <Poco/AutoPtr.h>
#include <Poco/Util/XMLConfiguration.h>
#include <Poco/Util/XMLConfiguration.h>
#include <
zkutil
/ZooKeeperNodeCache.h>
#include <
Common/ZooKeeper
/ZooKeeperNodeCache.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor.h>
#include <Common/Exception.h>
#include <Common/Exception.h>
...
...
dbms/src/Server/Server.cpp
浏览文件 @
05accbdc
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
#include <common/ApplicationServerExt.h>
#include <common/ApplicationServerExt.h>
#include <common/ErrorHandlers.h>
#include <common/ErrorHandlers.h>
#include <ext/scope_guard.h>
#include <ext/scope_guard.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/ZooKeeperNodeCache.h>
#include <
Common/ZooKeeper
/ZooKeeperNodeCache.h>
#include <Common/Macros.h>
#include <Common/Macros.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils.h>
#include <Common/getFQDNOrHostName.h>
#include <Common/getFQDNOrHostName.h>
...
...
dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <Common/Exception.h>
#include <Common/Exception.h>
#include <IO/ReadHelpers.h>
#include <IO/ReadHelpers.h>
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
浏览文件 @
05accbdc
#pragma once
#pragma once
#include <thread>
#include <thread>
#include <
zkutil
/Types.h>
#include <
Common/ZooKeeper
/Types.h>
#include <Core/Types.h>
#include <Core/Types.h>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
浏览文件 @
05accbdc
#include <
zkutil
/Types.h>
#include <
Common/ZooKeeper
/Types.h>
#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
#include <IO/Operators.h>
#include <IO/Operators.h>
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
浏览文件 @
05accbdc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#include <Storages/MergeTree/ActiveDataPartSet.h>
#include <Storages/MergeTree/ActiveDataPartSet.h>
#include <Storages/MergeTree/MergeTreeData.h>
#include <Storages/MergeTree/MergeTreeData.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
namespace
DB
namespace
DB
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
浏览文件 @
05accbdc
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include <IO/WriteBuffer.h>
#include <IO/WriteBuffer.h>
#include <IO/WriteBufferFromString.h>
#include <IO/WriteBufferFromString.h>
#include <IO/Operators.h>
#include <IO/Operators.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
namespace
DB
namespace
DB
...
...
dbms/src/Storages/MergeTree/ReshardingWorker.cpp
浏览文件 @
05accbdc
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include <Common/ThreadPool.h>
#include <Common/ThreadPool.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <Poco/Event.h>
#include <Poco/Event.h>
#include <Poco/DirectoryIterator.h>
#include <Poco/DirectoryIterator.h>
...
...
dbms/src/Storages/MergeTree/ReshardingWorker.h
浏览文件 @
05accbdc
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
#include <Storages/AlterCommands.h>
#include <Storages/AlterCommands.h>
#include <common/logger_useful.h>
#include <common/logger_useful.h>
#include <
zkutil
/RWLock.h>
#include <
Common/ZooKeeper
/RWLock.h>
#include <
zkutil
/SingleBarrier.h>
#include <
Common/ZooKeeper
/SingleBarrier.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <Poco/Util/LayeredConfiguration.h>
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
05accbdc
#include <
zkutil
/Types.h>
#include <
Common/ZooKeeper
/Types.h>
#include <
zkutil
/KeeperException.h>
#include <
Common/ZooKeeper
/KeeperException.h>
#include <Core/FieldVisitors.h>
#include <Core/FieldVisitors.h>
...
...
dbms/src/Storages/StorageReplicatedMergeTree.h
浏览文件 @
05accbdc
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
#include <Storages/MergeTree/RemoteQueryExecutor.h>
#include <Storages/MergeTree/RemoteQueryExecutor.h>
#include <Storages/MergeTree/RemotePartChecker.h>
#include <Storages/MergeTree/RemotePartChecker.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypesNumber.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/LeaderElection.h>
#include <
Common/ZooKeeper
/LeaderElection.h>
namespace
DB
namespace
DB
...
...
dbms/src/Storages/StorageTrivialBuffer.h
浏览文件 @
05accbdc
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
#include <Poco/Event.h>
#include <Poco/Event.h>
#include <Storages/IStorage.h>
#include <Storages/IStorage.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
namespace
Poco
{
class
Logger
;
}
namespace
Poco
{
class
Logger
;
}
...
...
dbms/src/Storages/System/StorageSystemZooKeeper.cpp
浏览文件 @
05accbdc
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#include <Parsers/ASTExpressionList.h>
#include <Parsers/ASTExpressionList.h>
#include <Parsers/ASTFunction.h>
#include <Parsers/ASTFunction.h>
#include <Interpreters/Context.h>
#include <Interpreters/Context.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
namespace
DB
namespace
DB
...
...
libs/CMakeLists.txt
浏览文件 @
05accbdc
...
@@ -5,7 +5,6 @@ endif ()
...
@@ -5,7 +5,6 @@ endif ()
add_subdirectory
(
libcommon
)
add_subdirectory
(
libcommon
)
add_subdirectory
(
libpocoext
)
add_subdirectory
(
libpocoext
)
add_subdirectory
(
libzkutil
)
add_subdirectory
(
libdaemon
)
add_subdirectory
(
libdaemon
)
if
(
MYSQL_FOUND
)
if
(
MYSQL_FOUND
)
...
...
utils/CMakeLists.txt
浏览文件 @
05accbdc
...
@@ -9,6 +9,7 @@ add_subdirectory (compressor)
...
@@ -9,6 +9,7 @@ add_subdirectory (compressor)
add_subdirectory
(
iotest
)
add_subdirectory
(
iotest
)
add_subdirectory
(
corrector_utf8
)
add_subdirectory
(
corrector_utf8
)
add_subdirectory
(
config-processor
)
add_subdirectory
(
config-processor
)
add_subdirectory
(
zookeeper-cli
)
add_subdirectory
(
zookeeper-dump-tree
)
add_subdirectory
(
zookeeper-dump-tree
)
add_subdirectory
(
zookeeper-remove-by-list
)
add_subdirectory
(
zookeeper-remove-by-list
)
add_subdirectory
(
zookeeper-create-entry-to-download-part
)
add_subdirectory
(
zookeeper-create-entry-to-download-part
)
...
...
utils/config-processor/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
config-processor config-processor.cpp
)
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
)
INSTALL
(
TARGETS config-processor RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
COMPONENT config-processor
)
libs/libzkutil
/zookeeper-cli/CMakeLists.txt
→
utils
/zookeeper-cli/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
clickhouse-zookeeper-cli zookeeper-cli.cpp
)
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
)
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
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <
zkutil
/KeeperException.h>
#include <
Common/ZooKeeper
/KeeperException.h>
#include <iostream>
#include <iostream>
#include <sstream>
#include <sstream>
#include <Poco/ConsoleChannel.h>
#include <Poco/ConsoleChannel.h>
...
...
utils/zookeeper-create-entry-to-download-part/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
zookeeper-create-entry-to-download-part main.cpp
${
SRCS
}
)
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
浏览文件 @
05accbdc
#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <boost/program_options.hpp>
#include <boost/program_options.hpp>
...
...
utils/zookeeper-dump-tree/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
zookeeper-dump-tree main.cpp
${
SRCS
}
)
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
浏览文件 @
05accbdc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#include <boost/program_options.hpp>
#include <boost/program_options.hpp>
#include <Common/Exception.h>
#include <Common/Exception.h>
#include <Poco/Event.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.
/** Outputs paths of all ZK nodes in arbitrary order. Possibly only in specified directory.
...
...
utils/zookeeper-remove-by-list/CMakeLists.txt
浏览文件 @
05accbdc
add_executable
(
zookeeper-remove-by-list main.cpp
${
SRCS
}
)
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
浏览文件 @
05accbdc
#include <
zkutil
/ZooKeeper.h>
#include <
Common/ZooKeeper
/ZooKeeper.h>
#include <IO/ReadHelpers.h>
#include <IO/ReadHelpers.h>
#include <IO/ReadBufferFromFileDescriptor.h>
#include <IO/ReadBufferFromFileDescriptor.h>
#include <boost/program_options.hpp>
#include <boost/program_options.hpp>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录