Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
a4e0bbd3
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
a4e0bbd3
编写于
12月 14, 2022
作者:
A
Alex Duan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): fixed avg function sum over range
上级
473338cf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
93 addition
and
10 deletion
+93
-10
source/libs/function/inc/builtinsimpl.h
source/libs/function/inc/builtinsimpl.h
+1
-0
source/libs/function/src/detail/tavgfunction.c
source/libs/function/src/detail/tavgfunction.c
+92
-10
未找到文件。
source/libs/function/inc/builtinsimpl.h
浏览文件 @
a4e0bbd3
...
...
@@ -32,6 +32,7 @@ typedef struct SSumRes {
int16_t
type
;
int64_t
prevTs
;
bool
isPrevTsSet
;
bool
overflow
;
// if overflow is true, dsum to be used for any type;
}
SSumRes
;
typedef
struct
SMinmaxResInfo
{
...
...
source/libs/function/src/detail/tavgfunction.c
浏览文件 @
a4e0bbd3
...
...
@@ -373,7 +373,16 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems
+=
1
;
pRes
->
count
+=
1
;
pRes
->
sum
.
isum
+=
plist
[
i
];
// check overflow for int
if
(
pRes
->
sum
.
isum
>
0
&&
plist
[
i
]
>
0
&&
INT64_MAX
-
pRes
->
sum
.
isum
<=
plist
[
i
]
||
pRes
->
sum
.
isum
<
0
&&
plist
[
i
]
<
0
&&
INT64_MIN
-
pRes
->
sum
.
isum
>=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pRes
->
sum
.
overflow
=
true
;
pRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pRes
->
sum
.
isum
+=
plist
[
i
];
}
}
break
;
...
...
@@ -388,7 +397,16 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems
+=
1
;
pRes
->
count
+=
1
;
pRes
->
sum
.
isum
+=
plist
[
i
];
// check overflow
if
(
pRes
->
sum
.
isum
>
0
&&
plist
[
i
]
>
0
&&
INT64_MAX
-
pRes
->
sum
.
isum
<=
plist
[
i
]
||
pRes
->
sum
.
isum
<
0
&&
plist
[
i
]
<
0
&&
INT64_MIN
-
pRes
->
sum
.
isum
>=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pRes
->
sum
.
overflow
=
true
;
pRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pRes
->
sum
.
isum
+=
plist
[
i
];
}
}
break
;
}
...
...
@@ -431,7 +449,16 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems
+=
1
;
pRes
->
count
+=
1
;
pRes
->
sum
.
usum
+=
plist
[
i
];
// check overflow
if
(
UINT64_MAX
-
pRes
->
sum
.
usum
<=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pRes
->
sum
.
isum
;
pRes
->
sum
.
overflow
=
true
;
pRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pRes
->
sum
.
usum
+=
(
uint32_t
)
plist
[
i
];
}
}
break
;
...
...
@@ -446,7 +473,15 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems
+=
1
;
pRes
->
count
+=
1
;
pRes
->
sum
.
usum
+=
plist
[
i
];
// check overflow
if
(
UINT64_MAX
-
pRes
->
sum
.
usum
<=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pRes
->
sum
.
isum
;
pRes
->
sum
.
overflow
=
true
;
pRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pRes
->
sum
.
usum
+=
(
uint64_t
)
plist
[
i
];
}
}
break
;
}
...
...
@@ -565,9 +600,24 @@ int32_t avgFunction(SqlFunctionCtx* pCtx) {
}
else
{
for
(
int32_t
i
=
pInput
->
startRowIndex
;
i
<
pInput
->
numOfRows
+
pInput
->
startRowIndex
;
++
i
)
{
if
(
type
==
TSDB_DATA_TYPE_INT
)
{
pAvgRes
->
sum
.
isum
+=
plist
[
i
];
// check overflow for int
if
(
pAvgRes
->
sum
.
isum
>
0
&&
plist
[
i
]
>
0
&&
INT64_MAX
-
pAvgRes
->
sum
.
isum
<=
plist
[
i
]
||
pAvgRes
->
sum
.
isum
<
0
&&
plist
[
i
]
<
0
&&
INT64_MIN
-
pAvgRes
->
sum
.
isum
>=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pAvgRes
->
sum
.
overflow
=
true
;
pAvgRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pAvgRes
->
sum
.
isum
+=
plist
[
i
];
}
}
else
{
pAvgRes
->
sum
.
usum
+=
(
uint32_t
)
plist
[
i
];
// check overflow for uint
if
(
UINT64_MAX
-
pAvgRes
->
sum
.
usum
<=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pAvgRes
->
sum
.
overflow
=
true
;
pAvgRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pAvgRes
->
sum
.
usum
+=
(
uint32_t
)
plist
[
i
];
}
}
}
}
...
...
@@ -584,9 +634,24 @@ int32_t avgFunction(SqlFunctionCtx* pCtx) {
}
else
{
for
(
int32_t
i
=
pInput
->
startRowIndex
;
i
<
pInput
->
numOfRows
+
pInput
->
startRowIndex
;
++
i
)
{
if
(
type
==
TSDB_DATA_TYPE_BIGINT
)
{
pAvgRes
->
sum
.
isum
+=
plist
[
i
];
// check overflow for int
if
(
pAvgRes
->
sum
.
isum
>
0
&&
plist
[
i
]
>
0
&&
INT64_MAX
-
pAvgRes
->
sum
.
isum
<=
plist
[
i
]
||
pAvgRes
->
sum
.
isum
<
0
&&
plist
[
i
]
<
0
&&
INT64_MIN
-
pAvgRes
->
sum
.
isum
>=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pAvgRes
->
sum
.
overflow
=
true
;
pAvgRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pAvgRes
->
sum
.
isum
+=
plist
[
i
];
}
}
else
{
pAvgRes
->
sum
.
usum
+=
(
uint64_t
)
plist
[
i
];
// check overflow for uint
if
(
UINT64_MAX
-
pAvgRes
->
sum
.
usum
<=
plist
[
i
]
)
{
double
dsum
=
(
double
)
pAvgRes
->
sum
.
isum
;
pAvgRes
->
sum
.
overflow
=
true
;
pAvgRes
->
sum
.
dsum
=
dsum
+
plist
[
i
];
}
else
{
pAvgRes
->
sum
.
usum
+=
(
uint64_t
)
plist
[
i
];
}
}
}
}
...
...
@@ -639,9 +704,26 @@ static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
pOutput
->
type
=
pInput
->
type
;
if
(
IS_SIGNED_NUMERIC_TYPE
(
pOutput
->
type
))
{
pOutput
->
sum
.
isum
+=
pInput
->
sum
.
isum
;
int64_t
val
=
pInput
->
sum
.
isum
;
// check overflow
if
(
pOutput
->
sum
.
isum
>
0
&&
val
>
0
&&
INT64_MAX
-
pOutput
->
sum
.
isum
<=
val
||
pOutput
->
sum
.
isum
<
0
&&
val
<
0
&&
INT64_MIN
-
pOutput
->
sum
.
isum
>=
val
)
{
double
dsum
=
(
double
)
pOutput
->
sum
.
isum
;
pOutput
->
sum
.
overflow
=
true
;
pOutput
->
sum
.
dsum
=
dsum
+
val
;
}
else
{
pOutput
->
sum
.
isum
+=
val
;
}
}
else
if
(
IS_UNSIGNED_NUMERIC_TYPE
(
pOutput
->
type
))
{
pOutput
->
sum
.
usum
+=
pInput
->
sum
.
usum
;
// check overflow
uint64_t
val
=
pInput
->
sum
.
usum
;
if
(
UINT64_MAX
-
pOutput
->
sum
.
usum
<=
val
)
{
double
dsum
=
(
double
)
pOutput
->
sum
.
isum
;
pOutput
->
sum
.
overflow
=
true
;
pOutput
->
sum
.
dsum
=
dsum
+
val
;
}
else
{
pOutput
->
sum
.
usum
+=
val
;
}
}
else
{
pOutput
->
sum
.
dsum
+=
pInput
->
sum
.
dsum
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录