Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
3f31c464
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看板
提交
3f31c464
编写于
7月 13, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(query): add max function scalar version
TD-17344
上级
8b1e5638
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
12 deletion
+27
-12
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
+25
-12
未找到文件。
include/libs/scalar/scalar.h
浏览文件 @
3f31c464
...
@@ -99,6 +99,7 @@ int32_t qTbnameFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pO
...
@@ -99,6 +99,7 @@ int32_t qTbnameFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pO
int32_t
countScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
countScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
sumScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
sumScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
);
int32_t
minScalarFunction
(
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
);
#ifdef __cplusplus
#ifdef __cplusplus
}
}
...
...
source/libs/function/src/builtins.c
浏览文件 @
3f31c464
...
@@ -1933,6 +1933,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
...
@@ -1933,6 +1933,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
.
getEnvFunc
=
getMinmaxFuncEnv
,
.
getEnvFunc
=
getMinmaxFuncEnv
,
.
initFunc
=
minmaxFunctionSetup
,
.
initFunc
=
minmaxFunctionSetup
,
.
processFunc
=
maxFunction
,
.
processFunc
=
maxFunction
,
.
sprocessFunc
=
maxScalarFunction
,
.
finalizeFunc
=
minmaxFunctionFinalize
,
.
finalizeFunc
=
minmaxFunctionFinalize
,
.
combineFunc
=
maxCombine
,
.
combineFunc
=
maxCombine
,
.
pPartialFunc
=
"max"
,
.
pPartialFunc
=
"max"
,
...
...
source/libs/scalar/src/sclfunc.c
浏览文件 @
3f31c464
...
@@ -1789,12 +1789,17 @@ int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1789,12 +1789,17 @@ int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
int32_t
minScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
)
{
static
int32_t
doMinMaxScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
,
bool
isMinFunc
)
{
SColumnInfoData
*
pInputData
=
pInput
->
columnData
;
SColumnInfoData
*
pInputData
=
pInput
->
columnData
;
SColumnInfoData
*
pOutputData
=
pOutput
->
columnData
;
SColumnInfoData
*
pOutputData
=
pOutput
->
columnData
;
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
if
(
isMinFunc
)
{
SET_TYPED_DATA_MAX
(
pOutputData
->
pData
,
type
);
SET_TYPED_DATA_MAX
(
pOutputData
->
pData
,
type
);
}
else
{
SET_TYPED_DATA_MIN
(
pOutputData
->
pData
,
type
);
}
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
...
@@ -1807,7 +1812,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1807,7 +1812,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_TINYINT
:
{
case
TSDB_DATA_TYPE_TINYINT
:
{
int8_t
*
in
=
(
int8_t
*
)
pInputData
->
pData
;
int8_t
*
in
=
(
int8_t
*
)
pInputData
->
pData
;
int8_t
*
out
=
(
int8_t
*
)
pOutputData
->
pData
;
int8_t
*
out
=
(
int8_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1815,7 +1820,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1815,7 +1820,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_SMALLINT
:
{
case
TSDB_DATA_TYPE_SMALLINT
:
{
int16_t
*
in
=
(
int16_t
*
)
pInputData
->
pData
;
int16_t
*
in
=
(
int16_t
*
)
pInputData
->
pData
;
int16_t
*
out
=
(
int16_t
*
)
pOutputData
->
pData
;
int16_t
*
out
=
(
int16_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1823,7 +1828,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1823,7 +1828,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_INT
:
{
case
TSDB_DATA_TYPE_INT
:
{
int32_t
*
in
=
(
int32_t
*
)
pInputData
->
pData
;
int32_t
*
in
=
(
int32_t
*
)
pInputData
->
pData
;
int32_t
*
out
=
(
int32_t
*
)
pOutputData
->
pData
;
int32_t
*
out
=
(
int32_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1831,7 +1836,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1831,7 +1836,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_BIGINT
:
{
case
TSDB_DATA_TYPE_BIGINT
:
{
int64_t
*
in
=
(
int64_t
*
)
pInputData
->
pData
;
int64_t
*
in
=
(
int64_t
*
)
pInputData
->
pData
;
int64_t
*
out
=
(
int64_t
*
)
pOutputData
->
pData
;
int64_t
*
out
=
(
int64_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1839,7 +1844,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1839,7 +1844,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_UTINYINT
:
{
case
TSDB_DATA_TYPE_UTINYINT
:
{
uint8_t
*
in
=
(
uint8_t
*
)
pInputData
->
pData
;
uint8_t
*
in
=
(
uint8_t
*
)
pInputData
->
pData
;
uint8_t
*
out
=
(
uint8_t
*
)
pOutputData
->
pData
;
uint8_t
*
out
=
(
uint8_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1847,7 +1852,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1847,7 +1852,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_USMALLINT
:
{
case
TSDB_DATA_TYPE_USMALLINT
:
{
uint16_t
*
in
=
(
uint16_t
*
)
pInputData
->
pData
;
uint16_t
*
in
=
(
uint16_t
*
)
pInputData
->
pData
;
uint16_t
*
out
=
(
uint16_t
*
)
pOutputData
->
pData
;
uint16_t
*
out
=
(
uint16_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1855,7 +1860,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1855,7 +1860,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_UINT
:
{
case
TSDB_DATA_TYPE_UINT
:
{
uint32_t
*
in
=
(
uint32_t
*
)
pInputData
->
pData
;
uint32_t
*
in
=
(
uint32_t
*
)
pInputData
->
pData
;
uint32_t
*
out
=
(
uint32_t
*
)
pOutputData
->
pData
;
uint32_t
*
out
=
(
uint32_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1863,7 +1868,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1863,7 +1868,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_UBIGINT
:
{
case
TSDB_DATA_TYPE_UBIGINT
:
{
uint64_t
*
in
=
(
uint64_t
*
)
pInputData
->
pData
;
uint64_t
*
in
=
(
uint64_t
*
)
pInputData
->
pData
;
uint64_t
*
out
=
(
uint64_t
*
)
pOutputData
->
pData
;
uint64_t
*
out
=
(
uint64_t
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1871,7 +1876,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1871,7 +1876,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_FLOAT
:
{
case
TSDB_DATA_TYPE_FLOAT
:
{
float
*
in
=
(
float
*
)
pInputData
->
pData
;
float
*
in
=
(
float
*
)
pInputData
->
pData
;
float
*
out
=
(
float
*
)
pOutputData
->
pData
;
float
*
out
=
(
float
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1879,7 +1884,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1879,7 +1884,7 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
case
TSDB_DATA_TYPE_DOUBLE
:
{
case
TSDB_DATA_TYPE_DOUBLE
:
{
double
*
in
=
(
double
*
)
pInputData
->
pData
;
double
*
in
=
(
double
*
)
pInputData
->
pData
;
double
*
out
=
(
double
*
)
pOutputData
->
pData
;
double
*
out
=
(
double
*
)
pOutputData
->
pData
;
if
(
in
[
i
]
<
*
out
)
{
if
(
(
in
[
i
]
>
*
out
)
^
isMinFunc
)
{
*
out
=
in
[
i
];
*
out
=
in
[
i
];
}
}
break
;
break
;
...
@@ -1890,3 +1895,11 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
...
@@ -1890,3 +1895,11 @@ int32_t minScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
pOutput
->
numOfRows
=
pInput
->
numOfRows
;
pOutput
->
numOfRows
=
pInput
->
numOfRows
;
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
int32_t
minScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
)
{
return
doMinMaxScalarFunction
(
pInput
,
inputNum
,
pOutput
,
true
);
}
int32_t
maxScalarFunction
(
SScalarParam
*
pInput
,
int32_t
inputNum
,
SScalarParam
*
pOutput
)
{
return
doMinMaxScalarFunction
(
pInput
,
inputNum
,
pOutput
,
false
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录