Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
0cd76a53
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看板
提交
0cd76a53
编写于
2月 07, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-11222]<feature>(query): Histogram function
上级
bb7ce4e0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+2
-2
src/query/src/qAggMain.c
src/query/src/qAggMain.c
+4
-4
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
0cd76a53
...
@@ -2681,7 +2681,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
...
@@ -2681,7 +2681,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
const
char
*
msg22
=
"invalid parameters for bin_desciption"
;
const
char
*
msg22
=
"invalid parameters for bin_desciption"
;
const
char
*
msg23
=
"parameter/bin out of range [-DBL_MAX, DBL_MAX]"
;
const
char
*
msg23
=
"parameter/bin out of range [-DBL_MAX, DBL_MAX]"
;
const
char
*
msg24
=
"width param cannot be 0"
;
const
char
*
msg24
=
"width param cannot be 0"
;
const
char
*
msg25
=
"count param should be
greater than 0
"
;
const
char
*
msg25
=
"count param should be
in range [1, 1000]
"
;
const
char
*
msg26
=
"start param cannot be 0 with 'log_bin'"
;
const
char
*
msg26
=
"start param cannot be 0 with 'log_bin'"
;
const
char
*
msg27
=
"factor param cannot be negative or equal to 0/1"
;
const
char
*
msg27
=
"factor param cannot be negative or equal to 0/1"
;
const
char
*
msg28
=
"the second paramter of diff should be 0 or 1"
;
const
char
*
msg28
=
"the second paramter of diff should be 0 or 1"
;
...
@@ -3443,7 +3443,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
...
@@ -3443,7 +3443,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg22
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg22
);
}
}
if
(
count
->
valueint
<=
0
)
{
if
(
count
->
valueint
<=
0
||
count
->
valueint
>
1000
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg25
);
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg25
);
}
}
...
...
src/query/src/qAggMain.c
浏览文件 @
0cd76a53
...
@@ -392,8 +392,8 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
...
@@ -392,8 +392,8 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
else
if
(
functionId
==
TSDB_FUNC_HISTOGRAM
)
{
}
else
if
(
functionId
==
TSDB_FUNC_HISTOGRAM
)
{
*
type
=
TSDB_DATA_TYPE_BINARY
;
*
type
=
TSDB_DATA_TYPE_BINARY
;
*
bytes
=
(
sizeof
(
SHistogramFuncInfo
)
+
param
*
sizeof
(
SHistogramFuncBin
))
;
*
bytes
=
512
;
*
interBytes
=
*
bytes
;
*
interBytes
=
(
sizeof
(
SHistogramFuncInfo
)
+
param
*
sizeof
(
SHistogramFuncBin
))
;
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
}
}
...
@@ -501,8 +501,8 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
...
@@ -501,8 +501,8 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
*
interBytes
=
sizeof
(
SElapsedInfo
);
*
interBytes
=
sizeof
(
SElapsedInfo
);
}
else
if
(
functionId
==
TSDB_FUNC_HISTOGRAM
)
{
}
else
if
(
functionId
==
TSDB_FUNC_HISTOGRAM
)
{
*
type
=
TSDB_DATA_TYPE_BINARY
;
*
type
=
TSDB_DATA_TYPE_BINARY
;
*
bytes
=
1024
;
*
bytes
=
512
;
*
interBytes
=
*
bytes
;
*
interBytes
=
(
sizeof
(
SHistogramFuncInfo
)
+
param
*
sizeof
(
SHistogramFuncBin
))
;
}
else
{
}
else
{
return
TSDB_CODE_TSC_INVALID_OPERATION
;
return
TSDB_CODE_TSC_INVALID_OPERATION
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录