Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
4f794765
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,发现更多精彩内容 >>
未验证
提交
4f794765
编写于
11月 26, 2019
作者:
N
Nikolai Kochetov
提交者:
GitHub
11月 26, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7929 from ClickHouse/fix-union-with-diff-columns
Fix union with diff columns
上级
6f119d53
c161a486
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
11 deletion
+12
-11
dbms/src/Columns/getLeastSuperColumn.cpp
dbms/src/Columns/getLeastSuperColumn.cpp
+1
-1
dbms/src/Columns/getLeastSuperColumn.h
dbms/src/Columns/getLeastSuperColumn.h
+1
-1
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+9
-9
dbms/tests/queries/0_stateless/01036_union_different_columns.reference
...eries/0_stateless/01036_union_different_columns.reference
+0
-0
dbms/tests/queries/0_stateless/01036_union_different_columns.sql
...sts/queries/0_stateless/01036_union_different_columns.sql
+1
-0
未找到文件。
dbms/src/Columns/getLeastSuperColumn.cpp
浏览文件 @
4f794765
...
...
@@ -18,7 +18,7 @@ static bool sameConstants(const IColumn & a, const IColumn & b)
return
assert_cast
<
const
ColumnConst
&>
(
a
).
getField
()
==
assert_cast
<
const
ColumnConst
&>
(
b
).
getField
();
}
ColumnWithTypeAndName
getLeastSuperColumn
(
std
::
vector
<
const
ColumnWithTypeAndName
*>
columns
)
ColumnWithTypeAndName
getLeastSuperColumn
(
const
std
::
vector
<
const
ColumnWithTypeAndName
*>
&
columns
)
{
if
(
columns
.
empty
())
throw
Exception
(
"Logical error: no src columns for supercolumn"
,
ErrorCodes
::
LOGICAL_ERROR
);
...
...
dbms/src/Columns/getLeastSuperColumn.h
浏览文件 @
4f794765
...
...
@@ -7,6 +7,6 @@ namespace DB
{
/// getLeastSupertype + related column changes
ColumnWithTypeAndName
getLeastSuperColumn
(
std
::
vector
<
const
ColumnWithTypeAndName
*>
columns
);
ColumnWithTypeAndName
getLeastSuperColumn
(
const
std
::
vector
<
const
ColumnWithTypeAndName
*>
&
columns
);
}
dbms/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
浏览文件 @
4f794765
...
...
@@ -124,17 +124,17 @@ Block InterpreterSelectWithUnionQuery::getCommonHeaderForUnion(const Blocks & he
+
"
\n
and
\n
"
+
headers
[
query_num
].
dumpNames
()
+
"
\n
"
,
ErrorCodes
::
UNION_ALL_RESULT_STRUCTURES_MISMATCH
);
}
for
(
size_t
column_num
=
0
;
column_num
<
num_columns
;
++
column_num
)
{
std
::
vector
<
const
ColumnWithTypeAndName
*>
columns
;
columns
.
reserve
(
num_selects
);
for
(
size_t
i
=
0
;
i
<
num_selects
;
++
i
)
columns
.
push_back
(
&
headers
[
i
].
getByPosition
(
column_num
));
std
::
vector
<
const
ColumnWithTypeAndName
*>
columns
(
num_selects
);
ColumnWithTypeAndName
&
result_elem
=
common_header
.
getByPosition
(
column_num
);
result_elem
=
getLeastSuperColumn
(
columns
);
}
for
(
size_t
column_num
=
0
;
column_num
<
num_columns
;
++
column_num
)
{
for
(
size_t
i
=
0
;
i
<
num_selects
;
++
i
)
columns
[
i
]
=
&
headers
[
i
].
getByPosition
(
column_num
);
ColumnWithTypeAndName
&
result_elem
=
common_header
.
getByPosition
(
column_num
);
result_elem
=
getLeastSuperColumn
(
columns
);
}
return
common_header
;
...
...
dbms/tests/queries/0_stateless/01036_union_different_columns.reference
0 → 100644
浏览文件 @
4f794765
dbms/tests/queries/0_stateless/01036_union_different_columns.sql
0 → 100644
浏览文件 @
4f794765
select
1
as
c1
,
2
as
c2
,
3
as
c3
union
all
(
select
1
as
c1
,
2
as
c2
,
3
as
c3
union
all
select
1
as
c1
,
2
as
c2
)
-- { serverError 258 }
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录