Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hz_mem_leak

tests/script/sh/copy_udf.sh

@@ -4,9 +4,10 @@ set +e
 #set -x
 
 echo "Executing copy_udf.sh"
-
-SCRIPT_DIR=`pwd`
+SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+echo "SCRIPT_DIR: ${SCRIPT_DIR}"
 
 IN_TDINTERNAL="community"
 if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
@@ -16,6 +17,7 @@ else
 fi
 
 TAOS_DIR=`pwd`
+echo "find udf library in $TAOS_DIR"
 UDF1_DIR=`find $TAOS_DIR -name "libudf1.so"|grep lib|head -n1`
 UDF2_DIR=`find $TAOS_DIR -name "libudf2.so"|grep lib|head -n1`
 

tests/script/tsim/query/udf.sim

@@ -65,25 +65,25 @@ if $data00 != 1.414213562 then
 endi
 
 sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
-#sql select udf1(f1, f2) from t2;
-#print $rows , $data00 , $data10 , $data20 , $data30
-#if $rows != 4 then
-#  return -1
-#endi
-#if $data00 != 88 then
-#  return -1
-#endi
-#if $data10 != 88 then
-#  return -1
-#endi
-#
-#if $data20 != NULL then
-#  return -1
-#endi
-#
-#if $data30 != NULL then
-#  return -1
-#endi
+sql select udf1(f1, f2) from t2;
+print $rows , $data00 , $data10 , $data20 , $data30
+if $rows != 4 then
+  return -1
+endi
+if $data00 != 88 then
+  return -1
+endi
+if $data10 != 88 then
+  return -1
+endi
+
+if $data20 != NULL then
+  return -1
+endi
+
+if $data30 != NULL then
+  return -1
+endi
 
 sql select udf2(f1, f2) from t2;
 print $rows, $data00