Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
提交 65598879 编写于 作者: S slzhou
浏览文件
操作

pass compilation after merging 3.0

上级 21a28306
显示空白变更内容
内联 并排
Showing with 4 addition and 4 deletion
source/libs/function/src/tudf.c
浏览文件 @ 65598879
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "tdatablock.h" #include "tdatablock.h"
#include "querynodes.h" #include "querynodes.h"
#include "builtinsimpl.h" #include "builtinsimpl.h"
#include "functionMgt.h"
//TODO: network error processing. //TODO: network error processing.
//TODO: add unit test //TODO: add unit test
...@@ -1225,10 +1226,10 @@ typedef struct SUdfAggRes { ...@@ -1225,10 +1226,10 @@ typedef struct SUdfAggRes {
} SUdfAggRes; } SUdfAggRes;
bool udfAggGetEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv) { bool udfAggGetEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
if (pFunc->udfFuncType == TSDB_FUNC_TYPE_SCALAR) { if (fmIsScalarFunc(pFunc->funcId)) {
return false; return false;
} }
pEnv->calcMemSize = sizeof(SUdfAggRes) + pFunc->node.resType.bytes + pFunc->bufSize; pEnv->calcMemSize = sizeof(SUdfAggRes) + pFunc->node.resType.bytes + pFunc->udfBufSize;
return true; return true;
} }
...@@ -1333,6 +1334,5 @@ int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock* pBlock) { ...@@ -1333,6 +1334,5 @@ int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock* pBlock) {
} }
functionFinalize(pCtx, pBlock); functionFinalize(pCtx, pBlock);
return 0; return 0;
} }
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或