Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
b887ec8e
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,发现更多精彩内容 >>
提交
b887ec8e
编写于
9月 25, 2018
作者:
Z
zhang2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ISSUES-3145 support qualified asterisk
上级
f3dcc2ef
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
32 deletion
+29
-32
dbms/src/Interpreters/ExpressionAnalyzer.cpp
dbms/src/Interpreters/ExpressionAnalyzer.cpp
+25
-28
dbms/src/Interpreters/QueryNormalizer.cpp
dbms/src/Interpreters/QueryNormalizer.cpp
+4
-4
未找到文件。
dbms/src/Interpreters/ExpressionAnalyzer.cpp
浏览文件 @
b887ec8e
...
...
@@ -281,26 +281,36 @@ ExpressionAnalyzer::ExpressionAnalyzer(
analyzeAggregation
();
}
void
ExpressionAnalyzer
::
translateQualifiedNames
(
)
static
std
::
vector
<
ASTTableExpression
>
getTableExpressions
(
const
ASTPtr
&
query
)
{
if
(
!
select_query
||
!
select_query
->
tables
||
select_query
->
tables
->
children
.
empty
())
return
;
ASTSelectQuery
*
select_query
=
typeid_cast
<
ASTSelectQuery
*>
(
query
.
get
());
auto
&
element
=
static_cast
<
ASTTablesInSelectQueryElement
&>
(
*
select_query
->
tables
->
children
[
0
])
;
std
::
vector
<
ASTTableExpression
>
tables_expression
;
if
(
!
element
.
table_expression
)
/// This is ARRAY JOIN without a table at the left side.
return
;
if
(
select_query
&&
select_query
->
tables
)
{
for
(
const
auto
&
element
:
select_query
->
tables
->
children
)
{
ASTTablesInSelectQueryElement
&
select_element
=
static_cast
<
ASTTablesInSelectQueryElement
&>
(
*
element
);
auto
&
table_expression
=
static_cast
<
ASTTableExpression
&>
(
*
element
.
table_expression
);
auto
*
join
=
select_query
->
join
();
if
(
select_element
.
table_expression
)
tables_expression
.
emplace_back
(
static_cast
<
ASTTableExpression
&>
(
*
select_element
.
table_expression
));
}
}
std
::
vector
<
DatabaseAndTableWithAlias
>
tables
=
{
getTableNameWithAliasFromTableExpression
(
table_expression
,
context
)};
return
tables_expression
;
}
if
(
join
)
{
const
auto
&
join_table_expression
=
static_cast
<
const
ASTTableExpression
&>
(
*
join
->
table_expression
);
tables
.
emplace_back
(
getTableNameWithAliasFromTableExpression
(
join_table_expression
,
context
));
}
void
ExpressionAnalyzer
::
translateQualifiedNames
()
{
if
(
!
select_query
||
!
select_query
->
tables
||
select_query
->
tables
->
children
.
empty
())
return
;
std
::
vector
<
DatabaseAndTableWithAlias
>
tables
;
std
::
vector
<
ASTTableExpression
>
tables_expression
=
getTableExpressions
(
query
);
for
(
const
auto
&
table_expression
:
tables_expression
)
tables
.
emplace_back
(
getTableNameWithAliasFromTableExpression
(
table_expression
,
context
));
translateQualifiedNamesImpl
(
query
,
tables
);
}
...
...
@@ -863,18 +873,6 @@ static NamesAndTypesList::iterator findColumn(const String & name, NamesAndTypes
[
&
](
const
NamesAndTypesList
::
value_type
&
val
)
{
return
val
.
name
==
name
;
});
}
static
void
getTableExpressions
(
const
ASTPtr
&
node
,
std
::
vector
<
ASTTableExpression
>
&
table_expressions
)
{
if
(
ASTTableExpression
*
table_expression
=
typeid_cast
<
ASTTableExpression
*>
(
node
.
get
()))
{
table_expressions
.
emplace_back
(
*
table_expression
);
return
;
}
for
(
const
auto
&
child
:
node
->
children
)
getTableExpressions
(
child
,
table_expressions
);
}
static
NamesAndTypesList
getNamesAndTypeListFromTableExpression
(
const
ASTTableExpression
&
table_expression
,
const
Context
&
context
)
{
NamesAndTypesList
names_and_type_list
;
...
...
@@ -920,8 +918,7 @@ void ExpressionAnalyzer::normalizeTree()
TableNamesAndColumnsName
table_names_nad_columns_name
;
if
(
select_query
&&
select_query
->
tables
&&
!
select_query
->
tables
->
children
.
empty
())
{
std
::
vector
<
ASTTableExpression
>
tables_expression
;
getTableExpressions
(
select_query
->
tables
,
tables_expression
);
std
::
vector
<
ASTTableExpression
>
tables_expression
=
getTableExpressions
(
query
);
for
(
const
auto
&
table_expression
:
tables_expression
)
{
...
...
dbms/src/Interpreters/QueryNormalizer.cpp
浏览文件 @
b887ec8e
...
...
@@ -147,7 +147,7 @@ void QueryNormalizer::performImpl(ASTPtr & ast, MapOfASTs & finished_asts, SetOf
}
else
if
(
ASTExpressionList
*
expr_list
=
typeid_cast
<
ASTExpressionList
*>
(
ast
.
get
()))
{
/// Replace * with a list of columns.
/// Replace *
, alias.*, database.table.*
with a list of columns.
ASTs
&
asts
=
expr_list
->
children
;
for
(
int
i
=
static_cast
<
int
>
(
asts
.
size
())
-
1
;
i
>=
0
;
--
i
)
{
...
...
@@ -164,10 +164,10 @@ void QueryNormalizer::performImpl(ASTPtr & ast, MapOfASTs & finished_asts, SetOf
ASTIdentifier
*
identifier
=
typeid_cast
<
ASTIdentifier
*>
(
qualified_asterisk
->
children
[
0
].
get
());
size_t
num_components
=
identifier
->
children
.
size
();
for
(
const
auto
table_name_and_
names
:
table_names_and_columns_name
)
for
(
const
auto
table_name_and_
columns_name
:
table_names_and_columns_name
)
{
const
auto
table_name
=
table_name_and_
names
.
first
;
const
auto
table_all_columns_name
=
table_name_and_
names
.
second
;
const
auto
table_name
=
table_name_and_
columns_name
.
first
;
const
auto
table_all_columns_name
=
table_name_and_
columns_name
.
second
;
if
((
num_components
==
2
&&
!
table_name
.
database
.
empty
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录