Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
1a0f17cb
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,发现更多精彩内容 >>
提交
1a0f17cb
编写于
11月 25, 2019
作者:
N
Nikolai Kochetov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix reading empty set with prewhere dependent on alias column.
上级
e1521524
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
6 deletion
+47
-6
dbms/src/Interpreters/InterpreterSelectQuery.cpp
dbms/src/Interpreters/InterpreterSelectQuery.cpp
+11
-0
dbms/tests/queries/0_stateless/01035_prewhere_with_alias.reference
...s/queries/0_stateless/01035_prewhere_with_alias.reference
+0
-0
dbms/tests/queries/0_stateless/01035_prewhere_with_alias.sql
dbms/tests/queries/0_stateless/01035_prewhere_with_alias.sql
+36
-0
dbms/tests/queries/bugs/prewhere_with_alias.sql
dbms/tests/queries/bugs/prewhere_with_alias.sql
+0
-6
未找到文件。
dbms/src/Interpreters/InterpreterSelectQuery.cpp
浏览文件 @
1a0f17cb
...
...
@@ -1694,6 +1694,13 @@ void InterpreterSelectQuery::executeFetchColumns(
if
(
query_info
.
prewhere_info
)
{
if
(
query_info
.
prewhere_info
->
alias_actions
)
{
streams
.
back
()
=
std
::
make_shared
<
ExpressionBlockInputStream
>
(
streams
.
back
(),
query_info
.
prewhere_info
->
alias_actions
);
}
streams
.
back
()
=
std
::
make_shared
<
FilterBlockInputStream
>
(
streams
.
back
(),
prewhere_info
->
prewhere_actions
,
...
...
@@ -1718,6 +1725,10 @@ void InterpreterSelectQuery::executeFetchColumns(
if
(
query_info
.
prewhere_info
)
{
if
(
query_info
.
prewhere_info
->
alias_actions
)
pipe
.
addSimpleTransform
(
std
::
make_shared
<
ExpressionTransform
>
(
pipe
.
getHeader
(),
query_info
.
prewhere_info
->
alias_actions
));
pipe
.
addSimpleTransform
(
std
::
make_shared
<
FilterTransform
>
(
pipe
.
getHeader
(),
prewhere_info
->
prewhere_actions
,
...
...
dbms/tests/queries/0_stateless/01035_prewhere_with_alias.reference
0 → 100644
浏览文件 @
1a0f17cb
dbms/tests/queries/0_stateless/01035_prewhere_with_alias.sql
0 → 100644
浏览文件 @
1a0f17cb
DROP
TABLE
IF
EXISTS
test
;
CREATE
TABLE
test
(
a
UInt8
,
b
UInt8
,
c
UInt16
ALIAS
a
+
b
)
ENGINE
=
MergeTree
ORDER
BY
a
;
SELECT
b
FROM
test
PREWHERE
c
=
1
;
DROP
TABLE
test
;
drop
table
if
exists
audience_local
;
create
table
audience_local
(
Date
Date
,
AudienceType
Enum8
(
'other'
=
0
,
'client'
=
1
,
'group'
=
2
),
UMA
UInt64
,
APIKey
String
,
TrialNameID
UInt32
,
TrialGroupID
UInt32
,
AppVersion
String
,
Arch
Enum8
(
'other'
=
0
,
'x32'
=
1
,
'x64'
=
2
),
UserID
UInt32
,
GroupID
UInt8
,
OSName
Enum8
(
'other'
=
0
,
'Android'
=
1
,
'iOS'
=
2
,
'macOS'
=
3
,
'Windows'
=
4
,
'Linux'
=
5
),
Channel
Enum8
(
'other'
=
0
,
'Canary'
=
1
,
'Dev'
=
2
,
'Beta'
=
3
,
'Stable'
=
4
),
Hits
UInt64
,
Sum
Int64
,
Release
String
alias
splitByChar
(
'-'
,
AppVersion
)[
1
]
)
engine
=
SummingMergeTree
PARTITION
BY
(
toISOYear
(
Date
),
toISOWeek
(
Date
))
ORDER
BY
(
AudienceType
,
UMA
,
APIKey
,
Date
,
TrialNameID
,
TrialGroupID
,
AppVersion
,
Arch
,
UserID
,
GroupID
,
OSName
,
Channel
)
SETTINGS
index_granularity
=
8192
;
SELECT
DISTINCT
UserID
FROM
audience_local
PREWHERE
Date
=
toDate
(
'2019-07-25'
)
AND
Release
=
'17.11.0.542'
;
drop
table
if
exists
audience_local
;
dbms/tests/queries/bugs/prewhere_with_alias.sql
已删除
100644 → 0
浏览文件 @
e1521524
DROP
TABLE
IF
EXISTS
test
.
test
;
CREATE
TABLE
test
.
test
(
a
UInt8
,
b
UInt8
,
c
UInt16
ALIAS
a
+
b
)
ENGINE
=
MergeTree
ORDER
BY
a
;
SELECT
b
FROM
test
.
test
PREWHERE
c
=
1
;
DROP
TABLE
test
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录