Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
b1f4cc6e
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,发现更多精彩内容 >>
提交
b1f4cc6e
编写于
3月 20, 2019
作者:
C
chertus
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix left join with const column
上级
2ea11f85
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
11 deletion
+47
-11
dbms/src/Interpreters/Join.cpp
dbms/src/Interpreters/Join.cpp
+10
-10
dbms/tests/queries/0_stateless/00916_join_using_duplicate_columns.reference
.../0_stateless/00916_join_using_duplicate_columns.reference
+15
-0
dbms/tests/queries/0_stateless/00916_join_using_duplicate_columns.sql
...ueries/0_stateless/00916_join_using_duplicate_columns.sql
+22
-1
未找到文件。
dbms/src/Interpreters/Join.cpp
浏览文件 @
b1f4cc6e
...
...
@@ -755,13 +755,13 @@ void Join::joinBlockImpl(
if
(
needed_key_names_right
.
count
(
right_name
)
&&
!
block
.
has
(
right_name
))
{
const
auto
&
col
=
block
.
getByName
(
left_name
);
auto
&
column
=
col
.
column
;
ColumnPtr
column
=
col
.
column
->
convertToFullColumnIfConst
()
;
MutableColumnPtr
mut_column
=
column
->
cloneEmpty
();
for
(
size_t
col_no
=
0
;
col_no
<
filter
.
size
();
++
col_no
)
for
(
size_t
row
=
0
;
row
<
filter
.
size
();
++
row
)
{
if
(
filter
[
col_no
])
mut_column
->
insertFrom
(
*
column
,
col_no
);
if
(
filter
[
row
])
mut_column
->
insertFrom
(
*
column
,
row
);
else
mut_column
->
insertDefault
();
}
...
...
@@ -785,22 +785,22 @@ void Join::joinBlockImpl(
if
(
needed_key_names_right
.
count
(
right_name
)
&&
!
block
.
has
(
right_name
))
{
const
auto
&
col
=
block
.
getByName
(
left_name
);
auto
&
column
=
col
.
column
;
ColumnPtr
column
=
col
.
column
->
convertToFullColumnIfConst
()
;
MutableColumnPtr
mut_column
=
column
->
cloneEmpty
();
size_t
last_offset
=
0
;
for
(
size_t
col_no
=
0
;
col_no
<
column
->
size
();
++
col_no
)
for
(
size_t
row
=
0
;
row
<
column
->
size
();
++
row
)
{
if
(
size_t
to_insert
=
(
*
offsets_to_replicate
)[
col_no
]
-
last_offset
)
if
(
size_t
to_insert
=
(
*
offsets_to_replicate
)[
row
]
-
last_offset
)
{
if
(
!
filter
[
col_no
])
if
(
!
filter
[
row
])
mut_column
->
insertDefault
();
else
for
(
size_t
dup
=
0
;
dup
<
to_insert
;
++
dup
)
mut_column
->
insertFrom
(
*
column
,
col_no
);
mut_column
->
insertFrom
(
*
column
,
row
);
}
last_offset
=
(
*
offsets_to_replicate
)[
col_no
];
last_offset
=
(
*
offsets_to_replicate
)[
row
];
}
block
.
insert
({
std
::
move
(
mut_column
),
col
.
type
,
right_name
});
...
...
dbms/tests/queries/0_stateless/00916_join_using_duplicate_columns.reference
浏览文件 @
b1f4cc6e
...
...
@@ -3,3 +3,18 @@
1
1
1 1
1 0
1 0
1 0
1 1
1 0
1 0
1 0
1 1
0 2
0 2
0 2
1 1
0 2
0 2
0 2
dbms/tests/queries/0_stateless/00916_join_using_duplicate_columns.sql
浏览文件 @
b1f4cc6e
...
...
@@ -5,4 +5,25 @@ SELECT * FROM (SELECT 1 AS x) AS t1 ALL LEFT JOIN (SELECT 1 AS x) AS t2 USING x;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
LEFT
JOIN
(
SELECT
2
AS
x
)
AS
t2
USING
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
LEFT
JOIN
(
SELECT
1
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
-- (bug) SELECT * FROM (SELECT 1 AS x) AS t1 ALL LEFT JOIN (SELECT 2 AS x) AS t2 ON t1.x = t2.x;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
LEFT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
materialize
(
1
)
AS
x
)
AS
t1
ALL
LEFT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
LEFT
JOIN
(
SELECT
materialize
(
2
)
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
LEFT
JOIN
(
SELECT
1
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
LEFT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
materialize
(
1
)
AS
x
)
AS
t1
ANY
LEFT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
LEFT
JOIN
(
SELECT
materialize
(
2
)
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
RIGHT
JOIN
(
SELECT
1
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
RIGHT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
materialize
(
1
)
AS
x
)
AS
t1
ALL
RIGHT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ALL
RIGHT
JOIN
(
SELECT
materialize
(
2
)
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
RIGHT
JOIN
(
SELECT
1
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
RIGHT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
materialize
(
1
)
AS
x
)
AS
t1
ANY
RIGHT
JOIN
(
SELECT
2
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
SELECT
*
FROM
(
SELECT
1
AS
x
)
AS
t1
ANY
RIGHT
JOIN
(
SELECT
materialize
(
2
)
AS
x
)
AS
t2
ON
t1
.
x
=
t2
.
x
;
-- SET join_use_nulls = 1;
-- SELECT * FROM (SELECT 1 AS x) AS t1 ALL LEFT JOIN (SELECT 2 AS x) AS t2 ON t1.x = t2.x;
-- SELECT * FROM (SELECT 1 AS x) AS t1 ALL RIGHT JOIN (SELECT 2 AS x) AS t2 ON t1.x = t2.x;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录