From 65598879caa3e4008e567d46311703cf07f39e47 Mon Sep 17 00:00:00 2001 From: slzhou Date: Tue, 26 Apr 2022 16:36:34 +0800 Subject: [PATCH] pass compilation after merging 3.0 --- source/libs/function/src/tudf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c index cf9dc15aa8..23db9c369f 100644 --- a/source/libs/function/src/tudf.c +++ b/source/libs/function/src/tudf.c @@ -21,6 +21,7 @@ #include "tdatablock.h" #include "querynodes.h" #include "builtinsimpl.h" +#include "functionMgt.h" //TODO: network error processing. //TODO: add unit test @@ -1225,10 +1226,10 @@ typedef struct SUdfAggRes { } SUdfAggRes; bool udfAggGetEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv) { - if (pFunc->udfFuncType == TSDB_FUNC_TYPE_SCALAR) { + if (fmIsScalarFunc(pFunc->funcId)) { return false; } - pEnv->calcMemSize = sizeof(SUdfAggRes) + pFunc->node.resType.bytes + pFunc->bufSize; + pEnv->calcMemSize = sizeof(SUdfAggRes) + pFunc->node.resType.bytes + pFunc->udfBufSize; return true; } @@ -1332,7 +1333,6 @@ int32_t udfAggFinalize(struct SqlFunctionCtx *pCtx, SSDataBlock* pBlock) { GET_RES_INFO(pCtx)->numOfRes = 1; } functionFinalize(pCtx, pBlock); - - + return 0; } \ No newline at end of file -- GitLab