Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
ecaa98e4
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,发现更多精彩内容 >>
提交
ecaa98e4
编写于
11月 27, 2019
作者:
V
Vladimir Chebotarev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allowed to use constant TTL expressions, updated tests.
上级
fa79b7cf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
63 addition
and
6 deletion
+63
-6
dbms/src/DataStreams/TTLBlockInputStream.cpp
dbms/src/DataStreams/TTLBlockInputStream.cpp
+10
-2
dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+15
-1
dbms/tests/queries/0_stateless/00933_ttl_simple.reference
dbms/tests/queries/0_stateless/00933_ttl_simple.reference
+8
-0
dbms/tests/queries/0_stateless/00933_ttl_simple.sql
dbms/tests/queries/0_stateless/00933_ttl_simple.sql
+30
-3
未找到文件。
dbms/src/DataStreams/TTLBlockInputStream.cpp
浏览文件 @
ecaa98e4
...
...
@@ -203,8 +203,16 @@ UInt32 TTLBlockInputStream::getTimestampByIndex(const IColumn * column, size_t i
return
date_lut
.
fromDayNum
(
DayNum
(
column_date
->
getData
()[
ind
]));
else
if
(
const
ColumnUInt32
*
column_date_time
=
typeid_cast
<
const
ColumnUInt32
*>
(
column
))
return
column_date_time
->
getData
()[
ind
];
else
throw
Exception
(
"Unexpected type of result ttl column"
,
ErrorCodes
::
LOGICAL_ERROR
);
else
if
(
const
ColumnConst
*
column_const
=
typeid_cast
<
const
ColumnConst
*>
(
column
))
{
if
(
typeid_cast
<
const
ColumnUInt16
*>
(
&
column_const
->
getDataColumn
()))
return
date_lut
.
fromDayNum
(
DayNum
(
column_const
->
getValue
<
UInt16
>
()));
else
if
(
typeid_cast
<
const
ColumnUInt32
*>
(
&
column_const
->
getDataColumn
()))
return
column_const
->
getValue
<
UInt32
>
();
}
throw
Exception
(
"Unexpected type of result TTL column"
,
ErrorCodes
::
LOGICAL_ERROR
);
}
}
dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
浏览文件 @
ecaa98e4
...
...
@@ -96,8 +96,22 @@ void updateTTL(const MergeTreeData::TTLEntry & ttl_entry, MergeTreeDataPart::TTL
for
(
const
auto
&
val
:
column_date_time
->
getData
())
ttl_info
.
update
(
val
);
}
else
if
(
const
ColumnConst
*
column_const
=
typeid_cast
<
const
ColumnConst
*>
(
column
))
{
if
(
typeid_cast
<
const
ColumnUInt16
*>
(
&
column_const
->
getDataColumn
()))
{
const
auto
&
date_lut
=
DateLUT
::
instance
();
ttl_info
.
update
(
date_lut
.
fromDayNum
(
DayNum
(
column_const
->
getValue
<
UInt16
>
())));
}
else
if
(
typeid_cast
<
const
ColumnUInt32
*>
(
&
column_const
->
getDataColumn
()))
{
ttl_info
.
update
(
column_const
->
getValue
<
UInt32
>
());
}
else
throw
Exception
(
"Unexpected type of result TTL column"
,
ErrorCodes
::
LOGICAL_ERROR
);
}
else
throw
Exception
(
"Unexpected type of result
ttl
column"
,
ErrorCodes
::
LOGICAL_ERROR
);
throw
Exception
(
"Unexpected type of result
TTL
column"
,
ErrorCodes
::
LOGICAL_ERROR
);
ttl_infos
.
updatePartMinMaxTTL
(
ttl_info
.
min
,
ttl_info
.
max
);
}
...
...
dbms/tests/queries/0_stateless/00933_ttl_simple.reference
浏览文件 @
ecaa98e4
...
...
@@ -6,3 +6,11 @@
2000-10-10 00:00:00 0
2100-10-10 00:00:00 3
2100-10-10 2
CREATE TABLE default.ttl_00933_1 (`b` Int32, `a` Int32 TTL now() - 1000) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple() SETTINGS index_granularity = 8192
1 0
CREATE TABLE default.ttl_00933_1 (`b` Int32, `a` Int32 TTL now() + 1000) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple() SETTINGS index_granularity = 8192
1 1
CREATE TABLE default.ttl_00933_1 (`b` Int32, `a` Int32 TTL today() - 1) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple() SETTINGS index_granularity = 8192
1 0
CREATE TABLE default.ttl_00933_1 (`b` Int32, `a` Int32 TTL today() + 1) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple() SETTINGS index_granularity = 8192
1 1
dbms/tests/queries/0_stateless/00933_ttl_simple.sql
浏览文件 @
ecaa98e4
...
...
@@ -47,14 +47,41 @@ select sleep(0.7) format Null; -- wait if very fast merge happen
optimize
table
ttl_00933_1
final
;
select
*
from
ttl_00933_1
order
by
d
;
-- const DateTime TTL positive
drop
table
if
exists
ttl_00933_1
;
create
table
ttl_00933_1
(
b
Int
,
a
Int
ttl
now
()
-
1000
)
engine
=
MergeTree
order
by
tuple
()
partition
by
tuple
();
show
create
table
ttl_00933_1
;
insert
into
ttl_00933_1
values
(
1
,
1
);
select
sleep
(
0
.
7
)
format
Null
;
-- wait if very fast merge happen
optimize
table
ttl_00933_1
final
;
select
*
from
ttl_00933_1
;
create
table
ttl_00933_1
(
a
Int
ttl
toDateTime
(
1
))
engine
=
MergeTree
order
by
tuple
()
partition
by
toSecond
(
d
);
-- const DateTime TTL negative
drop
table
if
exists
ttl_00933_1
;
create
table
ttl_00933_1
(
b
Int
,
a
Int
ttl
now
()
+
1000
)
engine
=
MergeTree
order
by
tuple
()
partition
by
tuple
();
show
create
table
ttl_00933_1
;
insert
into
ttl_00933_1
values
(
1
);
insert
into
ttl_00933_1
values
(
1
,
1
);
select
sleep
(
0
.
7
)
format
Null
;
-- wait if very fast merge happen
optimize
table
ttl_00933_1
final
;
select
*
from
ttl_00933_1
order
by
d
;
select
*
from
ttl_00933_1
;
-- const Date TTL positive
drop
table
if
exists
ttl_00933_1
;
create
table
ttl_00933_1
(
b
Int
,
a
Int
ttl
today
()
-
1
)
engine
=
MergeTree
order
by
tuple
()
partition
by
tuple
();
show
create
table
ttl_00933_1
;
insert
into
ttl_00933_1
values
(
1
,
1
);
select
sleep
(
0
.
7
)
format
Null
;
-- wait if very fast merge happen
optimize
table
ttl_00933_1
final
;
select
*
from
ttl_00933_1
;
-- const Date TTL negative
drop
table
if
exists
ttl_00933_1
;
create
table
ttl_00933_1
(
b
Int
,
a
Int
ttl
today
()
+
1
)
engine
=
MergeTree
order
by
tuple
()
partition
by
tuple
();
show
create
table
ttl_00933_1
;
insert
into
ttl_00933_1
values
(
1
,
1
);
select
sleep
(
0
.
7
)
format
Null
;
-- wait if very fast merge happen
optimize
table
ttl_00933_1
final
;
select
*
from
ttl_00933_1
;
set
send_logs_level
=
'none'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录