Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
550cfef2
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,发现更多精彩内容 >>
提交
550cfef2
编写于
3月 16, 2020
作者:
A
Azat Khuzhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix max_distributed_connections w/o Processors
上级
b40eac42
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
4 deletion
+18
-4
dbms/src/Interpreters/InterpreterSelectQuery.h
dbms/src/Interpreters/InterpreterSelectQuery.h
+2
-0
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+14
-4
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.h
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.h
+2
-0
未找到文件。
dbms/src/Interpreters/InterpreterSelectQuery.h
浏览文件 @
550cfef2
...
...
@@ -92,6 +92,8 @@ public:
ASTPtr
getQuery
()
const
{
return
query_ptr
;
}
size_t
getMaxStreams
()
const
{
return
max_streams
;
}
private:
InterpreterSelectQuery
(
const
ASTPtr
&
query_ptr_
,
...
...
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
浏览文件 @
550cfef2
...
...
@@ -34,7 +34,8 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
const
Names
&
required_result_column_names
)
:
options
(
options_
),
query_ptr
(
query_ptr_
),
context
(
std
::
make_shared
<
Context
>
(
context_
))
context
(
std
::
make_shared
<
Context
>
(
context_
)),
max_streams
(
context
->
getSettingsRef
().
max_threads
)
{
const
auto
&
ast
=
query_ptr
->
as
<
ASTSelectWithUnionQuery
&>
();
...
...
@@ -196,14 +197,23 @@ BlockInputStreams InterpreterSelectWithUnionQuery::executeWithMultipleStreams(Qu
parent_pipeline
.
addInterpreterContext
(
context
);
}
/// Update max_streams due to:
/// - max_distributed_connections for Distributed() engine
/// - max_streams_to_max_threads_ratio
///
/// XXX: res.pipeline.getMaxThreads() cannot be used since it is capped to
/// number of streams, which is empty for non-Processors case.
max_streams
=
(
*
std
::
min_element
(
nested_interpreters
.
begin
(),
nested_interpreters
.
end
(),
[](
const
auto
&
a
,
const
auto
&
b
)
{
return
a
->
getMaxStreams
()
<
b
->
getMaxStreams
();
}))
->
getMaxStreams
();
return
nested_streams
;
}
BlockIO
InterpreterSelectWithUnionQuery
::
execute
()
{
const
Settings
&
settings
=
context
->
getSettingsRef
();
BlockIO
res
;
BlockInputStreams
nested_streams
=
executeWithMultipleStreams
(
res
.
pipeline
);
BlockInputStreamPtr
result_stream
;
...
...
@@ -219,7 +229,7 @@ BlockIO InterpreterSelectWithUnionQuery::execute()
}
else
{
result_stream
=
std
::
make_shared
<
UnionBlockInputStream
>
(
nested_streams
,
nullptr
,
settings
.
max_thread
s
);
result_stream
=
std
::
make_shared
<
UnionBlockInputStream
>
(
nested_streams
,
nullptr
,
max_stream
s
);
nested_streams
.
clear
();
}
...
...
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.h
浏览文件 @
550cfef2
...
...
@@ -56,6 +56,8 @@ private:
Block
result_header
;
size_t
max_streams
=
1
;
static
Block
getCommonHeaderForUnion
(
const
Blocks
&
headers
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录