Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
4a7927b1
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,发现更多精彩内容 >>
提交
4a7927b1
编写于
7月 28, 2017
作者:
V
Vitaliy Lyudvichenko
提交者:
alexey-milovidov
8月 13, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Many improvements. [#CLICKHOUSE-3128]
上级
c2cf3f81
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
322 addition
and
182 deletion
+322
-182
dbms/src/Interpreters/Cluster.cpp
dbms/src/Interpreters/Cluster.cpp
+5
-0
dbms/src/Interpreters/Cluster.h
dbms/src/Interpreters/Cluster.h
+4
-1
dbms/src/Interpreters/DDLWorker.cpp
dbms/src/Interpreters/DDLWorker.cpp
+299
-174
dbms/src/Interpreters/DDLWorker.h
dbms/src/Interpreters/DDLWorker.h
+14
-7
未找到文件。
dbms/src/Interpreters/Cluster.cpp
浏览文件 @
4a7927b1
...
...
@@ -115,6 +115,11 @@ String Cluster::Address::toString(const String & host_name, UInt16 port)
return
escapeForFileName
(
host_name
)
+
':'
+
DB
::
toString
(
port
);
}
String
Cluster
::
Address
::
readableString
()
const
{
return
host_name
+
':'
+
DB
::
toString
(
port
);
}
void
Cluster
::
Address
::
fromString
(
const
String
&
host_port_string
,
String
&
host_name
,
UInt16
&
port
)
{
auto
pos
=
host_port_string
.
find_last_of
(
':'
);
...
...
dbms/src/Interpreters/Cluster.h
浏览文件 @
4a7927b1
...
...
@@ -61,9 +61,12 @@ public:
Address
(
Poco
::
Util
::
AbstractConfiguration
&
config
,
const
String
&
config_prefix
);
Address
(
const
String
&
host_port_
,
const
String
&
user_
,
const
String
&
password_
);
/// Returns
escaped '
host_name:port'
/// Returns
'escaped_
host_name:port'
String
toString
()
const
;
/// Returns 'host_name:port'
String
readableString
()
const
;
static
String
toString
(
const
String
&
host_name
,
UInt16
port
);
static
void
fromString
(
const
String
&
host_port_string
,
String
&
host_name
,
UInt16
&
port
);
...
...
dbms/src/Interpreters/DDLWorker.cpp
浏览文件 @
4a7927b1
此差异已折叠。
点击以展开。
dbms/src/Interpreters/DDLWorker.h
浏览文件 @
4a7927b1
...
...
@@ -31,7 +31,7 @@ public:
String
enqueueQuery
(
DDLLogEntry
&
entry
);
/// Host ID (name:port) for logging purposes
/// Note that in each
entry hosts are identified by name:port from
cluster config
/// Note that in each
task hosts are identified individually by name:port from initiator server
cluster config
std
::
string
getCommonHostID
()
const
{
return
host_fqdn_id
;
...
...
@@ -40,22 +40,30 @@ public:
private:
void
processTasks
();
bool
initAndCheckTask
(
DDLTask
&
task
,
const
String
&
entry_name
);
void
processTask
(
DDLTask
&
task
);
void
processTaskAlter
(
DDLTask
&
task
,
const
ASTAlterQuery
*
query
_alter
,
const
ASTAlterQuery
*
ast
_alter
,
const
String
&
rewritten_query
,
const
String
&
node_path
);
void
parseQueryAndResolveHost
(
DDLTask
&
task
);
bool
tryExecuteQuery
(
const
String
&
query
,
const
DDLTask
&
task
,
ExecutionStatus
&
status
);
/// Checks and cleanups queue's nodes
void
cleanupQueue
(
const
Strings
*
node_names_to_check
=
nullptr
);
void
createStatusDirs
(
const
std
::
string
&
node_name
);
ASTPtr
getRewrittenQuery
(
const
DDLLogEntry
&
node
);
void
run
();
private:
...
...
@@ -68,15 +76,14 @@ private:
std
::
string
queue_dir
;
/// dir with queue of queries
std
::
string
master_dir
;
/// dir with queries was initiated by the server
///
Used to omit already processed nodes. Maybe usage of set is more obvious.
std
::
string
last_processed_
node
_name
;
///
Last task that was skipped or sucesfully executed
std
::
string
last_processed_
task
_name
;
std
::
shared_ptr
<
zkutil
::
ZooKeeper
>
zookeeper
;
/// Save state of executed task to avoid duplicate execution on ZK error
std
::
string
current_node
=
{};
bool
current_node_was_executed
=
false
;
ExecutionStatus
current_node_execution_status
;
using
DDLTaskPtr
=
std
::
unique_ptr
<
DDLTask
>
;
DDLTaskPtr
current_task
;
std
::
shared_ptr
<
Poco
::
Event
>
event_queue_updated
;
std
::
atomic
<
bool
>
stop_flag
{
false
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录