From 12f4bc3c90bc08b6e6a05407084be259defd826b Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Tue, 7 Jun 2022 11:45:55 +0800 Subject: [PATCH] refactor --- source/libs/function/inc/builtinsimpl.h | 1 + source/libs/function/src/builtins.c | 6 ------ source/libs/function/src/builtinsimpl.c | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/libs/function/inc/builtinsimpl.h b/source/libs/function/inc/builtinsimpl.h index 34fa5e8417..f3f426347f 100644 --- a/source/libs/function/inc/builtinsimpl.h +++ b/source/libs/function/inc/builtinsimpl.h @@ -74,6 +74,7 @@ bool percentileFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo* pResultI int32_t percentileFunction(SqlFunctionCtx *pCtx); int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock); +int32_t getApercentileMaxSize(); bool getApercentileFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv); bool apercentileFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo* pResultInfo); int32_t apercentileFunction(SqlFunctionCtx *pCtx); diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c index 5f58c7b6e3..828ae631d6 100644 --- a/source/libs/function/src/builtins.c +++ b/source/libs/function/src/builtins.c @@ -1149,8 +1149,6 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = { .finalizeFunc = avgFinalize, .invertFunc = avgInvertFunction, .combineFunc = avgCombine, - .pPartialFunc = "avgPartial", - .pMergeFunc = "avgMerge" }, { .name = "percentile", @@ -1254,8 +1252,6 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = { .processFunc = firstFunction, .finalizeFunc = firstLastFinalize, .combineFunc = firstCombine, - .pPartialFunc = "first", - .pMergeFunc = "first" }, { .name = "last", @@ -1267,8 +1263,6 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = { .processFunc = lastFunction, .finalizeFunc = firstLastFinalize, .combineFunc = lastCombine, - .pPartialFunc = "last", - .pMergeFunc = "last" }, { .name = "twa", diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index 21847f5de1..13d3e94337 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -1953,6 +1953,12 @@ bool getApercentileFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) { return true; } +int32_t getApercentileMaxSize() { + int32_t bytesHist = (int32_t)(sizeof(SAPercentileInfo) + sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1)); + int32_t bytesDigest = (int32_t)(sizeof(SAPercentileInfo) + TDIGEST_SIZE(COMPRESSION)); + return TMAX(bytesHist, bytesDigest); +} + static int8_t getApercentileAlgo(char *algoStr) { int8_t algoType; if (strcasecmp(algoStr, "default") == 0) { -- GitLab