Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
30e7b87c
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
未验证
提交
30e7b87c
编写于
10月 22, 2021
作者:
D
dapan1121
提交者:
GitHub
10月 22, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8334 from taosdata/szhou/hotfix/td-10706
[TD-10706]<fix>:csum and mavg only support group by tbname
上级
bea6d6f1
8ac8b44c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
2 deletion
+6
-2
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+3
-2
tests/script/general/compute/csum2.sim
tests/script/general/compute/csum2.sim
+2
-0
tests/script/general/compute/mavg2.sim
tests/script/general/compute/mavg2.sim
+1
-0
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
30e7b87c
...
@@ -7245,7 +7245,7 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
...
@@ -7245,7 +7245,7 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
const
char
*
msg3
=
"group by/session/state_window not allowed on projection query"
;
const
char
*
msg3
=
"group by/session/state_window not allowed on projection query"
;
const
char
*
msg4
=
"retrieve tags not compatible with group by or interval query"
;
const
char
*
msg4
=
"retrieve tags not compatible with group by or interval query"
;
const
char
*
msg5
=
"functions can not be mixed up"
;
const
char
*
msg5
=
"functions can not be mixed up"
;
const
char
*
msg6
=
"TWA/Diff/Derivative/Irate only support group by tbname"
;
const
char
*
msg6
=
"TWA/Diff/Derivative/Irate
/CSum/MAvg
only support group by tbname"
;
// only retrieve tags, group by is not supportted
// only retrieve tags, group by is not supportted
if
(
tscQueryTags
(
pQueryInfo
))
{
if
(
tscQueryTags
(
pQueryInfo
))
{
...
@@ -7301,7 +7301,8 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
...
@@ -7301,7 +7301,8 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, char*
continue
;
continue
;
}
}
if
((
!
pQueryInfo
->
stateWindow
)
&&
(
f
==
TSDB_FUNC_DIFF
||
f
==
TSDB_FUNC_DERIVATIVE
||
f
==
TSDB_FUNC_TWA
||
f
==
TSDB_FUNC_IRATE
))
{
if
((
!
pQueryInfo
->
stateWindow
)
&&
(
f
==
TSDB_FUNC_DIFF
||
f
==
TSDB_FUNC_DERIVATIVE
||
f
==
TSDB_FUNC_TWA
||
f
==
TSDB_FUNC_IRATE
||
f
==
TSDB_FUNC_CSUM
||
f
==
TSDB_FUNC_MAVG
))
{
for
(
int32_t
j
=
0
;
j
<
pQueryInfo
->
groupbyExpr
.
numOfGroupCols
;
++
j
)
{
for
(
int32_t
j
=
0
;
j
<
pQueryInfo
->
groupbyExpr
.
numOfGroupCols
;
++
j
)
{
SColIndex
*
pColIndex
=
taosArrayGet
(
pQueryInfo
->
groupbyExpr
.
columnInfo
,
j
);
SColIndex
*
pColIndex
=
taosArrayGet
(
pQueryInfo
->
groupbyExpr
.
columnInfo
,
j
);
if
(
j
==
0
)
{
if
(
j
==
0
)
{
...
...
tests/script/general/compute/csum2.sim
浏览文件 @
30e7b87c
...
@@ -78,7 +78,9 @@ print ===> $data11
...
@@ -78,7 +78,9 @@ print ===> $data11
if $data11 != 1.000000000 then
if $data11 != 1.000000000 then
return -1
return -1
endi
endi
sql_error select csum(c7) from $tb
sql_error select csum(c7) from $tb
sql_error select csum(c7) from $tb group by c8
sql_error select csum(c8) from $tb
sql_error select csum(c8) from $tb
sql_error select csum(c9) from $tb
sql_error select csum(c9) from $tb
sql_error select csum(ts) from $tb
sql_error select csum(ts) from $tb
...
...
tests/script/general/compute/mavg2.sim
浏览文件 @
30e7b87c
...
@@ -80,6 +80,7 @@ if $data11 != 1.500000000 then
...
@@ -80,6 +80,7 @@ if $data11 != 1.500000000 then
endi
endi
sql_error select mavg(c7,2) from $tb
sql_error select mavg(c7,2) from $tb
sql_error select mavg(c8,2) from $tb
sql_error select mavg(c8,2) from $tb
sql_error select mavg(c8,2) from $tb order by c7
sql_error select mavg(c9,2) from $tb
sql_error select mavg(c9,2) from $tb
sql_error select mavg(ts,2) from $tb
sql_error select mavg(ts,2) from $tb
sql_error select mavg(c1,2), mavg(c2,2) from $tb
sql_error select mavg(c1,2), mavg(c2,2) from $tb
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录