Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b1467364
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22017
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看板
未验证
提交
b1467364
编写于
7月 14, 2022
作者:
G
Ganlin Zhao
提交者:
GitHub
7月 14, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14912 from taosdata/feat/agg_client_api
feat(query): add stddev function scalar version
上级
a2a1decc
256c4aa2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
136 addition
and
6 deletion
+136
-6
include/libs/scalar/scalar.h
include/libs/scalar/scalar.h
+1
-0
source/libs/function/src/builtins.c
source/libs/function/src/builtins.c
+1
-0
source/libs/scalar/src/sclfunc.c
source/libs/scalar/src/sclfunc.c
+134
-6
未找到文件。
include/libs/scalar/scalar.h
浏览文件 @
b1467364
...
...
@@ -101,6 +101,7 @@ int32_t countScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam
int32_t
sumScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
minScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
maxScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
stddevScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
#ifdef __cplusplus
}
...
...
source/libs/function/src/builtins.c
浏览文件 @
b1467364
...
...
@@ -1947,6 +1947,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
.
getEnvFunc
=
getStddevFuncEnv
,
.
initFunc
=
stddevFunctionSetup
,
.
processFunc
=
stddevFunction
,
.
sprocessFunc
=
stddevScalarFunction
,
.
finalizeFunc
=
stddevFinalize
,
.
invertFunc
=
stddevInvertFunction
,
.
combineFunc
=
stddevCombine
,
...
...
source/libs/scalar/src/sclfunc.c
浏览文件 @
b1467364
...
...
@@ -1746,16 +1746,21 @@ int32_t countScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam
SColumnInfoData
*
pOutputData
=
pOutput
->
columnData
;
int64_t
*
out
=
(
int64_t
*
)
pOutputData
->
pData
;
bool
hasNull
=
false
;
*
out
=
0
;
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colDataAppendNULL
(
pOutputData
,
i
)
;
hasNull
=
true
;
break
;
}
(
*
out
)
++
;
}
pOutput
->
numOfRows
=
pInput
->
numOfRows
;
if
(
hasNull
)
{
colDataAppendNULL
(
pOutputData
,
0
);
}
pOutput
->
numOfRows
=
1
;
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -1764,9 +1769,10 @@ int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
SColumnInfoData
*
pOutputData
=
pOutput
->
columnData
;
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
bool
hasNull
=
false
;
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colDataAppendNULL
(
pOutputData
,
i
)
;
hasNull
=
true
;
break
;
}
...
...
@@ -1785,7 +1791,11 @@ int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
}
}
pOutput
->
numOfRows
=
pInput
->
numOfRows
;
if
(
hasNull
)
{
colDataAppendNULL
(
pOutputData
,
0
);
}
pOutput
->
numOfRows
=
1
;
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -1795,6 +1805,7 @@ static int32_t doMinMaxScalarFunction(SScalarParam *pInput, int32_t inputNum, SS
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
bool
hasNull
=
false
;
if
(
isMinFunc
)
{
SET_TYPED_DATA_MAX
(
pOutputData
->
pData
,
type
);
}
else
{
...
...
@@ -1803,7 +1814,7 @@ static int32_t doMinMaxScalarFunction(SScalarParam *pInput, int32_t inputNum, SS
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
colDataAppendNULL
(
pOutputData
,
i
)
;
hasNull
=
true
;
break
;
}
...
...
@@ -1892,7 +1903,11 @@ static int32_t doMinMaxScalarFunction(SScalarParam *pInput, int32_t inputNum, SS
}
}
pOutput
->
numOfRows
=
pInput
->
numOfRows
;
if
(
hasNull
)
{
colDataAppendNULL
(
pOutputData
,
0
);
}
pOutput
->
numOfRows
=
1
;
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -1903,3 +1918,116 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
int32_t
maxScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
)
{
return
doMinMaxScalarFunction
(
pInput
,
inputNum
,
pOutput
,
false
);
}
int32_t
stddevScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
)
{
SColumnInfoData
*
pInputData
=
pInput
->
columnData
;
SColumnInfoData
*
pOutputData
=
pOutput
->
columnData
;
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
//int64_t count = 0, sum = 0, qSum = 0;
bool
hasNull
=
false
;
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
hasNull
=
true
;
break
;
}
#if 0
switch(type) {
case TSDB_DATA_TYPE_TINYINT: {
int8_t *in = (int8_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_SMALLINT: {
int16_t *in = (int16_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_INT: {
int32_t *in = (int32_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_BIGINT: {
int64_t *in = (int64_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_UTINYINT: {
uint8_t *in = (uint8_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_USMALLINT: {
uint16_t *in = (uint16_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_UINT: {
uint32_t *in = (uint32_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_UBIGINT: {
uint64_t *in = (uint64_t *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_FLOAT: {
float *in = (float *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
case TSDB_DATA_TYPE_DOUBLE: {
double *in = (double *)pInputData->pData;
sum += in[i];
qSum += in[i] * in[i];
count++;
break;
}
}
#endif
}
double
*
out
=
(
double
*
)
pOutputData
->
pData
;
if
(
hasNull
)
{
colDataAppendNULL
(
pOutputData
,
0
);
}
else
{
*
out
=
0
;
#if 0
double avg = 0;
if (IS_SIGNED_NUMERIC_TYPE(type)) {
avg = (int64_t)sum / (double)count;
*out = sqrt(fabs((int64_t)qSum / ((double)count) - avg * avg));
} else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
avg = (uint64_t)sum / (double)count;
*out = sqrt(fabs((uint64_t)qSum / ((double)count) - avg * avg));
} else if (IS_FLOAT_TYPE(type)) {
avg = (double)sum / (double)count;
*out = sqrt(fabs((double)qSum / ((double)count) - avg * avg));
}
#endif
}
pOutput
->
numOfRows
=
1
;
return
TSDB_CODE_SUCCESS
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录