Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
28ff4749
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,发现更多精彩内容 >>
提交
28ff4749
编写于
4月 07, 2014
作者:
M
Michael Kolupaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes. [#METR-10202]
上级
4e975b43
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
5 deletion
+9
-5
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+4
-1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+5
-4
未找到文件。
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
28ff4749
...
...
@@ -687,7 +687,7 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(MutableDa
if
(
increment
)
part
->
left
=
part
->
right
=
increment
->
get
(
false
);
part
->
name
=
getPartName
(
part
->
left_date
,
part
->
right_date
,
part
->
left
,
part
->
right
,
0
);
part
->
name
=
getPartName
(
part
->
left_date
,
part
->
right_date
,
part
->
left
,
part
->
right
,
part
->
level
);
if
(
data_parts
.
count
(
part
))
throw
Exception
(
"Part "
+
part
->
name
+
" already exists"
,
ErrorCodes
::
DUPLICATE_DATA_PART
);
...
...
@@ -705,7 +705,10 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(MutableDa
{
--
it
;
if
(
!
part
->
contains
(
**
it
))
{
++
it
;
break
;
}
res
.
push_back
(
*
it
);
data_parts
.
erase
(
it
++
);
/// Да, ++, а не --.
}
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
28ff4749
...
...
@@ -317,14 +317,14 @@ void StorageReplicatedMergeTree::pullLogsToQueue()
if
(
zookeeper
.
tryGet
(
replica_path
+
"/log_pointers/"
+
replica
,
index_str
))
{
index
=
Poco
::
NumberParser
::
parseUnsigned64
(
index_str
);
index
=
parse
<
UInt64
>
(
index_str
);
}
else
{
/// Если у нас еще нет указателя на лог этой реплики, поставим указатель на первую запись в нем.
Strings
entries
=
zookeeper
.
getChildren
(
zookeeper_path
+
"/replicas/"
+
replica
+
"/log"
);
std
::
sort
(
entries
.
begin
(),
entries
.
end
());
index
=
entries
.
empty
()
?
0
:
Poco
::
NumberParser
::
parseUnsigned64
(
entries
[
0
].
substr
(
strlen
(
"log-"
)));
index
=
entries
.
empty
()
?
0
:
parse
<
UInt64
>
(
entries
[
0
].
substr
(
strlen
(
"log-"
)));
zookeeper
.
create
(
replica_path
+
"/log_pointers/"
+
replica
,
toString
(
index
),
zkutil
::
CreateMode
::
Persistent
);
}
...
...
@@ -929,10 +929,11 @@ void StorageReplicatedMergeTree::LogEntry::readText(ReadBuffer & in)
String
type_str
;
assertString
(
"format version: 1
\n
"
,
in
);
readString
(
type_str
,
in
);
assertString
(
"
\n
source replica: "
,
in
);
assertString
(
"source replica: "
,
in
);
readString
(
source_replica
,
in
);
assertString
(
"
\n
"
,
in
);
readString
(
type_str
,
in
);
assertString
(
"
\n
"
,
in
);
if
(
type_str
==
"get"
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录