Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
b5658ef1
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,发现更多精彩内容 >>
提交
b5658ef1
编写于
12月 19, 2019
作者:
C
chertus
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove qualification in StorageJoin JOIN case
上级
c72b0d4e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
3 deletion
+11
-3
dbms/src/Interpreters/AnalyzedJoin.h
dbms/src/Interpreters/AnalyzedJoin.h
+3
-0
dbms/src/Storages/StorageJoin.cpp
dbms/src/Storages/StorageJoin.cpp
+3
-0
dbms/tests/queries/0_stateless/01050_engine_join_crash.reference
...sts/queries/0_stateless/01050_engine_join_crash.reference
+1
-0
dbms/tests/queries/0_stateless/01050_engine_join_crash.sql
dbms/tests/queries/0_stateless/01050_engine_join_crash.sql
+4
-3
未找到文件。
dbms/src/Interpreters/AnalyzedJoin.h
浏览文件 @
b5658ef1
...
...
@@ -119,6 +119,9 @@ public:
const
NamesAndTypesList
&
columnsFromJoinedTable
()
const
{
return
columns_from_joined_table
;
}
const
NamesAndTypesList
&
columnsAddedByJoin
()
const
{
return
columns_added_by_join
;
}
/// StorageJoin overrides key names (cause of different names qualification)
void
setRightKeys
(
const
Names
&
keys
)
{
key_names_right
=
keys
;
}
static
bool
sameJoin
(
const
AnalyzedJoin
*
x
,
const
AnalyzedJoin
*
y
);
friend
JoinPtr
makeJoin
(
std
::
shared_ptr
<
AnalyzedJoin
>
table_join
,
const
Block
&
right_sample_block
);
};
...
...
dbms/src/Storages/StorageJoin.cpp
浏览文件 @
b5658ef1
...
...
@@ -74,6 +74,9 @@ HashJoinPtr StorageJoin::getJoin(std::shared_ptr<AnalyzedJoin> analyzed_join) co
/// TODO: check key columns
/// Some HACK to remove wrong names qualifiers: table.column -> column.
analyzed_join
->
setRightKeys
(
key_names
);
HashJoinPtr
join_clone
=
std
::
make_shared
<
Join
>
(
analyzed_join
,
getSampleBlock
().
sortColumns
());
join_clone
->
reuseJoinedData
(
*
join
);
return
join_clone
;
...
...
dbms/tests/queries/0_stateless/01050_engine_join_crash.reference
浏览文件 @
b5658ef1
...
...
@@ -8,4 +8,5 @@
2 2
1 1
-
1 52.5 ONE
-
dbms/tests/queries/0_stateless/01050_engine_join_crash.sql
浏览文件 @
b5658ef1
...
...
@@ -12,13 +12,13 @@ DROP TABLE testJoinTable;
SELECT
'-'
;
SET
any_join_distinct_right_table_keys
=
1
;
SET
any_join_distinct_right_table_keys
=
1
;
DROP
TABLE
IF
EXISTS
master
;
DROP
TABLE
IF
EXISTS
transaction
;
CREATE
TABLE
master
(
id
Int32
,
name
String
)
ENGINE
=
Join
(
ANY
,
LEFT
,
id
);
CREATE
TABLE
transaction
(
id
Int32
,
value
Float64
,
master_id
Int32
)
ENGINE
=
MergeTree
()
ORDER
BY
id
;
CREATE
TABLE
master
(
id
Int32
,
name
String
)
ENGINE
=
Join
(
ANY
,
LEFT
,
id
);
INSERT
INTO
master
VALUES
(
1
,
'ONE'
);
INSERT
INTO
transaction
VALUES
(
1
,
52
.
5
,
1
);
...
...
@@ -33,11 +33,12 @@ SELECT '-';
DROP
TABLE
IF
EXISTS
some_join
;
DROP
TABLE
IF
EXISTS
tbl
;
CREATE
TABLE
some_join
(
id
String
,
value
String
)
ENGINE
=
Join
(
ANY
,
LEFT
,
id
);
CREATE
TABLE
tbl
(
eventDate
Date
,
id
String
)
ENGINE
=
MergeTree
()
PARTITION
BY
tuple
()
ORDER
BY
eventDate
;
CREATE
TABLE
some_join
(
id
String
,
value
String
)
ENGINE
=
Join
(
ANY
,
LEFT
,
id
);
SELECT
*
FROM
tbl
AS
t
ANY
LEFT
JOIN
some_join
USING
(
id
);
SELECT
*
FROM
tbl
AS
t
ANY
LEFT
JOIN
some_join
AS
d
USING
(
id
);
-- TODO SELECT t.*, d.* FROM tbl AS t ANY LEFT JOIN some_join AS d USING (id);
DROP
TABLE
some_join
;
DROP
TABLE
tbl
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录