Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
cad9591a
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看板
提交
cad9591a
编写于
11月 03, 2021
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10758]<fix>:call tag_project to set tag values inside single table multi-ouput functions
上级
e349f18c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
96 addition
and
3 deletion
+96
-3
src/query/src/qAggMain.c
src/query/src/qAggMain.c
+26
-3
tests/script/general/compute/csum.sim
tests/script/general/compute/csum.sim
+70
-0
未找到文件。
src/query/src/qAggMain.c
浏览文件 @
cad9591a
...
@@ -3178,7 +3178,14 @@ static void deriv_function(SQLFunctionCtx *pCtx) {
...
@@ -3178,7 +3178,14 @@ static void deriv_function(SQLFunctionCtx *pCtx) {
default:
default:
qError
(
"error input type"
);
qError
(
"error input type"
);
}
}
if
(
notNullElems
>
0
)
{
for
(
int
t
=
0
;
t
<
pCtx
->
tagInfo
.
numOfTagCols
;
++
t
)
{
SQLFunctionCtx
*
tagCtx
=
pCtx
->
tagInfo
.
pTagCtxList
[
t
];
if
(
tagCtx
->
functionId
==
TSDB_FUNC_TAG_DUMMY
)
{
aAggs
[
TSDB_FUNC_TAGPRJ
].
xFunction
(
tagCtx
);
}
}
}
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
}
}
...
@@ -3353,6 +3360,12 @@ static void diff_function(SQLFunctionCtx *pCtx) {
...
@@ -3353,6 +3360,12 @@ static void diff_function(SQLFunctionCtx *pCtx) {
*/
*/
assert
(
pCtx
->
hasNull
);
assert
(
pCtx
->
hasNull
);
}
else
{
}
else
{
for
(
int
t
=
0
;
t
<
pCtx
->
tagInfo
.
numOfTagCols
;
++
t
)
{
SQLFunctionCtx
*
tagCtx
=
pCtx
->
tagInfo
.
pTagCtxList
[
t
];
if
(
tagCtx
->
functionId
==
TSDB_FUNC_TAG_DUMMY
)
{
aAggs
[
TSDB_FUNC_TAGPRJ
].
xFunction
(
tagCtx
);
}
}
int32_t
forwardStep
=
(
isFirstBlock
)
?
notNullElems
-
1
:
notNullElems
;
int32_t
forwardStep
=
(
isFirstBlock
)
?
notNullElems
-
1
:
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
forwardStep
;
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
forwardStep
;
...
@@ -4727,8 +4740,6 @@ static void csum_function(SQLFunctionCtx *pCtx) {
...
@@ -4727,8 +4740,6 @@ static void csum_function(SQLFunctionCtx *pCtx) {
TSKEY
*
pTimestamp
=
pCtx
->
ptsOutputBuf
;
TSKEY
*
pTimestamp
=
pCtx
->
ptsOutputBuf
;
TSKEY
*
tsList
=
GET_TS_LIST
(
pCtx
);
TSKEY
*
tsList
=
GET_TS_LIST
(
pCtx
);
qDebug
(
"%p csum_function() size:%d, hasNull:%d"
,
pCtx
,
pCtx
->
size
,
pCtx
->
hasNull
);
for
(;
i
<
pCtx
->
size
&&
i
>=
0
;
i
+=
step
)
{
for
(;
i
<
pCtx
->
size
&&
i
>=
0
;
i
+=
step
)
{
char
*
pData
=
GET_INPUT_DATA
(
pCtx
,
i
);
char
*
pData
=
GET_INPUT_DATA
(
pCtx
,
i
);
if
(
pCtx
->
hasNull
&&
isNull
(
pData
,
pCtx
->
inputType
))
{
if
(
pCtx
->
hasNull
&&
isNull
(
pData
,
pCtx
->
inputType
))
{
...
@@ -4770,6 +4781,12 @@ static void csum_function(SQLFunctionCtx *pCtx) {
...
@@ -4770,6 +4781,12 @@ static void csum_function(SQLFunctionCtx *pCtx) {
if
(
notNullElems
==
0
)
{
if
(
notNullElems
==
0
)
{
assert
(
pCtx
->
hasNull
);
assert
(
pCtx
->
hasNull
);
}
else
{
}
else
{
for
(
int
t
=
0
;
t
<
pCtx
->
tagInfo
.
numOfTagCols
;
++
t
)
{
SQLFunctionCtx
*
tagCtx
=
pCtx
->
tagInfo
.
pTagCtxList
[
t
];
if
(
tagCtx
->
functionId
==
TSDB_FUNC_TAG_DUMMY
)
{
aAggs
[
TSDB_FUNC_TAGPRJ
].
xFunction
(
tagCtx
);
}
}
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
hasResult
=
DATA_SET_FLAG
;
GET_RES_INFO
(
pCtx
)
->
hasResult
=
DATA_SET_FLAG
;
}
}
...
@@ -4843,6 +4860,12 @@ static void mavg_function(SQLFunctionCtx *pCtx) {
...
@@ -4843,6 +4860,12 @@ static void mavg_function(SQLFunctionCtx *pCtx) {
if
(
notNullElems
<=
0
)
{
if
(
notNullElems
<=
0
)
{
assert
(
pCtx
->
hasNull
);
assert
(
pCtx
->
hasNull
);
}
else
{
}
else
{
for
(
int
t
=
0
;
t
<
pCtx
->
tagInfo
.
numOfTagCols
;
++
t
)
{
SQLFunctionCtx
*
tagCtx
=
pCtx
->
tagInfo
.
pTagCtxList
[
t
];
if
(
tagCtx
->
functionId
==
TSDB_FUNC_TAG_DUMMY
)
{
aAggs
[
TSDB_FUNC_TAGPRJ
].
xFunction
(
tagCtx
);
}
}
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
numOfRes
+=
notNullElems
;
GET_RES_INFO
(
pCtx
)
->
hasResult
=
DATA_SET_FLAG
;
GET_RES_INFO
(
pCtx
)
->
hasResult
=
DATA_SET_FLAG
;
}
}
...
...
tests/script/general/compute/csum.sim
浏览文件 @
cad9591a
...
@@ -100,6 +100,76 @@ if $data11 != -2 then
...
@@ -100,6 +100,76 @@ if $data11 != -2 then
return -1
return -1
endi
endi
print ==========>TD10758
sql create stable st(ts timestamp, c1 int) tags(t int);
sql create table ct1 using st tags(1)
sql insert into ct1 values(now, 1)(now+1s, 2)(now+2s, 3)
sql select csum(c1),ts,tbname,t from ct1
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select csum(c1),ts,tbname,t from st group by tbname
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select diff(c1),ts,tbname,t from ct1
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select diff(c1),ts,tbname,t from st group by tbname
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select mavg(c1,2),ts,tbname,t from ct1
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select mavg(c1,2),ts,tbname,t from st group by tbname
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select derivative(c1,1s,0),ts,tbname,t from ct1
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
sql select derivative(c1,1s,0),ts,tbname,t from st group by tbname
print $data10 , $data11 , $data12, $data13, $data14
if $data13 != ct1 then
return -1
endi
if $data14 != 1 then
return -1
endi
print =============== clear
print =============== clear
sql drop database $db
sql drop database $db
sql show databases
sql show databases
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录