Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c0a989fe
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c0a989fe
编写于
11月 11, 2021
作者:
wmmhello
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
<fix/TD-10399 <fix> fix error tips because of overflowing in time convertion
上级
cbacfc5c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
10 deletion
+26
-10
src/os/src/detail/osTime.c
src/os/src/detail/osTime.c
+22
-7
tests/pytest/functions/function_derivative.py
tests/pytest/functions/function_derivative.py
+4
-3
未找到文件。
src/os/src/detail/osTime.c
浏览文件 @
c0a989fe
...
...
@@ -387,29 +387,44 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
}
}
//end switch fromPrecision
end_:
if
(
tempResult
>
(
double
)
INT64_MAX
)
return
INT64_MAX
;
if
(
tempResult
<
(
double
)
INT64_MIN
)
return
INT64_MIN
+
1
;
// INT64_MIN means NULL
if
(
tempResult
>
=
(
double
)
INT64_MAX
)
return
INT64_MAX
;
if
(
tempResult
<
=
(
double
)
INT64_MIN
)
return
INT64_MIN
+
1
;
// INT64_MIN means NULL
return
time
;
}
static
int32_t
getDuration
(
int64_t
val
,
char
unit
,
int64_t
*
result
,
int32_t
timePrecision
)
{
switch
(
unit
)
{
case
's'
:
case
's'
:{
double
temp
=
((
double
)
val
)
*
MILLISECOND_PER_SECOND
;
if
(
temp
>=
(
double
)
INT64_MAX
||
temp
<=
(
double
)
INT64_MIN
)
return
-
1
;
(
*
result
)
=
convertTimePrecision
(
val
*
MILLISECOND_PER_SECOND
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
case
'm'
:
}
case
'm'
:{
double
temp
=
((
double
)
val
)
*
MILLISECOND_PER_MINUTE
;
if
(
temp
>=
(
double
)
INT64_MAX
||
temp
<=
(
double
)
INT64_MIN
)
return
-
1
;
(
*
result
)
=
convertTimePrecision
(
val
*
MILLISECOND_PER_MINUTE
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
case
'h'
:
}
case
'h'
:{
double
temp
=
((
double
)
val
)
*
MILLISECOND_PER_HOUR
;
if
(
temp
>=
(
double
)
INT64_MAX
||
temp
<=
(
double
)
INT64_MIN
)
return
-
1
;
(
*
result
)
=
convertTimePrecision
(
val
*
MILLISECOND_PER_HOUR
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
case
'd'
:
}
case
'd'
:
{
double
temp
=
((
double
)
val
)
*
MILLISECOND_PER_DAY
;
if
(
temp
>=
(
double
)
INT64_MAX
||
temp
<=
(
double
)
INT64_MIN
)
return
-
1
;
(
*
result
)
=
convertTimePrecision
(
val
*
MILLISECOND_PER_DAY
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
case
'w'
:
}
case
'w'
:
{
double
temp
=
((
double
)
val
)
*
MILLISECOND_PER_WEEK
;
if
(
temp
>=
(
double
)
INT64_MAX
||
temp
<=
(
double
)
INT64_MIN
)
return
-
1
;
(
*
result
)
=
convertTimePrecision
(
val
*
MILLISECOND_PER_WEEK
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
}
case
'a'
:
(
*
result
)
=
convertTimePrecision
(
val
,
TSDB_TIME_PRECISION_MILLI
,
timePrecision
);
break
;
...
...
tests/pytest/functions/function_derivative.py
浏览文件 @
c0a989fe
...
...
@@ -68,9 +68,9 @@ class TDTestCase:
tdSql
.
checkData
(
0
,
0
,
"2018-09-17 09:00:10.000"
)
tdSql
.
checkData
(
0
,
1
,
"2018-09-17 09:00:10.000"
)
tdSql
.
checkData
(
0
,
3
,
"2018-09-17 09:00:10.000"
)
tdSql
.
checkData
(
1
,
0
,
"2018-09-17 09:00:20.00
9
"
)
tdSql
.
checkData
(
1
,
1
,
"2018-09-17 09:00:20.00
9
"
)
tdSql
.
checkData
(
1
,
3
,
"2018-09-17 09:00:20.00
9
"
)
tdSql
.
checkData
(
1
,
0
,
"2018-09-17 09:00:20.00
0
"
)
tdSql
.
checkData
(
1
,
1
,
"2018-09-17 09:00:20.00
0
"
)
tdSql
.
checkData
(
1
,
3
,
"2018-09-17 09:00:20.00
0
"
)
tdSql
.
query
(
"select ts from(select ts,derivative(col, 10s, 0) from stb group by tbname)"
)
...
...
@@ -150,6 +150,7 @@ class TDTestCase:
tdSql
.
error
(
"select derivative(col, -106752999999999922222d, 0) from stb group by tbname"
);
#overflow error
tdSql
.
error
(
"select derivative(col, 10y, 0) from stb group by tbname"
)
#TD-10399, DB error: syntax error near '10y, 0) from stb group by tbname;'
tdSql
.
error
(
"select derivative(col, -106752d, 0) from stb group by tbname"
)
#TD-10398 overflow tips
tdSql
.
error
(
"select derivative(col, 106751991168d, 0) from stb group by tbname"
)
#TD-10398 overflow tips
def
run
(
self
):
tdSql
.
prepare
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录