Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
04e3e317
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,体验更适合开发者的 AI 搜索 >>
提交
04e3e317
编写于
4月 06, 2020
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add converting stream to localhost clickhouse dict
上级
f0124ffc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
2 deletion
+42
-2
src/Dictionaries/ClickHouseDictionarySource.cpp
src/Dictionaries/ClickHouseDictionarySource.cpp
+13
-2
tests/queries/0_stateless/01113_local_dictionary_type_conversion.reference
...tateless/01113_local_dictionary_type_conversion.reference
+2
-0
tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
...es/0_stateless/01113_local_dictionary_type_conversion.sql
+27
-0
未找到文件。
src/Dictionaries/ClickHouseDictionarySource.cpp
浏览文件 @
04e3e317
...
...
@@ -2,6 +2,7 @@
#include <memory>
#include <Client/ConnectionPool.h>
#include <DataStreams/RemoteBlockInputStream.h>
#include <DataStreams/ConvertingBlockInputStream.h>
#include <IO/ConnectionTimeouts.h>
#include <Interpreters/executeQuery.h>
#include <Common/isLocalAddress.h>
...
...
@@ -131,6 +132,7 @@ BlockInputStreamPtr ClickHouseDictionarySource::loadAll()
{
BlockIO
res
=
executeQuery
(
load_all_query
,
context
,
true
);
/// FIXME res.in may implicitly use some objects owned be res, but them will be destructed after return
res
.
in
=
std
::
make_shared
<
ConvertingBlockInputStream
>
(
context
,
res
.
in
,
sample_block
,
ConvertingBlockInputStream
::
MatchColumnsMode
::
Position
);
return
res
.
in
;
}
return
std
::
make_shared
<
RemoteBlockInputStream
>
(
pool
,
load_all_query
,
sample_block
,
context
);
...
...
@@ -140,7 +142,11 @@ BlockInputStreamPtr ClickHouseDictionarySource::loadUpdatedAll()
{
std
::
string
load_update_query
=
getUpdateFieldAndDate
();
if
(
is_local
)
return
executeQuery
(
load_update_query
,
context
,
true
).
in
;
{
auto
res
=
executeQuery
(
load_update_query
,
context
,
true
);
res
.
in
=
std
::
make_shared
<
ConvertingBlockInputStream
>
(
context
,
res
.
in
,
sample_block
,
ConvertingBlockInputStream
::
MatchColumnsMode
::
Position
);
return
res
.
in
;
}
return
std
::
make_shared
<
RemoteBlockInputStream
>
(
pool
,
load_update_query
,
sample_block
,
context
);
}
...
...
@@ -183,7 +189,12 @@ std::string ClickHouseDictionarySource::toString() const
BlockInputStreamPtr
ClickHouseDictionarySource
::
createStreamForSelectiveLoad
(
const
std
::
string
&
query
)
{
if
(
is_local
)
return
executeQuery
(
query
,
context
,
true
).
in
;
{
auto
res
=
executeQuery
(
query
,
context
,
true
);
res
.
in
=
std
::
make_shared
<
ConvertingBlockInputStream
>
(
context
,
res
.
in
,
sample_block
,
ConvertingBlockInputStream
::
MatchColumnsMode
::
Position
);
return
res
.
in
;
}
return
std
::
make_shared
<
RemoteBlockInputStream
>
(
pool
,
query
,
sample_block
,
context
);
}
...
...
tests/queries/0_stateless/01113_local_dictionary_type_conversion.reference
0 → 100644
浏览文件 @
04e3e317
First WINDOWS 1
Second LINUX 2
tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
0 → 100644
浏览文件 @
04e3e317
DROP
DATABASE
IF
EXISTS
database_for_dict
;
CREATE
DATABASE
database_for_dict
;
CREATE
TABLE
database_for_dict
.
table_for_dict
(
CompanyID
String
,
OSType
Enum
(
'UNKNOWN'
=
0
,
'WINDOWS'
=
1
,
'LINUX'
=
2
,
'ANDROID'
=
3
,
'MAC'
=
4
),
SomeID
Int32
)
ENGINE
=
Memory
();
INSERT
INTO
database_for_dict
.
table_for_dict
VALUES
(
'First'
,
'WINDOWS'
,
1
),
(
'Second'
,
'LINUX'
,
2
);
CREATE
DICTIONARY
database_for_dict
.
dict_with_conversion
(
CompanyID
String
DEFAULT
''
,
OSType
String
DEFAULT
''
,
SomeID
Int32
DEFAULT
0
)
PRIMARY
KEY
CompanyID
SOURCE
(
CLICKHOUSE
(
HOST
'localhost'
PORT
9000
USER
'default'
TABLE
'table_for_dict'
DB
'database_for_dict'
))
LIFETIME
(
MIN
1
MAX
20
)
LAYOUT
(
COMPLEX_KEY_HASHED
());
SELECT
*
FROM
database_for_dict
.
dict_with_conversion
ORDER
BY
CompanyID
;
DROP
DATABASE
IF
EXISTS
database_for_dict
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录