Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cd3897c7
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cd3897c7
编写于
8月 22, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): fix avg.py test cases
上级
09dc2e4e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
10 deletion
+9
-10
source/libs/function/src/builtinsimpl.c
source/libs/function/src/builtinsimpl.c
+6
-7
tests/system-test/2-query/avg.py
tests/system-test/2-query/avg.py
+3
-3
未找到文件。
source/libs/function/src/builtinsimpl.c
浏览文件 @
cd3897c7
...
...
@@ -468,7 +468,7 @@ int32_t functionFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
SColumnInfoData
*
pCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
slotId
);
SResultRowEntryInfo
*
pResInfo
=
GET_RES_INFO
(
pCtx
);
pResInfo
->
isNullRes
=
pResInfo
->
numOfRes
==
0
;
pResInfo
->
isNullRes
=
(
pResInfo
->
numOfRes
==
0
)
?
1
:
0
;
char
*
in
=
GET_ROWCELL_INTERBUF
(
pResInfo
);
colDataAppend
(
pCol
,
pBlock
->
info
.
rows
,
in
,
pResInfo
->
isNullRes
);
...
...
@@ -498,7 +498,7 @@ int32_t functionFinalizeWithResultBuf(SqlFunctionCtx* pCtx, SSDataBlock* pBlock,
SColumnInfoData
*
pCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
slotId
);
SResultRowEntryInfo
*
pResInfo
=
GET_RES_INFO
(
pCtx
);
pResInfo
->
isNullRes
=
(
pResInfo
->
isNullRes
==
1
)
?
1
:
(
pResInfo
->
numOfRes
==
0
);
;
pResInfo
->
isNullRes
=
(
pResInfo
->
numOfRes
==
0
)
?
1
:
0
;
char
*
in
=
finalResult
;
colDataAppend
(
pCol
,
pBlock
->
info
.
rows
,
in
,
pResInfo
->
isNullRes
);
...
...
@@ -663,8 +663,7 @@ int32_t sumFunction(SqlFunctionCtx* pCtx) {
// check for overflow
if
(
IS_FLOAT_TYPE
(
type
)
&&
(
isinf
(
pSumRes
->
dsum
)
||
isnan
(
pSumRes
->
dsum
)))
{
GET_RES_INFO
(
pCtx
)
->
isNullRes
=
1
;
numOfElem
=
1
;
numOfElem
=
0
;
}
_sum_over:
...
...
@@ -1099,9 +1098,9 @@ int32_t avgFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
}
// check for overflow
//
if (isinf(pAvgRes->result) || isnan(pAvgRes->result)) {
//
GET_RES_INFO(pCtx)->numOfRes = 0;
//
}
if
(
isinf
(
pAvgRes
->
result
)
||
isnan
(
pAvgRes
->
result
))
{
GET_RES_INFO
(
pCtx
)
->
numOfRes
=
0
;
}
return
functionFinalize
(
pCtx
,
pBlock
);
}
...
...
tests/system-test/2-query/avg.py
浏览文件 @
cd3897c7
...
...
@@ -361,7 +361,7 @@ class TDTestCase:
tdSql
.
error
(
f
"insert into
{
dbname
}
.sub1_bound values ( now()+1s, 2147483648, 9223372036854775808, 32768, 128, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
)
self
.
check_avg
(
f
"select avg(c1), avg(c2), avg(c3) , avg(c4), avg(c5) ,avg(c6) from
{
dbname
}
.sub1_bound "
,
f
" select sum(c1)/count(c1), sum(c2)/count(c2) ,sum(c3)/count(c3), sum(c4)/count(c4), sum(c5)/count(c5) ,sum(c6)/count(c6) from
{
dbname
}
.sub1_bound "
)
#
self.check_avg(f"select avg(c1), avg(c2), avg(c3) , avg(c4), avg(c5) ,avg(c6) from {dbname}.sub1_bound " , f" select sum(c1)/count(c1), sum(c2)/count(c2) ,sum(c3)/count(c3), sum(c4)/count(c4), sum(c5)/count(c5) ,sum(c6)/count(c6) from {dbname}.sub1_bound ")
# check basic elem for table per row
...
...
@@ -372,7 +372,7 @@ class TDTestCase:
tdSql
.
checkData
(
0
,
2
,
14042.142857143
)
tdSql
.
checkData
(
0
,
3
,
53.571428571
)
tdSql
.
checkData
(
0
,
4
,
5.828571332045761e+37
)
#
tdSql.checkData(0,5,None)
tdSql
.
checkData
(
0
,
5
,
None
)
# check + - * / in functions
...
...
@@ -382,7 +382,7 @@ class TDTestCase:
tdSql
.
checkData
(
0
,
2
,
14042.142857143
)
tdSql
.
checkData
(
0
,
3
,
26.785714286
)
tdSql
.
checkData
(
0
,
4
,
2.9142856660228804e+37
)
#
tdSql.checkData(0,5,None)
tdSql
.
checkData
(
0
,
5
,
None
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录