Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
418766e9
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,发现更多精彩内容 >>
提交
418766e9
编写于
10月 05, 2020
作者:
A
Alexander Tokmakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix another bug in mutations
上级
30a18f75
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
2 deletion
+28
-2
src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+10
-0
src/Storages/StorageReplicatedMergeTree.cpp
src/Storages/StorageReplicatedMergeTree.cpp
+6
-2
tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
...1149_zookeeper_mutation_stuck_after_replace_partition.sql
+12
-0
未找到文件。
src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
浏览文件 @
418766e9
...
...
@@ -715,6 +715,16 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
for
(
const
String
&
produced_part_name
:
queue_entry
->
getVirtualPartNames
())
{
auto
part_info
=
MergeTreePartInfo
::
fromPartName
(
produced_part_name
,
format_version
);
/// Oddly enough, getVirtualPartNames() may return _virtual_ part name.
/// Such parts do not exist and will never appear, so we should not add virtual parts to parts_to_do list.
/// Fortunately, it's easy to distinguish virtual parts from normal parts by part level.
/// See StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(...)
auto
max_level
=
MergeTreePartInfo
::
MAX_LEVEL
;
/// DROP/DETACH PARTITION
auto
another_max_level
=
std
::
numeric_limits
<
decltype
(
part_info
.
level
)
>::
max
();
/// REPLACE/MOVE PARTITION
if
(
part_info
.
level
==
max_level
||
part_info
.
level
==
another_max_level
)
continue
;
auto
it
=
entry
->
block_numbers
.
find
(
part_info
.
partition_id
);
if
(
it
!=
entry
->
block_numbers
.
end
()
&&
it
->
second
>
part_info
.
getDataVersion
())
mutation
.
parts_to_do
.
add
(
produced_part_name
);
...
...
src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
418766e9
...
...
@@ -4092,9 +4092,12 @@ bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const St
mutation_version
=
queue
.
getCurrentMutationVersion
(
partition_id
,
right
);
}
/// REPLACE PARTITION does not decrement max_block of DROP_RANGE for unknown (probably historical) reason.
/// REPLACE PARTITION uses different max level and does not decrement max_block of DROP_RANGE for unknown (probably historical) reason.
auto
max_level
=
std
::
numeric_limits
<
decltype
(
part_info
.
level
)
>::
max
();
if
(
!
for_replace_partition
)
{
max_level
=
MergeTreePartInfo
::
MAX_LEVEL
;
/// Empty partition.
if
(
right
==
0
)
return
false
;
...
...
@@ -4103,7 +4106,7 @@ bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const St
}
/// Artificial high level is chosen, to make this part "covering" all parts inside.
part_info
=
MergeTreePartInfo
(
partition_id
,
left
,
right
,
MergeTreePartInfo
::
MAX_LEVEL
,
mutation_version
);
part_info
=
MergeTreePartInfo
(
partition_id
,
left
,
right
,
max_level
,
mutation_version
);
return
true
;
}
...
...
@@ -5393,6 +5396,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
}
/// We are almost ready to commit changes, remove fetches and merges from drop range
/// FIXME it's unsafe to remove queue entries before we actually commit REPLACE_RANGE to replication log
queue
.
removePartProducingOpsInRange
(
zookeeper
,
drop_range
,
entry
);
/// Remove deduplication block_ids of replacing parts
...
...
tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
浏览文件 @
418766e9
...
...
@@ -22,5 +22,17 @@ alter table rmt drop column s;
select
mutation_id
,
command
,
parts_to_do_names
,
parts_to_do
,
is_done
from
system
.
mutations
where
database
=
currentDatabase
()
and
table
=
'rmt'
;
select
*
from
rmt
;
drop
table
rmt
sync
;
set
replication_alter_partitions_sync
=
0
;
create
table
rmt
(
n
UInt64
,
s
String
)
engine
=
ReplicatedMergeTree
(
'/clickhouse/test_01149/rmt'
,
'r1'
)
partition
by
intDiv
(
n
,
10
)
order
by
n
;
insert
into
rmt
values
(
1
,
'1'
),
(
2
,
'2'
);
alter
table
rmt
update
s
=
's'
||
toString
(
n
)
where
1
;
alter
table
rmt
drop
partition
'0'
;
set
replication_alter_partitions_sync
=
1
;
alter
table
rmt
drop
column
s
;
drop
table
mt
;
drop
table
rmt
sync
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录