Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
121c5c96
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,发现更多精彩内容 >>
未验证
提交
121c5c96
编写于
2月 11, 2021
作者:
A
alesapin
提交者:
GitHub
2月 11, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20279 from ClickHouse/relax_check_in_data_writer
Relax check in data writer for non adaptive tables
上级
c2bb2c29
1227ca3d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
2 deletion
+38
-2
src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+2
-2
tests/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.reference
...ss/01712_no_adaptive_granularity_vertical_merge.reference
+6
-0
tests/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.sql
...tateless/01712_no_adaptive_granularity_vertical_merge.sql
+30
-0
未找到文件。
src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
浏览文件 @
121c5c96
...
...
@@ -140,7 +140,7 @@ void MergeTreeDataPartWriterWide::shiftCurrentMark(const Granules & granules_wri
/// If we didn't finished last granule than we will continue to write it from new block
if
(
!
last_granule
.
is_complete
)
{
if
(
settings
.
blocks_are_granules_size
)
if
(
settings
.
can_use_adaptive_granularity
&&
settings
.
blocks_are_granules_size
)
throw
Exception
(
ErrorCodes
::
LOGICAL_ERROR
,
"Incomplete granules are not allowed while blocks are granules size. "
"Mark number {} (rows {}), rows written in last mark {}, rows to write in last mark from block {} (from row {}), total marks currently {}"
,
last_granule
.
mark_number
,
index_granularity
.
getMarkRows
(
last_granule
.
mark_number
),
rows_written_in_last_mark
,
...
...
@@ -506,7 +506,7 @@ void MergeTreeDataPartWriterWide::finishDataSerialization(IMergeTreeDataPart::Ch
WrittenOffsetColumns
offset_columns
;
if
(
rows_written_in_last_mark
>
0
)
{
if
(
settings
.
blocks_are_granules_size
)
if
(
settings
.
can_use_adaptive_granularity
&&
settings
.
blocks_are_granules_size
)
throw
Exception
(
ErrorCodes
::
LOGICAL_ERROR
,
"Incomplete granule is not allowed while blocks are granules size even for last granule. "
"Mark number {} (rows {}), rows written for last mark {}, total marks {}"
,
getCurrentMark
(),
index_granularity
.
getMarkRows
(
getCurrentMark
()),
rows_written_in_last_mark
,
index_granularity
.
getMarksCount
());
...
...
tests/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.reference
0 → 100644
浏览文件 @
121c5c96
1 1
2 2
1 1
2 2
1 1
2 2
tests/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.sql
0 → 100644
浏览文件 @
121c5c96
DROP
TABLE
IF
EXISTS
old_school_table
;
CREATE
TABLE
old_school_table
(
key
UInt64
,
value
String
)
ENGINE
=
MergeTree
()
ORDER
BY
key
SETTINGS
index_granularity_bytes
=
0
,
enable_mixed_granularity_parts
=
0
,
min_bytes_for_wide_part
=
0
,
vertical_merge_algorithm_min_rows_to_activate
=
1
,
vertical_merge_algorithm_min_columns_to_activate
=
1
;
INSERT
INTO
old_school_table
VALUES
(
1
,
'1'
);
INSERT
INTO
old_school_table
VALUES
(
2
,
'2'
);
OPTIMIZE
TABLE
old_school_table
FINAL
;
SELECT
*
FROM
old_school_table
ORDER
BY
key
;
OPTIMIZE
TABLE
old_school_table
FINAL
;
-- just to be sure
SELECT
*
FROM
old_school_table
ORDER
BY
key
;
ALTER
TABLE
old_school_table
MODIFY
SETTING
vertical_merge_algorithm_min_rows_to_activate
=
10000
,
vertical_merge_algorithm_min_columns_to_activate
=
10000
;
OPTIMIZE
TABLE
old_school_table
FINAL
;
-- and horizontal merge
SELECT
*
FROM
old_school_table
ORDER
BY
key
;
DROP
TABLE
IF
EXISTS
old_school_table
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录