Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
3fc3af0a
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看板
提交
3fc3af0a
编写于
1月 21, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-11222]<feature>: Histogram function
上级
d4915e95
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
74 addition
and
1 deletion
+74
-1
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+74
-1
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
3fc3af0a
...
@@ -2675,6 +2675,10 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
...
@@ -2675,6 +2675,10 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
const
char
*
msg16
=
"elapsed duration should be greater than or equal to database precision"
;
const
char
*
msg16
=
"elapsed duration should be greater than or equal to database precision"
;
const
char
*
msg17
=
"elapsed/twa should not be used in nested query if inner query has group by clause"
;
const
char
*
msg17
=
"elapsed/twa should not be used in nested query if inner query has group by clause"
;
const
char
*
msg18
=
"the second parameter is not an integer"
;
const
char
*
msg18
=
"the second parameter is not an integer"
;
const
char
*
msg19
=
"histogram function requires four parameters"
;
const
char
*
msg20
=
"second parameter must be 'user_input', 'linear_bin' or 'log_bin'"
;
const
char
*
msg21
=
"third parameter must be in JSON format"
;
const
char
*
msg22
=
"invalid parameters for bin_desciption"
;
switch
(
functionId
)
{
switch
(
functionId
)
{
case
TSDB_FUNC_COUNT
:
{
case
TSDB_FUNC_COUNT
:
{
...
@@ -3333,6 +3337,11 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
...
@@ -3333,6 +3337,11 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
}
}
case
TSDB_FUNC_HISTOGRAM
:
{
case
TSDB_FUNC_HISTOGRAM
:
{
// check params
if
(
taosArrayGetSize
(
pItem
->
pNode
->
Expr
.
paramList
)
!=
4
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg19
);
}
tSqlExprItem
*
pParamElem
=
taosArrayGet
(
pItem
->
pNode
->
Expr
.
paramList
,
0
);
tSqlExprItem
*
pParamElem
=
taosArrayGet
(
pItem
->
pNode
->
Expr
.
paramList
,
0
);
if
(
pParamElem
->
pNode
->
tokenId
!=
TK_ID
)
{
if
(
pParamElem
->
pNode
->
tokenId
!=
TK_ID
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
...
@@ -3350,7 +3359,71 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
...
@@ -3350,7 +3359,71 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
pTableMetaInfo
=
tscGetMetaInfo
(
pQueryInfo
,
index
.
tableIndex
);
pTableMetaInfo
=
tscGetMetaInfo
(
pQueryInfo
,
index
.
tableIndex
);
SSchema
*
pSchema
=
tscGetTableColumnSchema
(
pTableMetaInfo
->
pTableMeta
,
index
.
columnIndex
);
SSchema
*
pSchema
=
tscGetTableColumnSchema
(
pTableMetaInfo
->
pTableMeta
,
index
.
columnIndex
);
int32_t
numBins
=
4
;
//bin_type param
if
(
pParamElem
[
1
].
pNode
->
tokenId
==
TK_ID
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
}
tVariant
*
pVariant
=
&
pParamElem
[
1
].
pNode
->
value
;
if
(
pVariant
==
NULL
&&
pVariant
->
nType
!=
TSDB_DATA_TYPE_BINARY
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
}
#define USER_INPUT_BIN 0
#define LINEAR_BIN 1
#define LOG_BIN 2
int8_t
binType
;
if
(
strcasecmp
(
pVariant
->
pz
,
"user_input"
)
==
0
)
{
binType
=
USER_INPUT_BIN
;
}
else
if
(
strcasecmp
(
pVariant
->
pz
,
"linear_bin"
)
==
0
)
{
binType
=
LINEAR_BIN
;
}
else
if
(
strcasecmp
(
pVariant
->
pz
,
"log_bin"
)
==
0
)
{
binType
=
LOG_BIN
;
}
else
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg20
);
}
//bin_description param in JSON format
if
(
pParamElem
[
2
].
pNode
->
tokenId
==
TK_ID
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
}
pVariant
=
&
pParamElem
[
2
].
pNode
->
value
;
if
(
pVariant
==
NULL
&&
pVariant
->
nType
!=
TSDB_DATA_TYPE_BINARY
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg2
);
}
cJSON
*
binDesc
=
cJSON_Parse
(
pVariant
->
pz
);
if
(
cJSON_IsObject
(
binDesc
))
{
// linaer/log bins
int32_t
numOfParams
=
cJSON_GetArraySize
(
binDesc
);
if
(
numOfParams
!=
4
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg22
);
}
cJSON
*
start
=
cJSON_GetObjectItem
(
binDesc
,
"start"
);
cJSON
*
factor
=
cJSON_GetObjectItem
(
binDesc
,
"factor"
);
cJSON
*
width
=
cJSON_GetObjectItem
(
binDesc
,
"width"
);
cJSON
*
count
=
cJSON_GetObjectItem
(
binDesc
,
"count"
);
cJSON
*
infinity
=
cJSON_GetObjectItem
(
binDesc
,
"infinity"
);
if
(
!
cJSON_IsNumber
(
start
)
||
!
cJSON_IsNumber
(
count
)
||
!
cJSON_IsBool
(
infinity
))
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg22
);
}
if
(
cJSON_IsNumber
(
width
)
&&
factor
==
NULL
&&
binType
==
LINEAR_BIN
)
{
}
else
if
(
cJSON_IsNumber
(
factor
)
&&
width
==
NULL
&&
binType
==
LOG_BIN
)
{
}
else
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg22
);
}
}
else
if
(
cJSON_IsArray
(
binDesc
))
{
//user input bins
}
else
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg21
);
}
int32_t
numBins
;
int16_t
resultType
=
pSchema
->
type
;
int16_t
resultType
=
pSchema
->
type
;
int32_t
resultSize
=
pSchema
->
bytes
;
int32_t
resultSize
=
pSchema
->
bytes
;
int32_t
interResult
=
0
;
int32_t
interResult
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录