Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
3843fecc
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,发现更多精彩内容 >>
提交
3843fecc
编写于
11月 27, 2020
作者:
R
robot-clickhouse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backport #17397 to 20.12: Fix crash while reading from JOIN table with LowCardinality types
上级
8f2d33f5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
10 deletion
+29
-10
src/Storages/StorageJoin.cpp
src/Storages/StorageJoin.cpp
+15
-10
tests/queries/0_stateless/01586_storage_join_low_cardinality_key.reference
...tateless/01586_storage_join_low_cardinality_key.reference
+3
-0
tests/queries/0_stateless/01586_storage_join_low_cardinality_key.sql
...es/0_stateless/01586_storage_join_low_cardinality_key.sql
+11
-0
未找到文件。
src/Storages/StorageJoin.cpp
浏览文件 @
3843fecc
...
...
@@ -10,6 +10,7 @@
#include <DataTypes/NestedUtils.h>
#include <Interpreters/joinDispatch.h>
#include <Interpreters/TableJoin.h>
#include <Interpreters/castColumn.h>
#include <Common/assert_cast.h>
#include <Common/quoteString.h>
...
...
@@ -321,7 +322,7 @@ private:
template
<
ASTTableJoin
::
Kind
KIND
,
ASTTableJoin
::
Strictness
STRICTNESS
,
typename
Maps
>
Chunk
createChunk
(
const
Maps
&
maps
)
{
MutableColumns
columns
=
restored_block
.
cloneEmpty
().
mutateColumns
();
MutableColumns
mut_
columns
=
restored_block
.
cloneEmpty
().
mutateColumns
();
size_t
rows_added
=
0
;
...
...
@@ -329,7 +330,7 @@ private:
{
#define M(TYPE) \
case HashJoin::Type::TYPE: \
rows_added = fillColumns<KIND, STRICTNESS>(*maps.TYPE, columns); \
rows_added = fillColumns<KIND, STRICTNESS>(*maps.TYPE,
mut_
columns); \
break;
APPLY_FOR_JOIN_VARIANTS_LIMITED
(
M
)
#undef M
...
...
@@ -342,19 +343,23 @@ private:
if
(
!
rows_added
)
return
{};
/// Correct nullability
Columns
columns
;
columns
.
reserve
(
mut_columns
.
size
());
for
(
auto
&
col
:
mut_columns
)
columns
.
emplace_back
(
std
::
move
(
col
));
/// Correct nullability and LowCardinality types
for
(
size_t
i
=
0
;
i
<
columns
.
size
();
++
i
)
{
bool
src_nullable
=
restored_block
.
getByPosition
(
i
).
type
->
isNullable
(
);
bool
dst_nullable
=
sample_block
.
getByPosition
(
i
).
type
->
isNullable
(
);
const
auto
&
src
=
restored_block
.
getByPosition
(
i
);
const
auto
&
dst
=
sample_block
.
getByPosition
(
i
);
if
(
src_nullable
&&
!
dst_nullable
)
if
(
!
src
.
type
->
equals
(
*
dst
.
type
)
)
{
auto
&
nullable_column
=
assert_cast
<
ColumnNullable
&>
(
*
columns
[
i
]);
columns
[
i
]
=
nullable_column
.
getNestedColumnPtr
()
->
assumeMutable
();
auto
arg
=
src
;
arg
.
column
=
std
::
move
(
columns
[
i
]);
columns
[
i
]
=
castColumn
(
arg
,
dst
.
type
);
}
else
if
(
!
src_nullable
&&
dst_nullable
)
columns
[
i
]
=
makeNullable
(
std
::
move
(
columns
[
i
]))
->
assumeMutable
();
}
UInt64
num_rows
=
columns
.
at
(
0
)
->
size
();
...
...
tests/queries/0_stateless/01586_storage_join_low_cardinality_key.reference
0 → 100644
浏览文件 @
3843fecc
1
1
1
tests/queries/0_stateless/01586_storage_join_low_cardinality_key.sql
0 → 100644
浏览文件 @
3843fecc
CREATE
TABLE
low_card
(
`lc`
LowCardinality
(
String
)
)
ENGINE
=
Join
(
ANY
,
LEFT
,
lc
);
INSERT
INTO
low_card
VALUES
(
'1'
);
SELECT
*
FROM
low_card
;
SELECT
*
FROM
low_card
WHERE
lc
=
'1'
;
SELECT
CAST
(
lc
AS
String
)
FROM
low_card
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录