Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
fbcf82c4
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,发现更多精彩内容 >>
提交
fbcf82c4
编写于
3月 14, 2019
作者:
L
liuyangkuan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add interpretation of PREWHERE in StorageBuffer::read
上级
80e37baf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
3 deletion
+20
-3
dbms/src/Storages/StorageBuffer.cpp
dbms/src/Storages/StorageBuffer.cpp
+16
-0
dbms/tests/queries/0_stateless/00910_buffer_prewhere.reference
...tests/queries/0_stateless/00910_buffer_prewhere.reference
+1
-1
dbms/tests/queries/0_stateless/00910_buffer_prewhere.sql
dbms/tests/queries/0_stateless/00910_buffer_prewhere.sql
+3
-2
未找到文件。
dbms/src/Storages/StorageBuffer.cpp
浏览文件 @
fbcf82c4
...
...
@@ -25,6 +25,8 @@
#include <Poco/Ext/ThreadNumber.h>
#include <ext/range.h>
#include <DataStreams/FilterBlockInputStream.h>
#include <DataStreams/ExpressionBlockInputStream.h>
namespace
ProfileEvents
...
...
@@ -223,6 +225,20 @@ BlockInputStreams StorageBuffer::read(
for
(
auto
&
stream
:
streams_from_buffers
)
stream
=
InterpreterSelectQuery
(
query_info
.
query
,
context
,
stream
,
processed_stage
).
execute
().
in
;
if
(
query_info
.
prewhere_info
)
{
for
(
auto
&
stream
:
streams_from_buffers
)
stream
=
std
::
make_shared
<
FilterBlockInputStream
>
(
stream
,
query_info
.
prewhere_info
->
prewhere_actions
,
query_info
.
prewhere_info
->
prewhere_column_name
,
query_info
.
prewhere_info
->
remove_prewhere_column
);
if
(
query_info
.
prewhere_info
->
alias_actions
)
{
for
(
auto
&
stream
:
streams_from_buffers
)
stream
=
std
::
make_shared
<
ExpressionBlockInputStream
>
(
stream
,
query_info
.
prewhere_info
->
alias_actions
);
}
}
streams_from_dst
.
insert
(
streams_from_dst
.
end
(),
streams_from_buffers
.
begin
(),
streams_from_buffers
.
end
());
return
streams_from_dst
;
}
...
...
dbms/tests/queries/0_stateless/00910_buffer_prewhere.reference
浏览文件 @
fbcf82c4
1
\ No newline at end of file
1
dbms/tests/queries/0_stateless/00910_buffer_prewhere.sql
浏览文件 @
fbcf82c4
...
...
@@ -2,5 +2,6 @@ DROP DATABASE IF EXISTS test_buffer;
CREATE
DATABASE
test_buffer
;
CREATE
TABLE
test_buffer
.
mt
(
uid
UInt64
,
ts
DateTime
,
val
Float64
)
ENGINE
=
MergeTree
PARTITION
BY
toDate
(
ts
)
ORDER
BY
(
uid
,
ts
);
CREATE
TABLE
test_buffer
.
buf
as
test_buffer
.
mt
ENGINE
=
Buffer
(
test_buffer
,
mt
,
2
,
10
,
60
,
10000
,
100000
,
1000000
,
10000000
);
INSERT
INTO
test_buffer
.
buf
VALUES
(
1
,
'2019-03-01 10:00:00'
,
0
.
5
),
(
2
,
'2019-03-02 10:00:00'
,
0
.
15
),
(
1
,
'2019-03-03 10:00:00'
,
0
.
25
)
SELECT
count
()
from
test_buffer
.
buf
prewhere
ts
>
toDateTime
(
'2019-03-01 12:00:00'
)
and
ts
<
toDateTime
(
'2019-03-02 12:00:00'
)
\ No newline at end of file
INSERT
INTO
test_buffer
.
buf
VALUES
(
1
,
'2019-03-01 10:00:00'
,
0
.
5
),
(
2
,
'2019-03-02 10:00:00'
,
0
.
15
),
(
1
,
'2019-03-03 10:00:00'
,
0
.
25
);
SELECT
count
()
from
test_buffer
.
buf
prewhere
ts
>
toDateTime
(
'2019-03-01 12:00:00'
)
and
ts
<
toDateTime
(
'2019-03-02 12:00:00'
);
DROP
DATABASE
test_buffer
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录