Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
884c93ed
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,发现更多精彩内容 >>
提交
884c93ed
编写于
4月 30, 2020
作者:
N
Nikolai Kochetov
提交者:
Alexey Milovidov
5月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not calculate subqueries when only_analyze enabled.
上级
18e4df1e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
42 addition
and
30 deletion
+42
-30
src/DataStreams/PushingToViewsBlockOutputStream.cpp
src/DataStreams/PushingToViewsBlockOutputStream.cpp
+2
-7
src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+36
-20
src/Interpreters/ExecuteScalarSubqueriesVisitor.h
src/Interpreters/ExecuteScalarSubqueriesVisitor.h
+1
-0
src/Interpreters/SyntaxAnalyzer.cpp
src/Interpreters/SyntaxAnalyzer.cpp
+3
-3
未找到文件。
src/DataStreams/PushingToViewsBlockOutputStream.cpp
浏览文件 @
884c93ed
...
...
@@ -66,13 +66,8 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
std
::
unique_ptr
<
ASTInsertQuery
>
insert
=
std
::
make_unique
<
ASTInsertQuery
>
();
insert
->
table_id
=
inner_table_id
;
Context
local_context
=
*
views_context
;
local_context
.
addViewSource
(
StorageValues
::
create
(
storage
->
getStorageID
(),
storage
->
getColumns
(),
storage
->
getSampleBlock
(),
storage
->
getVirtuals
()));
/// Get list of columns we get from select query.
auto
header
=
InterpreterSelectQuery
(
query
,
local
_context
,
SelectQueryOptions
().
analyze
()).
getSampleBlock
();
auto
header
=
InterpreterSelectQuery
(
query
,
*
views
_context
,
SelectQueryOptions
().
analyze
()).
getSampleBlock
();
/// Insert only columns returned by select.
auto
list
=
std
::
make_shared
<
ASTExpressionList
>
();
...
...
@@ -85,7 +80,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
insert
->
columns
=
std
::
move
(
list
);
ASTPtr
insert_query_ptr
(
insert
.
release
());
InterpreterInsertQuery
interpreter
(
insert_query_ptr
,
local
_context
);
InterpreterInsertQuery
interpreter
(
insert_query_ptr
,
*
views
_context
);
BlockIO
io
=
interpreter
.
execute
();
out
=
io
.
out
;
}
...
...
src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
浏览文件 @
884c93ed
...
...
@@ -88,32 +88,48 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
subquery_context
.
setSettings
(
subquery_settings
);
ASTPtr
subquery_select
=
subquery
.
children
.
at
(
0
);
BlockIO
res
=
InterpreterSelectWithUnionQuery
(
subquery_select
,
subquery_context
,
SelectQueryOptions
(
QueryProcessingStage
::
Complete
,
data
.
subquery_depth
+
1
)).
execute
();
auto
options
=
SelectQueryOptions
(
QueryProcessingStage
::
Complete
,
data
.
subquery_depth
+
1
);
options
.
analyze
(
data
.
only_analyze
);
auto
interpreter
=
InterpreterSelectWithUnionQuery
(
subquery_select
,
subquery_context
,
options
);
Block
block
;
try
if
(
data
.
only_analyze
)
{
/// If query is only analyzed, then constants are not correct.
block
=
interpreter
.
getSampleBlock
();
for
(
auto
&
column
:
block
)
if
(
column
.
column
->
empty
())
column
.
column
->
cloneResized
(
1
);
}
else
{
block
=
res
.
in
->
read
();
BlockIO
res
=
interpreter
.
execute
();
if
(
!
block
)
try
{
/// Interpret subquery with empty result as Null literal
auto
ast_new
=
std
::
make_unique
<
ASTLiteral
>
(
Null
());
ast_new
->
setAlias
(
ast
->
tryGetAlias
());
ast
=
std
::
move
(
ast_new
);
return
;
block
=
res
.
in
->
read
();
if
(
!
block
)
{
/// Interpret subquery with empty result as Null literal
auto
ast_new
=
std
::
make_unique
<
ASTLiteral
>
(
Null
());
ast_new
->
setAlias
(
ast
->
tryGetAlias
());
ast
=
std
::
move
(
ast_new
);
return
;
}
if
(
block
.
rows
()
!=
1
||
res
.
in
->
read
())
throw
Exception
(
"Scalar subquery returned more than one row"
,
ErrorCodes
::
INCORRECT_RESULT_OF_SCALAR_SUBQUERY
);
}
catch
(
const
Exception
&
e
)
{
if
(
e
.
code
()
==
ErrorCodes
::
TOO_MANY_ROWS
)
throw
Exception
(
"Scalar subquery returned more than one row"
,
ErrorCodes
::
INCORRECT_RESULT_OF_SCALAR_SUBQUERY
);
else
throw
;
}
if
(
block
.
rows
()
!=
1
||
res
.
in
->
read
())
throw
Exception
(
"Scalar subquery returned more than one row"
,
ErrorCodes
::
INCORRECT_RESULT_OF_SCALAR_SUBQUERY
);
}
catch
(
const
Exception
&
e
)
{
if
(
e
.
code
()
==
ErrorCodes
::
TOO_MANY_ROWS
)
throw
Exception
(
"Scalar subquery returned more than one row"
,
ErrorCodes
::
INCORRECT_RESULT_OF_SCALAR_SUBQUERY
);
else
throw
;
}
block
=
materializeBlock
(
block
);
...
...
src/Interpreters/ExecuteScalarSubqueriesVisitor.h
浏览文件 @
884c93ed
...
...
@@ -38,6 +38,7 @@ public:
const
Context
&
context
;
size_t
subquery_depth
;
Scalars
&
scalars
;
bool
only_analyze
;
};
static
bool
needChildVisit
(
ASTPtr
&
node
,
const
ASTPtr
&
);
...
...
src/Interpreters/SyntaxAnalyzer.cpp
浏览文件 @
884c93ed
...
...
@@ -209,10 +209,10 @@ void removeUnneededColumnsFromSelectClause(const ASTSelectQuery * select_query,
}
/// Replacing scalar subqueries with constant values.
void
executeScalarSubqueries
(
ASTPtr
&
query
,
const
Context
&
context
,
size_t
subquery_depth
,
Scalars
&
scalars
)
void
executeScalarSubqueries
(
ASTPtr
&
query
,
const
Context
&
context
,
size_t
subquery_depth
,
Scalars
&
scalars
,
bool
only_analyze
)
{
LogAST
log
;
ExecuteScalarSubqueriesVisitor
::
Data
visitor_data
{
context
,
subquery_depth
,
scalars
};
ExecuteScalarSubqueriesVisitor
::
Data
visitor_data
{
context
,
subquery_depth
,
scalars
,
only_analyze
};
ExecuteScalarSubqueriesVisitor
(
visitor_data
,
log
.
stream
()).
visit
(
query
);
}
...
...
@@ -801,7 +801,7 @@ SyntaxAnalyzerResultPtr SyntaxAnalyzer::analyzeSelect(
removeUnneededColumnsFromSelectClause
(
select_query
,
required_result_columns
,
remove_duplicates
);
/// Executing scalar subqueries - replacing them with constant values.
executeScalarSubqueries
(
query
,
context
,
subquery_depth
,
result
.
scalars
);
executeScalarSubqueries
(
query
,
context
,
subquery_depth
,
result
.
scalars
,
select_options
.
only_analyze
);
{
optimizeIf
(
query
,
result
.
aliases
,
settings
.
optimize_if_chain_to_miltiif
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录