From 4a316eae3f5096b588cb05018651c5adf32b60a8 Mon Sep 17 00:00:00 2001
From: slzhou <slzhou@taosdata.com>
Date: Sat, 14 May 2022 17:03:05 +0800
Subject: [PATCH] Revert "feat: enhance udf scalar function calls"

This reverts commit e8690dabefbe02a5d64615ddf7337f81e1546505.
---
 source/libs/scalar/inc/sclInt.h |  2 --
 source/libs/scalar/src/scalar.c | 56 +++++++++------------------------
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h
index 99e61ad1db..9dbfeceb59 100644
--- a/source/libs/scalar/inc/sclInt.h
+++ b/source/libs/scalar/inc/sclInt.h
@@ -27,13 +27,11 @@ typedef struct SScalarCtx {
   SArray      *pBlockList;  /* element is SSDataBlock* */
   SHashObj    *pRes;  /* element is SScalarParam */
   void        *param;      // additional parameter (meta actually) for acquire value such as tbname/tags values
-  SHashObj    *udf2Handle;
 } SScalarCtx;
 
 
 #define SCL_DATA_TYPE_DUMMY_HASH 9000
 #define SCL_DEFAULT_OP_NUM 10
-#define SCL_DEFAULT_UDF_NUM 8
 
 #define SCL_IS_CONST_NODE(_node) ((NULL == (_node)) || (QUERY_NODE_VALUE == (_node)->type) || (QUERY_NODE_NODE_LIST == (_node)->type))
 #define SCL_IS_CONST_CALC(_ctx) (NULL == (_ctx)->pBlockList)
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index 8f4a9b9698..6c8326b09f 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -154,18 +154,6 @@ void sclFreeRes(SHashObj *res) {
   taosHashCleanup(res);
 }
 
-void sclFreeUdfHandles(SHashObj *udf2handle) {
-  void *pIter = taosHashIterate(udf2handle, NULL);
-  while (pIter) {
-    UdfcFuncHandle *handle = (UdfcFuncHandle *)pIter;
-    if (handle) {
-      teardownUdf(*handle);
-    }
-    pIter = taosHashIterate(udf2handle, pIter);
-  }
-  taosHashCleanup(udf2handle);
-}
-
 void sclFreeParam(SScalarParam *param) {
   if (param->columnData != NULL) {
     colDataDestroy(param->columnData);
@@ -375,28 +363,22 @@ int32_t sclExecFunction(SFunctionNode *node, SScalarCtx *ctx, SScalarParam *outp
 
   if (fmIsUserDefinedFunc(node->funcId)) {
     UdfcFuncHandle udfHandle = NULL;
-    char* udfName = node->functionName;
-    if (ctx->udf2Handle) {
-      UdfcFuncHandle *pHandle = taosHashGet(ctx->udf2Handle, udfName, strlen(udfName));
-      if (pHandle) {
-        udfHandle = *pHandle;
-      }
-    }
-    if (udfHandle == NULL) {
-      code = setupUdf(udfName, &udfHandle);
-      if (code != 0) {
-        sclError("fmExecFunction error. setupUdf. function name: %s, code:%d", udfName, code);
-        goto _return;
-      }
-      if (ctx->udf2Handle) {
-        taosHashPut(ctx->udf2Handle, udfName, strlen(udfName), &udfHandle, sizeof(UdfcFuncHandle));
-      }
+    
+    code = setupUdf(node->functionName, &udfHandle);
+    if (code != 0) {
+      sclError("fmExecFunction error. setupUdf. function name: %s, code:%d", node->functionName, code);
+      goto _return;
     }
     code = callUdfScalarFunc(udfHandle, params, paramNum, output);
     if (code != 0) {
       sclError("fmExecFunction error. callUdfScalarFunc. function name: %s, udf code:%d", node->functionName, code);
       goto _return;
     }
+    code = teardownUdf(udfHandle);
+    if (code != 0) {
+      sclError("fmExecFunction error. callUdfScalarFunc. function name: %s, udf code:%d", node->functionName, code);
+      goto _return;
+    }
   } else {
     SScalarFuncExecFuncs ffpSet = {0};
     code = fmGetScalarFuncExecFuncs(node->funcId, &ffpSet);
@@ -910,20 +892,15 @@ int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes) {
   SScalarCtx ctx = {0};
   ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
-    sclError("taosHashInit result map failed, num:%d", SCL_DEFAULT_OP_NUM);
-    SCL_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
-  }
-  ctx.udf2Handle = taosHashInit(SCL_DEFAULT_UDF_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
-  if (NULL == ctx.udf2Handle) {
-    sclError("taosHashInit udf to handle map failed, num:%d", SCL_DEFAULT_OP_NUM);
+    sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
     SCL_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
   }
+  
   nodesRewriteExprPostOrder(&pNode, sclConstantsRewriter, (void *)&ctx);
   SCL_ERR_JRET(ctx.code);
   *pRes = pNode;
 
 _return:
-  sclFreeUdfHandles(ctx.udf2Handle);
   sclFreeRes(ctx.pRes);
   return code;
 }
@@ -939,14 +916,10 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
   // TODO: OPT performance
   ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
-    sclError("taosHashInit result map failed, num:%d", SCL_DEFAULT_OP_NUM);
-    SCL_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
-  }
-  ctx.udf2Handle = taosHashInit(SCL_DEFAULT_UDF_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
-  if (NULL == ctx.udf2Handle) {
-    sclError("taosHashInit udf to handle map failed, num:%d", SCL_DEFAULT_OP_NUM);
+    sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
     SCL_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
   }
+  
   nodesWalkExprPostOrder(pNode, sclCalcWalker, (void *)&ctx);
   SCL_ERR_JRET(ctx.code);
 
@@ -964,7 +937,6 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
 
 _return:
   //nodesDestroyNode(pNode);
-  sclFreeUdfHandles(ctx.udf2Handle);
   sclFreeRes(ctx.pRes);
   return code;
 }