From 84765ff670338b2f51031deeb0630a86cac2d163 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 22 Feb 2023 10:47:49 +0800
Subject: [PATCH] refactor code

---
 source/libs/function/src/builtins.c     |  4 +--
 source/libs/function/src/builtinsimpl.c | 43 ++++++++++++-------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 8902bd72cf..ea639cb425 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -517,14 +517,14 @@ static int32_t translatePercentile(SFunctionNode* pFunc, char* pErrBuf, int32_t
       return invaildFuncParaValueErrMsg(pErrBuf, len, pFunc->functionName);
     }
     uint8_t paraType = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, i))->resType.type;
-    if (!IS_SIGNED_NUMERIC_TYPE(paraType) && !IS_UNSIGNED_NUMERIC_TYPE(paraType)) {
+    if (!IS_NUMERIC_TYPE(paraType)) {
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }
   }
 
   // set result type
   if (numOfParams > 2) {
-    pFunc->node.resType = (SDataType){.bytes = 128, .type = TSDB_DATA_TYPE_VARCHAR};
+    pFunc->node.resType = (SDataType){.bytes = 512, .type = TSDB_DATA_TYPE_VARCHAR};
   } else {
     pFunc->node.resType = (SDataType){.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes, .type = TSDB_DATA_TYPE_DOUBLE};
   }
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 68b2987518..6df657f743 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -1661,63 +1661,62 @@ int32_t percentileFunction(SqlFunctionCtx* pCtx) {
 }
 
 int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
-  if (pCtx->numOfParams > 2) {
+  SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
+  SPercentileInfo*     ppInfo = (SPercentileInfo*)GET_ROWCELL_INTERBUF(pResInfo);
 
-    SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
-    SPercentileInfo*     ppInfo = (SPercentileInfo*)GET_ROWCELL_INTERBUF(pResInfo);
+  int32_t code = 0;
+  double     v = 0;
 
-    tMemBucket* pMemBucket = ppInfo->pMemBucket;
-    if (pMemBucket == NULL || pMemBucket->total == 0) {  // check for null
-      return TSDB_CODE_FAILED;
-    }
+  tMemBucket* pMemBucket = ppInfo->pMemBucket;
+  if (pMemBucket == NULL || pMemBucket->total == 0) {  // check for null
+    code = TSDB_CODE_FAILED;
+    goto _fin_error;
+  }
 
+  if (pCtx->numOfParams > 2) {
     char   buf[512] = {0};
     size_t len = 0;
 
     for (int32_t i = 1; i < pCtx->numOfParams; ++i) {
       SVariant* pVal = &pCtx->param[i].param;
-      double    v = 0;
 
       GET_TYPED_DATA(v, double, pVal->nType, &pVal->i);
 
       int32_t code = getPercentile(pMemBucket, v, &ppInfo->result);
       if (code != TSDB_CODE_SUCCESS) {
-        return code;
+        goto _fin_error;
       }
 
       len += snprintf(varDataVal(buf) + len, sizeof(buf) - VARSTR_HEADER_SIZE - len, "%.6lf; ", ppInfo->result);
     }
-    tMemBucketDestroy(pMemBucket);
 
     int32_t          slotId = pCtx->pExpr->base.resSchema.slotId;
-    SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, slotId);
+    SColumnInfoData* pCol   = taosArrayGet(pBlock->pDataBlock, slotId);
 
     varDataSetLen(buf, len);
     colDataAppend(pCol, pBlock->info.rows, buf, false);
 
+    tMemBucketDestroy(pMemBucket);
     return pResInfo->numOfRes;
   } else {
     SVariant* pVal = &pCtx->param[1].param;
-    int32_t code = 0;
-    double    v = 0;
 
     GET_TYPED_DATA(v, double, pVal->nType, &pVal->i);
 
-    SResultRowEntryInfo* pResInfo = GET_RES_INFO(pCtx);
-    SPercentileInfo*     ppInfo = (SPercentileInfo*)GET_ROWCELL_INTERBUF(pResInfo);
-
-    tMemBucket* pMemBucket = ppInfo->pMemBucket;
-    if (pMemBucket != NULL && pMemBucket->total > 0) {  // check for null
-      code = getPercentile(pMemBucket, v, &ppInfo->result);
+    code = getPercentile(pMemBucket, v, &ppInfo->result);
+    if (code != TSDB_CODE_SUCCESS) {
+      goto _fin_error;
     }
 
     tMemBucketDestroy(pMemBucket);
-    if (code != TSDB_CODE_SUCCESS) {
-      return code;
-    }
     return functionFinalize(pCtx, pBlock);
   }
 
+_fin_error:
+
+  tMemBucketDestroy(pMemBucket);
+  return code;
+
 }
 
 bool getApercentileFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
-- 
GitLab