Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
016f707e
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,发现更多精彩内容 >>
未验证
提交
016f707e
编写于
9月 04, 2020
作者:
A
Amos Bird
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
column transformers in insert select
上级
c2f762e2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
66 addition
and
2 deletion
+66
-2
src/Interpreters/InterpreterInsertQuery.cpp
src/Interpreters/InterpreterInsertQuery.cpp
+25
-1
src/Parsers/ParserInsertQuery.cpp
src/Parsers/ParserInsertQuery.cpp
+8
-1
src/Parsers/ParserInsertQuery.h
src/Parsers/ParserInsertQuery.h
+9
-0
tests/queries/0_stateless/01470_test_insert_select_asterisk.reference
...s/0_stateless/01470_test_insert_select_asterisk.reference
+6
-0
tests/queries/0_stateless/01470_test_insert_select_asterisk.sql
...queries/0_stateless/01470_test_insert_select_asterisk.sql
+18
-0
未找到文件。
src/Interpreters/InterpreterInsertQuery.cpp
浏览文件 @
016f707e
...
...
@@ -17,6 +17,7 @@
#include <Interpreters/InterpreterWatchQuery.h>
#include <Interpreters/JoinedTables.h>
#include <Parsers/ASTFunction.h>
#include <Parsers/ASTIdentifier.h>
#include <Parsers/ASTInsertQuery.h>
#include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTSelectWithUnionQuery.h>
...
...
@@ -29,6 +30,8 @@
#include <Storages/StorageDistributed.h>
#include <TableFunctions/TableFunctionFactory.h>
#include <Common/checkStackSize.h>
#include <Interpreters/TranslateQualifiedNamesVisitor.h>
#include <Interpreters/getTableExpressions.h>
namespace
{
...
...
@@ -90,9 +93,30 @@ Block InterpreterInsertQuery::getSampleBlock(
}
Block
table_sample
=
metadata_snapshot
->
getSampleBlock
();
const
auto
&
columns
=
metadata_snapshot
->
getColumns
();
auto
names_and_types
=
columns
.
getOrdinary
();
removeDuplicateColumns
(
names_and_types
);
auto
table_expr
=
std
::
make_shared
<
ASTTableExpression
>
();
table_expr
->
database_and_table_name
=
createTableIdentifier
(
table
->
getStorageID
());
table_expr
->
children
.
push_back
(
table_expr
->
database_and_table_name
);
TablesWithColumns
tables_with_columns
;
tables_with_columns
.
emplace_back
(
DatabaseAndTableWithAlias
(
*
table_expr
,
context
.
getCurrentDatabase
()),
names_and_types
);
tables_with_columns
[
0
].
addHiddenColumns
(
columns
.
getMaterialized
());
tables_with_columns
[
0
].
addHiddenColumns
(
columns
.
getAliases
());
tables_with_columns
[
0
].
addHiddenColumns
(
table
->
getVirtuals
());
NameSet
source_columns_set
;
for
(
const
auto
&
identifier
:
query
.
columns
->
children
)
source_columns_set
.
insert
(
identifier
->
getColumnName
());
TranslateQualifiedNamesVisitor
::
Data
visitor_data
(
source_columns_set
,
tables_with_columns
);
TranslateQualifiedNamesVisitor
visitor
(
visitor_data
);
auto
columns_ast
=
query
.
columns
->
clone
();
visitor
.
visit
(
columns_ast
);
/// Form the block based on the column names from the query
Block
res
;
for
(
const
auto
&
identifier
:
query
.
columns
->
children
)
for
(
const
auto
&
identifier
:
columns_ast
->
children
)
{
std
::
string
current_name
=
identifier
->
getColumnName
();
...
...
src/Parsers/ParserInsertQuery.cpp
浏览文件 @
016f707e
...
...
@@ -36,7 +36,7 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
ParserToken
s_lparen
(
TokenType
::
OpeningRoundBracket
);
ParserToken
s_rparen
(
TokenType
::
ClosingRoundBracket
);
ParserIdentifier
name_p
;
ParserList
columns_p
(
std
::
make_unique
<
Parser
CompoundIdentifier
>
(),
std
::
make_unique
<
ParserToken
>
(
TokenType
::
Comma
),
false
);
ParserList
columns_p
(
std
::
make_unique
<
Parser
InsertElement
>
(),
std
::
make_unique
<
ParserToken
>
(
TokenType
::
Comma
),
false
);
ParserFunction
table_function_p
{
false
};
ASTPtr
database
;
...
...
@@ -189,5 +189,12 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
return
true
;
}
bool
ParserInsertElement
::
parseImpl
(
Pos
&
pos
,
ASTPtr
&
node
,
Expected
&
expected
)
{
return
ParserColumnsMatcher
().
parse
(
pos
,
node
,
expected
)
||
ParserQualifiedAsterisk
().
parse
(
pos
,
node
,
expected
)
||
ParserAsterisk
().
parse
(
pos
,
node
,
expected
)
||
ParserCompoundIdentifier
().
parse
(
pos
,
node
,
expected
);
}
}
src/Parsers/ParserInsertQuery.h
浏览文件 @
016f707e
...
...
@@ -33,4 +33,13 @@ public:
ParserInsertQuery
(
const
char
*
end_
)
:
end
(
end_
)
{}
};
/** Insert accepts an identifier and an asterisk with variants.
*/
class
ParserInsertElement
:
public
IParserBase
{
protected:
const
char
*
getName
()
const
override
{
return
"insert element"
;
}
bool
parseImpl
(
Pos
&
pos
,
ASTPtr
&
node
,
Expected
&
expected
)
override
;
};
}
tests/queries/0_stateless/01470_test_insert_select_asterisk.reference
0 → 100644
浏览文件 @
016f707e
1 0 0 2
3 0 0 4
1 0 0 2
3 0 0 4
1 0 0 2
3 0 0 4
tests/queries/0_stateless/01470_test_insert_select_asterisk.sql
0 → 100644
浏览文件 @
016f707e
DROP
TABLE
IF
EXISTS
insert_select_dst
;
DROP
TABLE
IF
EXISTS
insert_select_src
;
CREATE
TABLE
insert_select_dst
(
i
int
,
middle_a
int
,
middle_b
int
,
j
int
)
ENGINE
=
Log
;
CREATE
TABLE
insert_select_src
(
i
int
,
j
int
)
ENGINE
=
Log
;
INSERT
INTO
insert_select_src
VALUES
(
1
,
2
),
(
3
,
4
);
INSERT
INTO
insert_select_dst
(
*
EXCEPT
(
middle_a
,
middle_b
))
SELECT
*
FROM
insert_select_src
;
INSERT
INTO
insert_select_dst
(
insert_select_dst
.
*
EXCEPT
(
middle_a
,
middle_b
))
SELECT
*
FROM
insert_select_src
;
INSERT
INTO
insert_select_dst
(
COLUMNS
(
'.*'
)
EXCEPT
(
middle_a
,
middle_b
))
SELECT
*
FROM
insert_select_src
;
INSERT
INTO
insert_select_dst
(
insert_select_src
.
*
EXCEPT
(
middle_a
,
middle_b
))
SELECT
*
FROM
insert_select_src
;
-- { serverError 47 }
SELECT
*
FROM
insert_select_dst
;
DROP
TABLE
IF
EXISTS
insert_select_dst
;
DROP
TABLE
IF
EXISTS
insert_select_src
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录