Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
54ea7b0b
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,发现更多精彩内容 >>
提交
54ea7b0b
编写于
9月 09, 2018
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed error [#CLICKHOUSE-2]
上级
163f9432
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
3 deletion
+6
-3
dbms/programs/copier/ClusterCopier.cpp
dbms/programs/copier/ClusterCopier.cpp
+0
-1
dbms/src/Interpreters/InterpreterInsertQuery.cpp
dbms/src/Interpreters/InterpreterInsertQuery.cpp
+1
-1
dbms/src/Storages/StorageBuffer.cpp
dbms/src/Storages/StorageBuffer.cpp
+5
-1
未找到文件。
dbms/programs/copier/ClusterCopier.cpp
浏览文件 @
54ea7b0b
...
@@ -37,7 +37,6 @@
...
@@ -37,7 +37,6 @@
#include <Interpreters/Context.h>
#include <Interpreters/Context.h>
#include <Interpreters/Cluster.h>
#include <Interpreters/Cluster.h>
#include <Interpreters/InterpreterFactory.h>
#include <Interpreters/InterpreterFactory.h>
#include <Interpreters/InterpreterInsertQuery.h>
#include <Interpreters/InterpreterExistsQuery.h>
#include <Interpreters/InterpreterExistsQuery.h>
#include <Interpreters/InterpreterShowCreateQuery.h>
#include <Interpreters/InterpreterShowCreateQuery.h>
#include <Interpreters/InterpreterDropQuery.h>
#include <Interpreters/InterpreterDropQuery.h>
...
...
dbms/src/Interpreters/InterpreterInsertQuery.cpp
浏览文件 @
54ea7b0b
...
@@ -101,7 +101,7 @@ BlockIO InterpreterInsertQuery::execute()
...
@@ -101,7 +101,7 @@ BlockIO InterpreterInsertQuery::execute()
/// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
/// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
/// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
/// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
if
(
!
(
context
.
getSettingsRef
().
insert_distributed_sync
&&
table
->
getName
()
==
"Distributed"
))
if
(
!
(
context
.
getSettingsRef
().
insert_distributed_sync
&&
table
->
isRemote
()
))
{
{
out
=
std
::
make_shared
<
SquashingBlockOutputStream
>
(
out
=
std
::
make_shared
<
SquashingBlockOutputStream
>
(
out
,
context
.
getSettingsRef
().
min_insert_block_size_rows
,
context
.
getSettingsRef
().
min_insert_block_size_bytes
);
out
,
context
.
getSettingsRef
().
min_insert_block_size_rows
,
context
.
getSettingsRef
().
min_insert_block_size_bytes
);
...
...
dbms/src/Storages/StorageBuffer.cpp
浏览文件 @
54ea7b0b
...
@@ -601,9 +601,13 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
...
@@ -601,9 +601,13 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
InterpreterInsertQuery
interpreter
{
insert
,
context
,
allow_materialized
};
InterpreterInsertQuery
interpreter
{
insert
,
context
,
allow_materialized
};
Block
block_to_write
;
for
(
const
auto
&
name
:
columns_intersection
)
block_to_write
.
insert
(
block
.
getByName
(
name
));
auto
block_io
=
interpreter
.
execute
();
auto
block_io
=
interpreter
.
execute
();
block_io
.
out
->
writePrefix
();
block_io
.
out
->
writePrefix
();
block_io
.
out
->
write
(
block
);
block_io
.
out
->
write
(
block
_to_write
);
block_io
.
out
->
writeSuffix
();
block_io
.
out
->
writeSuffix
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录