Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
eca407e6
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,发现更多精彩内容 >>
提交
eca407e6
编写于
9月 17, 2014
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "dbms: fixed high CPU usage on failed INSERTs [#METR-12726]."
This reverts commit 49cf3bbd0d8af92a756b46039a7a52fa81992765.
上级
587820aa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
18 deletion
+4
-18
dbms/include/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h
...nclude/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h
+0
-5
dbms/include/DB/Storages/MergeTree/MergeTreeData.h
dbms/include/DB/Storages/MergeTree/MergeTreeData.h
+0
-1
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
...Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
+0
-5
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+4
-7
未找到文件。
dbms/include/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h
浏览文件 @
eca407e6
...
...
@@ -12,11 +12,6 @@ public:
MergeTreeBlockOutputStream
(
StorageMergeTree
&
storage_
)
:
storage
(
storage_
)
{}
void
writePrefix
()
{
storage
.
data
.
throwIfTooMuchParts
();
}
void
write
(
const
Block
&
block
)
{
auto
part_blocks
=
storage
.
writer
.
splitBlockIntoParts
(
block
);
...
...
dbms/include/DB/Storages/MergeTree/MergeTreeData.h
浏览文件 @
eca407e6
...
...
@@ -637,7 +637,6 @@ public:
* Если передано until - проснуться раньше, если наступило событие.
*/
void
delayInsertIfNeeded
(
Poco
::
Event
*
until
=
nullptr
);
void
throwIfTooMuchParts
();
/** Возвращает активный кусок с указанным именем или кусок, покрывающий его. Если такого нет, возвращает nullptr.
*/
...
...
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
浏览文件 @
eca407e6
...
...
@@ -15,11 +15,6 @@ public:
:
storage
(
storage_
),
insert_id
(
insert_id_
),
block_index
(
0
),
log
(
&
Logger
::
get
(
storage
.
data
.
getLogName
()
+
" (Replicated OutputStream)"
))
{}
void
writePrefix
()
{
storage
.
data
.
throwIfTooMuchParts
();
}
void
write
(
const
Block
&
block
)
override
{
assertSessionIsNotExpired
();
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
eca407e6
...
...
@@ -844,12 +844,6 @@ size_t MergeTreeData::getMaxPartsCountForMonth()
return
res
;
}
void
MergeTreeData
::
throwIfTooMuchParts
()
{
ProfileEvents
::
increment
(
ProfileEvents
::
RejectedInserts
);
throw
Exception
(
"Too much parts. Merges are processing significantly slower than inserts."
,
ErrorCodes
::
TOO_MUCH_PARTS
);
}
void
MergeTreeData
::
delayInsertIfNeeded
(
Poco
::
Event
*
until
)
{
size_t
parts_count
=
getMaxPartsCountForMonth
();
...
...
@@ -859,7 +853,10 @@ void MergeTreeData::delayInsertIfNeeded(Poco::Event * until)
delay
/=
1000
;
if
(
delay
>
DBMS_MAX_DELAY_OF_INSERT
)
delay
=
DBMS_MAX_DELAY_OF_INSERT
;
{
ProfileEvents
::
increment
(
ProfileEvents
::
RejectedInserts
);
throw
Exception
(
"Too much parts. Merges are processing significantly slower than inserts."
,
ErrorCodes
::
TOO_MUCH_PARTS
);
}
ProfileEvents
::
increment
(
ProfileEvents
::
DelayedInserts
);
ProfileEvents
::
increment
(
ProfileEvents
::
DelayedInsertsMilliseconds
,
delay
*
1000
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录