Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
c762fa2f
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,发现更多精彩内容 >>
未验证
提交
c762fa2f
编写于
3月 29, 2021
作者:
A
alexey-milovidov
提交者:
GitHub
3月 29, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22129 from vdimir/issue-19303
Shrink totals block to 1 row for JOIN with TOTALS and arrayJoin
上级
3bc170e5
c81d807d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
44 addition
and
1 deletion
+44
-1
src/Interpreters/join_common.cpp
src/Interpreters/join_common.cpp
+4
-0
src/Processors/Transforms/JoiningTransform.cpp
src/Processors/Transforms/JoiningTransform.cpp
+5
-1
tests/queries/0_stateless/01107_join_right_table_totals.reference
...eries/0_stateless/01107_join_right_table_totals.reference
+10
-0
tests/queries/0_stateless/01107_join_right_table_totals.sql
tests/queries/0_stateless/01107_join_right_table_totals.sql
+25
-0
未找到文件。
src/Interpreters/join_common.cpp
浏览文件 @
c762fa2f
...
...
@@ -268,6 +268,10 @@ void joinTotals(const Block & totals, const Block & columns_to_add, const TableJ
{
if
(
table_join
.
rightBecomeNullable
(
col
.
type
))
JoinCommon
::
convertColumnToNullable
(
col
);
/// In case of arrayJoin it can be not one row
if
(
col
.
column
->
size
()
!=
1
)
col
.
column
=
col
.
column
->
cloneResized
(
1
);
}
for
(
size_t
i
=
0
;
i
<
totals_without_keys
.
columns
();
++
i
)
...
...
src/Processors/Transforms/JoiningTransform.cpp
浏览文件 @
c762fa2f
...
...
@@ -38,7 +38,11 @@ void JoiningTransform::transform(Chunk & chunk)
if
(
on_totals
)
{
/// We have to make chunk empty before return
block
=
getInputPort
().
getHeader
().
cloneWithColumns
(
chunk
.
detachColumns
());
/// In case of using `arrayJoin` we can get more or less rows than one
auto
cols
=
chunk
.
detachColumns
();
for
(
auto
&
col
:
cols
)
col
=
col
->
cloneResized
(
1
);
block
=
getInputPort
().
getHeader
().
cloneWithColumns
(
std
::
move
(
cols
));
/// Drop totals if both out stream and joined stream doesn't have ones.
/// See comment in ExpressionTransform.h
...
...
tests/queries/0_stateless/01107_join_right_table_totals.reference
浏览文件 @
c762fa2f
...
...
@@ -8,3 +8,13 @@
0
0 0 0
0 0
0 0
0 0
0 0
0 0
tests/queries/0_stateless/01107_join_right_table_totals.sql
浏览文件 @
c762fa2f
...
...
@@ -35,4 +35,29 @@ FULL JOIN
)
rr
USING
(
id
);
SELECT
id
,
yago
FROM
(
SELECT
item_id
AS
id
FROM
t
GROUP
BY
id
)
AS
ll
FULL
OUTER
JOIN
(
SELECT
item_id
AS
id
,
arrayJoin
([
111
,
222
,
333
,
444
]),
SUM
(
price_sold
)
AS
yago
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
rr
USING
(
id
);
SELECT
id
,
yago
FROM
(
SELECT
item_id
AS
id
,
arrayJoin
([
111
,
222
,
333
])
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
ll
FULL
OUTER
JOIN
(
SELECT
item_id
AS
id
,
SUM
(
price_sold
)
AS
yago
FROM
t
GROUP
BY
id
)
AS
rr
USING
(
id
);
SELECT
id
,
yago
FROM
(
SELECT
item_id
AS
id
,
arrayJoin
(
emptyArrayInt32
())
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
ll
FULL
OUTER
JOIN
(
SELECT
item_id
AS
id
,
SUM
(
price_sold
)
AS
yago
FROM
t
GROUP
BY
id
)
AS
rr
USING
(
id
);
SELECT
id
,
yago
FROM
(
SELECT
item_id
AS
id
FROM
t
GROUP
BY
id
)
AS
ll
FULL
OUTER
JOIN
(
SELECT
item_id
AS
id
,
arrayJoin
(
emptyArrayInt32
()),
SUM
(
price_sold
)
AS
yago
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
rr
USING
(
id
);
SELECT
id
,
yago
FROM
(
SELECT
item_id
AS
id
,
arrayJoin
([
111
,
222
,
333
])
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
ll
FULL
OUTER
JOIN
(
SELECT
item_id
AS
id
,
arrayJoin
([
111
,
222
,
333
,
444
]),
SUM
(
price_sold
)
AS
yago
FROM
t
GROUP
BY
id
WITH
TOTALS
)
AS
rr
USING
(
id
);
DROP
TABLE
t
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录