Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
61c940d5
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,发现更多精彩内容 >>
提交
61c940d5
编写于
9月 12, 2019
作者:
C
chertus
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
better materialization logic in Join.cpp
上级
fc7ce275
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
27 deletion
+22
-27
dbms/src/Interpreters/IJoin.cpp
dbms/src/Interpreters/IJoin.cpp
+16
-0
dbms/src/Interpreters/IJoin.h
dbms/src/Interpreters/IJoin.h
+2
-0
dbms/src/Interpreters/Join.cpp
dbms/src/Interpreters/Join.cpp
+4
-27
未找到文件。
dbms/src/Interpreters/IJoin.cpp
浏览文件 @
61c940d5
...
@@ -32,6 +32,22 @@ void convertColumnsToNullable(Block & block, size_t starting_pos)
...
@@ -32,6 +32,22 @@ void convertColumnsToNullable(Block & block, size_t starting_pos)
convertColumnToNullable
(
block
.
getByPosition
(
i
));
convertColumnToNullable
(
block
.
getByPosition
(
i
));
}
}
ColumnRawPtrs
temporaryMaterializeColumns
(
const
Block
&
block
,
const
Names
&
names
,
Columns
&
materialized
)
{
ColumnRawPtrs
ptrs
;
ptrs
.
reserve
(
names
.
size
());
materialized
.
reserve
(
names
.
size
());
for
(
auto
&
column_name
:
names
)
{
const
auto
&
src_column
=
block
.
getByName
(
column_name
).
column
;
materialized
.
emplace_back
(
recursiveRemoveLowCardinality
(
src_column
->
convertToFullColumnIfConst
()));
ptrs
.
push_back
(
materialized
.
back
().
get
());
}
return
ptrs
;
}
ColumnRawPtrs
extractKeysForJoin
(
const
Names
&
key_names_right
,
const
Block
&
right_sample_block
,
ColumnRawPtrs
extractKeysForJoin
(
const
Names
&
key_names_right
,
const
Block
&
right_sample_block
,
Block
&
sample_block_with_keys
,
Block
&
sample_block_with_columns_to_add
)
Block
&
sample_block_with_keys
,
Block
&
sample_block_with_columns_to_add
)
{
{
...
...
dbms/src/Interpreters/IJoin.h
浏览文件 @
61c940d5
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
#include <vector>
#include <vector>
#include <Core/Names.h>
#include <Core/Names.h>
#include <Columns/IColumn.h>
namespace
DB
namespace
DB
{
{
...
@@ -41,6 +42,7 @@ namespace JoinCommon
...
@@ -41,6 +42,7 @@ namespace JoinCommon
void
convertColumnToNullable
(
ColumnWithTypeAndName
&
column
);
void
convertColumnToNullable
(
ColumnWithTypeAndName
&
column
);
void
convertColumnsToNullable
(
Block
&
block
,
size_t
starting_pos
=
0
);
void
convertColumnsToNullable
(
Block
&
block
,
size_t
starting_pos
=
0
);
ColumnRawPtrs
temporaryMaterializeColumns
(
const
Block
&
block
,
const
Names
&
names
,
Columns
&
materialized
);
/// Split key and other columns by keys name list
/// Split key and other columns by keys name list
ColumnRawPtrs
extractKeysForJoin
(
const
Names
&
key_names_right
,
const
Block
&
right_sample_block
,
ColumnRawPtrs
extractKeysForJoin
(
const
Names
&
key_names_right
,
const
Block
&
right_sample_block
,
...
...
dbms/src/Interpreters/Join.cpp
浏览文件 @
61c940d5
...
@@ -453,19 +453,9 @@ bool Join::addJoinedBlock(const Block & block)
...
@@ -453,19 +453,9 @@ bool Join::addJoinedBlock(const Block & block)
if
(
empty
())
if
(
empty
())
throw
Exception
(
"Logical error: Join was not initialized"
,
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Logical error: Join was not initialized"
,
ErrorCodes
::
LOGICAL_ERROR
);
size_t
keys_size
=
key_names_right
.
size
();
ColumnRawPtrs
key_columns
(
keys_size
);
/// Rare case, when keys are constant. To avoid code bloat, simply materialize them.
/// Rare case, when keys are constant. To avoid code bloat, simply materialize them.
Columns
materialized_columns
;
Columns
materialized_columns
;
materialized_columns
.
reserve
(
keys_size
);
ColumnRawPtrs
key_columns
=
JoinCommon
::
temporaryMaterializeColumns
(
block
,
key_names_right
,
materialized_columns
);
/// Memoize key columns to work.
for
(
size_t
i
=
0
;
i
<
keys_size
;
++
i
)
{
materialized_columns
.
emplace_back
(
recursiveRemoveLowCardinality
(
block
.
getByName
(
key_names_right
[
i
]).
column
->
convertToFullColumnIfConst
()));
key_columns
[
i
]
=
materialized_columns
.
back
().
get
();
}
/// We will insert to the map only keys, where all components are not NULL.
/// We will insert to the map only keys, where all components are not NULL.
ConstNullMapPtr
null_map
{};
ConstNullMapPtr
null_map
{};
...
@@ -478,15 +468,12 @@ bool Join::addJoinedBlock(const Block & block)
...
@@ -478,15 +468,12 @@ bool Join::addJoinedBlock(const Block & block)
prepareBlockListStructure
(
*
stored_block
);
prepareBlockListStructure
(
*
stored_block
);
size_t
size
=
stored_block
->
columns
();
/// Rare case, when joined columns are constant. To avoid code bloat, simply materialize them.
/// Rare case, when joined columns are constant. To avoid code bloat, simply materialize them.
for
(
size_t
i
=
0
;
i
<
size
;
++
i
)
*
stored_block
=
materializeBlock
(
*
stored_block
);
stored_block
->
safeGetByPosition
(
i
).
column
=
stored_block
->
safeGetByPosition
(
i
).
column
->
convertToFullColumnIfConst
();
/// In case of LEFT and FULL joins, if use_nulls, convert joined columns to Nullable.
/// In case of LEFT and FULL joins, if use_nulls, convert joined columns to Nullable.
if
(
use_nulls
&&
isLeftOrFull
(
kind
))
if
(
use_nulls
&&
isLeftOrFull
(
kind
))
JoinCommon
::
convertColumnsToNullable
(
*
stored_block
,
(
isFull
(
kind
)
?
key
s_size
:
0
));
JoinCommon
::
convertColumnsToNullable
(
*
stored_block
,
(
isFull
(
kind
)
?
key
_names_right
.
size
()
:
0
));
if
(
kind
!=
ASTTableJoin
::
Kind
::
Cross
)
if
(
kind
!=
ASTTableJoin
::
Kind
::
Cross
)
{
{
...
@@ -723,19 +710,9 @@ void Join::joinBlockImpl(
...
@@ -723,19 +710,9 @@ void Join::joinBlockImpl(
const
Block
&
block_with_columns_to_add
,
const
Block
&
block_with_columns_to_add
,
const
Maps
&
maps_
)
const
const
Maps
&
maps_
)
const
{
{
size_t
keys_size
=
key_names_left
.
size
();
ColumnRawPtrs
key_columns
(
keys_size
);
/// Rare case, when keys are constant. To avoid code bloat, simply materialize them.
/// Rare case, when keys are constant. To avoid code bloat, simply materialize them.
Columns
materialized_columns
;
Columns
materialized_columns
;
materialized_columns
.
reserve
(
keys_size
);
ColumnRawPtrs
key_columns
=
JoinCommon
::
temporaryMaterializeColumns
(
block
,
key_names_left
,
materialized_columns
);
/// Memoize key columns to work with.
for
(
size_t
i
=
0
;
i
<
keys_size
;
++
i
)
{
materialized_columns
.
emplace_back
(
recursiveRemoveLowCardinality
(
block
.
getByName
(
key_names_left
[
i
]).
column
->
convertToFullColumnIfConst
()));
key_columns
[
i
]
=
materialized_columns
.
back
().
get
();
}
/// Keys with NULL value in any column won't join to anything.
/// Keys with NULL value in any column won't join to anything.
ConstNullMapPtr
null_map
{};
ConstNullMapPtr
null_map
{};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录