Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
7fcae3dd
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,发现更多精彩内容 >>
提交
7fcae3dd
编写于
10月 21, 2015
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dbms: allowed to parse unix timestamp as DateTime for small unix timestamps [#METR-15790].
上级
fbe7b48d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
11 deletion
+20
-11
dbms/include/DB/IO/ReadHelpers.h
dbms/include/DB/IO/ReadHelpers.h
+1
-1
dbms/src/IO/ReadHelpers.cpp
dbms/src/IO/ReadHelpers.cpp
+17
-10
dbms/tests/queries/0_stateless/00142_parse_timestamp_as_datetime.reference
...s/0_stateless/00142_parse_timestamp_as_datetime.reference
+1
-0
dbms/tests/queries/0_stateless/00142_parse_timestamp_as_datetime.sql
...queries/0_stateless/00142_parse_timestamp_as_datetime.sql
+1
-0
未找到文件。
dbms/include/DB/IO/ReadHelpers.h
浏览文件 @
7fcae3dd
...
...
@@ -427,7 +427,7 @@ void readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf);
inline
void
readDateTimeText
(
time_t
&
datetime
,
ReadBuffer
&
buf
)
{
/** Считываем 10 символов, которые могут быть unix timestamp.
* При этом, поддерживается только unix timestamp из
10 символов - от 9 сентября 2001
.
* При этом, поддерживается только unix timestamp из
5-10 символов
.
* Потом смотрим на пятый символ. Если это число - парсим unix timestamp.
* Если это не число - парсим YYYY-MM-DD hh:mm:ss.
*/
...
...
dbms/src/IO/ReadHelpers.cpp
浏览文件 @
7fcae3dd
...
...
@@ -265,21 +265,28 @@ void readBackQuotedString(String & s, ReadBuffer & buf)
void
readDateTimeTextFallback
(
time_t
&
datetime
,
ReadBuffer
&
buf
)
{
char
s
[
19
];
static
constexpr
auto
DATE_TIME_BROKEN_DOWN_LENGTH
=
19
;
static
constexpr
auto
UNIX_TIMESTAMP_MAX_LENGTH
=
10
;
size_t
size
=
buf
.
read
(
s
,
10
);
if
(
10
!=
size
)
char
s
[
DATE_TIME_BROKEN_DOWN_LENGTH
];
char
*
s_pos
=
s
;
/// Кусок, похожий на unix timestamp.
while
(
s_pos
<
s
+
UNIX_TIMESTAMP_MAX_LENGTH
&&
!
buf
.
eof
()
&&
*
buf
.
position
()
>=
'0'
&&
*
buf
.
position
()
<=
'9'
)
{
s
[
size
]
=
0
;
throw
Exception
(
std
::
string
(
"Cannot parse datetime "
)
+
s
,
ErrorCodes
::
CANNOT_PARSE_DATETIME
);
*
s_pos
=
*
buf
.
position
();
++
s_pos
;
++
buf
.
position
();
}
if
(
s
[
4
]
<
'0'
||
s
[
4
]
>
'9'
)
/// 2015-01-01 01:02:03
if
(
s_pos
==
s
+
4
&&
!
buf
.
eof
()
&&
(
*
buf
.
position
()
<
'0'
||
*
buf
.
position
()
>
'9'
))
{
size_t
size
=
buf
.
read
(
&
s
[
10
],
9
);
if
(
9
!=
size
)
const
size_t
remaining_size
=
DATE_TIME_BROKEN_DOWN_LENGTH
-
(
s_pos
-
s
);
size_t
size
=
buf
.
read
(
s_pos
,
remaining_size
);
if
(
remaining_size
!=
size
)
{
s
[
10
+
size
]
=
0
;
s
_pos
[
size
]
=
0
;
throw
Exception
(
std
::
string
(
"Cannot parse datetime "
)
+
s
,
ErrorCodes
::
CANNOT_PARSE_DATETIME
);
}
...
...
@@ -297,7 +304,7 @@ void readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf)
datetime
=
DateLUT
::
instance
().
makeDateTime
(
year
,
month
,
day
,
hour
,
minute
,
second
);
}
else
datetime
=
parse
<
time_t
>
(
s
,
10
);
datetime
=
parse
<
time_t
>
(
s
,
s_pos
-
s
);
}
...
...
dbms/tests/queries/0_stateless/00142_parse_timestamp_as_datetime.reference
浏览文件 @
7fcae3dd
1
1
dbms/tests/queries/0_stateless/00142_parse_timestamp_as_datetime.sql
浏览文件 @
7fcae3dd
SELECT
min
(
ts
=
toUInt32
(
toDateTime
(
toString
(
ts
))))
FROM
(
SELECT
1000000000
+
1234
*
number
AS
ts
FROM
system
.
numbers
LIMIT
1000000
);
SELECT
min
(
ts
=
toUInt32
(
toDateTime
(
toString
(
ts
))))
FROM
(
SELECT
10000
+
1234
*
number
AS
ts
FROM
system
.
numbers
LIMIT
1000000
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录