From 351ac2d81c92571830f6d628b0be81a523883f37 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Tue, 7 Jun 2022 16:54:08 +0800 Subject: [PATCH] fix bugs --- source/libs/function/inc/builtinsimpl.h | 1 + source/libs/function/src/builtins.c | 2 +- source/libs/function/src/builtinsimpl.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/libs/function/inc/builtinsimpl.h b/source/libs/function/inc/builtinsimpl.h index c8adf2c936..cd4fb6f3b8 100644 --- a/source/libs/function/inc/builtinsimpl.h +++ b/source/libs/function/inc/builtinsimpl.h @@ -81,6 +81,7 @@ int32_t getApercentileMaxSize(); bool getApercentileFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv); bool apercentileFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo* pResultInfo); int32_t apercentileFunction(SqlFunctionCtx *pCtx); +int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx); int32_t apercentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock); int32_t apercentilePartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock); diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c index b2d3b7df06..b3ecb48050 100644 --- a/source/libs/function/src/builtins.c +++ b/source/libs/function/src/builtins.c @@ -1244,7 +1244,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = { .translateFunc = translateApercentileMerge, .getEnvFunc = getApercentileFuncEnv, .initFunc = dummyInit, - .processFunc = apercentileFunction, + .processFunc = apercentileFunctionMerge, .finalizeFunc = apercentileFinalize }, { diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index 63ec46c96a..409094bef2 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -2159,7 +2159,7 @@ int32_t apercentilePartialFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) { } } else { if (pInfo->pHisto->numOfElems > 0) { - memcpy(varDataVal(tmp), pInfo->pHisto, resultBytes); + memcpy(varDataVal(tmp), pInfo, resultBytes); varDataSetLen(tmp, resultBytes); } else { return TSDB_CODE_SUCCESS;