diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c
index f67b352cc0..4b404b912c 100644
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
@@ -241,7 +241,7 @@ typedef struct SUvUdfWork {
   struct SUvUdfWork *pWorkNext;
 } SUvUdfWork;
 
-typedef enum { UDF_STATE_INIT = 0, UDF_STATE_LOADING, UDF_STATE_READY} EUdfState;
+typedef enum { UDF_STATE_INIT = 0, UDF_STATE_LOADING, UDF_STATE_READY } EUdfState;
 
 typedef struct SUdf {
   char name[TSDB_FUNC_NAME_LEN + 1];
@@ -439,7 +439,7 @@ int32_t udfdInitScriptPlugin(int8_t scriptType) {
         return err;
       }
       break;
-      }
+    }
     default:
       fnError("udf script type %d not supported", scriptType);
       taosMemoryFree(plugin);
@@ -509,15 +509,15 @@ int32_t udfdRenameUdfFile(SUdf *udf) {
   char newPath[PATH_MAX];
   if (udf->scriptType == TSDB_FUNC_SCRIPT_BIN_LIB) {
     snprintf(newPath, PATH_MAX, "%s/lib%s.so", tsTempDir, udf->name);
-    taosRenameFile(udf->path, newPath);
-    sprintf(udf->path, "%s", newPath);
   } else if (udf->scriptType == TSDB_FUNC_SCRIPT_PYTHON) {
     snprintf(newPath, PATH_MAX, "%s/%s.py", tsTempDir, udf->name);
-    taosRenameFile(udf->path, newPath);
-    sprintf(udf->path, "%s", newPath);
   } else {
     return TSDB_CODE_UDF_SCRIPT_NOT_SUPPORTED;
   }
+  int32_t code = taosRenameFile(udf->path, newPath);
+  if (code == 0) {
+    sprintf(udf->path, "%s", newPath);
+  }
   return 0;
 }
 
@@ -1358,7 +1358,7 @@ int32_t udfdDeinitResidentFuncs() {
     char  *funcName = taosArrayGet(global.residentFuncs, i);
     SUdf **udfInHash = taosHashGet(global.udfsHash, funcName, strlen(funcName));
     if (udfInHash) {
-      SUdf *udf = *udfInHash;
+      SUdf   *udf = *udfInHash;
       int32_t code = udf->scriptPlugin->udfDestroyFunc(udf->scriptUdfCtx);
       fnDebug("udfd destroy function returns %d", code);
       taosHashRemove(global.udfsHash, funcName, strlen(funcName));
diff --git a/tests/script/sh/bit_and.c b/tests/script/sh/bit_and.c
index 2f2e48fdb0..f3bf71ce94 100644
--- a/tests/script/sh/bit_and.c
+++ b/tests/script/sh/bit_and.c
@@ -1,61 +1,47 @@
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "taosudf.h"
 
+DLL_EXPORT int32_t bit_and_init() { return 0; }
 
-DLL_EXPORT int32_t bit_and_init() {
-    return 0;
-}
+DLL_EXPORT int32_t bit_and_destroy() { return 0; }
 
-DLL_EXPORT int32_t bit_and_destroy() {
-    return 0;
-}
+DLL_EXPORT int32_t bit_and(SUdfDataBlock* block, SUdfColumn* resultCol) {
+  if (block->numOfCols < 2) {
+    return TSDB_CODE_UDF_INVALID_INPUT;
+  }
 
-DLL_EXPORT int32_t bit_and(SUdfDataBlock* block, SUdfColumn *resultCol) {
-
-    if (block->numOfCols < 2) {
-        return TSDB_CODE_UDF_INVALID_INPUT;
+  for (int32_t i = 0; i < block->numOfCols; ++i) {
+    SUdfColumn* col = block->udfCols[i];
+    if (!(col->colMeta.type == TSDB_DATA_TYPE_INT)) {
+      return TSDB_CODE_UDF_INVALID_INPUT;
     }
+  }
 
-    for (int32_t i = 0; i < block->numOfCols; ++i) {
-        SUdfColumn* col = block->udfCols[i];
-        if (!(col->colMeta.type == TSDB_DATA_TYPE_INT)) {
-            return TSDB_CODE_UDF_INVALID_INPUT;
-        }
+  SUdfColumnData* resultData = &resultCol->colData;
+
+  for (int32_t i = 0; i < block->numOfRows; ++i) {
+    if (udfColDataIsNull(block->udfCols[0], i)) {
+      udfColDataSetNull(resultCol, i);
+      continue;
     }
+    int32_t result = *(int32_t*)udfColDataGetData(block->udfCols[0], i);
+    int     j = 1;
+    for (; j < block->numOfCols; ++j) {
+      if (udfColDataIsNull(block->udfCols[j], i)) {
+        udfColDataSetNull(resultCol, i);
+        break;
+      }
 
-    SUdfColumnMeta *meta = &resultCol->colMeta;
-    meta->bytes = 4;
-    meta->type = TSDB_DATA_TYPE_INT;
-    meta->scale = 0;
-    meta->precision = 0;
-
-
-    SUdfColumnData *resultData = &resultCol->colData;
-
-    resultData->numOfRows = block->numOfRows;
-
-    for (int32_t i = 0; i < resultData->numOfRows; ++i) {
-        if (udfColDataIsNull(block->udfCols[0], i)) {
-            udfColDataSetNull(resultCol, i);
-            continue;
-        }
-        int32_t result = *(int32_t*)udfColDataGetData(block->udfCols[0], i);
-        int j = 1;
-        for (; j < block->numOfCols; ++j) {
-            if (udfColDataIsNull(block->udfCols[j], i)) {
-                udfColDataSetNull(resultCol, i);
-                break;
-            }
-
-            char* colData = udfColDataGetData(block->udfCols[j], i);
-            result &= *(int32_t*)colData;
-        }
-        if (j == block->numOfCols) {
-            udfColDataSet(resultCol, i, (char*)&result, false);
-        }
-
+      char* colData = udfColDataGetData(block->udfCols[j], i);
+      result &= *(int32_t*)colData;
     }
-    return TSDB_CODE_SUCCESS;
+    if (j == block->numOfCols) {
+      udfColDataSet(resultCol, i, (char*)&result, false);
+    }
+  }
+  resultData->numOfRows = block->numOfRows;
+
+  return TSDB_CODE_SUCCESS;
 }