Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冷面1992
TDengine
提交
649b740c
TDengine
项目概览
冷面1992
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
649b740c
编写于
8月 12, 2021
作者:
Y
yihaoDeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-5797]<fix> refactor errmsg
上级
7abcd838
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
18 deletion
+15
-18
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+15
-18
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
649b740c
...
...
@@ -2029,12 +2029,11 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
const
char
*
msg1
=
"too many items in selection clause"
;
const
char
*
msg2
=
"functions or others can not be mixed up"
;
const
char
*
msg3
=
"not support query expression"
;
const
char
*
msg4
=
"not support distinct mixed with proj"
;
const
char
*
msg4
=
"not support distinct mixed with proj
/agg func
"
;
const
char
*
msg5
=
"invalid function name"
;
const
char
*
msg6
=
"not support distinct mixed with agg function"
;
const
char
*
msg7
=
"not support distinct mixed with join"
;
const
char
*
msg8
=
"not support distinct mixed with groupby"
;
const
char
*
msg9
=
"not support distinct in nest query"
;
const
char
*
msg6
=
"not support distinct mixed with join"
;
const
char
*
msg7
=
"not support distinct mixed with groupby"
;
const
char
*
msg8
=
"not support distinct in nest query"
;
// too many result columns not support order by in query
if
(
taosArrayGetSize
(
pSelNodeList
)
>
TSDB_MAX_COLUMNS
)
{
...
...
@@ -2047,20 +2046,21 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
bool
hasDistinct
=
false
;
bool
hasAgg
=
false
;
size_t
numOfExpr
=
taosArrayGetSize
(
pSelNodeList
);
size_t
numOfExpr
=
taosArrayGetSize
(
pSelNodeList
);
int32_t
distIdx
=
-
1
;
for
(
int32_t
i
=
0
;
i
<
numOfExpr
;
++
i
)
{
int32_t
outputIndex
=
(
int32_t
)
tscNumOfExprs
(
pQueryInfo
);
tSqlExprItem
*
pItem
=
taosArrayGet
(
pSelNodeList
,
i
);
if
(
hasDistinct
==
false
)
{
hasDistinct
=
(
pItem
->
distinct
==
true
);
distIdx
=
i
;
}
hasDistinct
=
(
pItem
->
distinct
==
true
);
distIdx
=
hasDistinct
?
i
:
-
1
;
}
int32_t
type
=
pItem
->
pNode
->
type
;
if
(
type
==
SQL_NODE_SQLFUNCTION
)
{
hasAgg
=
true
;
hasAgg
=
true
;
if
(
hasDistinct
)
break
;
pItem
->
pNode
->
functionId
=
isValidFunction
(
pItem
->
pNode
->
Expr
.
operand
.
z
,
pItem
->
pNode
->
Expr
.
operand
.
n
);
SUdfInfo
*
pUdfInfo
=
NULL
;
if
(
pItem
->
pNode
->
functionId
<
0
)
{
...
...
@@ -2100,20 +2100,17 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
//TODO(dengyihao), refactor as function
//handle distinct func mixed with other func
if
(
hasDistinct
==
true
)
{
if
(
distIdx
!=
0
)
{
if
(
distIdx
!=
0
||
hasAgg
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg4
);
}
if
(
hasAgg
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg6
);
}
if
(
joinQuery
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
7
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
6
);
}
if
(
pQueryInfo
->
groupbyExpr
.
numOfGroupCols
!=
0
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
8
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
7
);
}
if
(
pQueryInfo
->
pDownstream
!=
NULL
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
9
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg
8
);
}
pQueryInfo
->
distinct
=
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录