From a39ada58a5ce5a043d3652d409f4714f10f87220 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Thu, 9 Mar 2023 12:13:59 +0800
Subject: [PATCH] fix: handle function of udf not implemented

---
 source/libs/function/src/tudf.c |  2 +-
 source/libs/function/src/udfd.c | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c
index 90baabce2c..fdc3f027f5 100644
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
@@ -1705,7 +1705,7 @@ int32_t doSetupUdf(char udfName[], UdfcFuncHandle *funcHandle) {
   if (task->errCode != 0) {
     fnError("failed to setup udf. udfname: %s, err: %d", udfName, task->errCode)
   } else {
-    fnInfo("sucessfully setup udf func handle. udfName: %s, handle: %p", udfName, task->session);
+    fnInfo("successfully setup udf func handle. udfName: %s, handle: %p", udfName, task->session);
     *funcHandle = task->session;
   }
   int32_t err = task->errCode;
diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c
index 5f35173920..bccc0d9bb7 100644
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
@@ -236,7 +236,7 @@ typedef struct SUvUdfWork {
   struct SUvUdfWork *pWorkNext;
 } SUvUdfWork;
 
-typedef enum { UDF_STATE_INIT = 0, UDF_STATE_LOADING, UDF_STATE_READY, UDF_STATE_UNLOADING } EUdfState;
+typedef enum { UDF_STATE_INIT = 0, UDF_STATE_LOADING, UDF_STATE_READY} EUdfState;
 
 typedef struct SUdf {
   char name[TSDB_FUNC_NAME_LEN + 1];
@@ -570,6 +570,14 @@ SUdf *udfdGetOrCreateUdf(const char *udfName) {
     uv_cond_init(&udfNew->condReady);
 
     udf = udfNew;
+    udf->resident = false;
+    for (int32_t i = 0; i < taosArrayGetSize(global.residentFuncs); ++i) {
+      char *funcName = taosArrayGet(global.residentFuncs, i);
+      if (strcmp(udfName, funcName) == 0) {
+        udf->resident = true;
+        break;
+      }
+    }
     SUdf **pUdf = &udf;
     taosHashPut(global.udfsHash, udfName, strlen(udfName), pUdf, POINTER_BYTES);
     uv_mutex_unlock(&global.udfsMutex);
@@ -591,20 +599,15 @@ void udfdProcessSetupRequest(SUvUdfWork *uvUdf, SUdfRequest *request) {
   if (udf->state == UDF_STATE_INIT) {
     udf->state = UDF_STATE_LOADING;
     code = udfdInitUdf(setup->udfName, udf);
-
-    udf->resident = false;
-    for (int32_t i = 0; i < taosArrayGetSize(global.residentFuncs); ++i) {
-      char *funcName = taosArrayGet(global.residentFuncs, i);
-      if (strcmp(setup->udfName, funcName) == 0) {
-        udf->resident = true;
-        break;
-      }
+    if (code == 0) {
+      udf->state = UDF_STATE_READY;
+    } else {
+      udf->state = UDF_STATE_INIT;
     }
-    udf->state = UDF_STATE_READY;
     uv_cond_broadcast(&udf->condReady);
     uv_mutex_unlock(&udf->lock);
   } else {
-    while (udf->state != UDF_STATE_READY) {
+    while (udf->state == UDF_STATE_LOADING) {
       uv_cond_wait(&udf->condReady, &udf->lock);
     }
     uv_mutex_unlock(&udf->lock);