Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hz_mem_leak
This commit is contained in:
commit
251a49b478
|
@ -4,9 +4,10 @@ set +e
|
||||||
#set -x
|
#set -x
|
||||||
|
|
||||||
echo "Executing copy_udf.sh"
|
echo "Executing copy_udf.sh"
|
||||||
|
SCRIPT_DIR=`dirname $0`
|
||||||
SCRIPT_DIR=`pwd`
|
|
||||||
cd $SCRIPT_DIR/../
|
cd $SCRIPT_DIR/../
|
||||||
|
SCRIPT_DIR=`pwd`
|
||||||
|
echo "SCRIPT_DIR: ${SCRIPT_DIR}"
|
||||||
|
|
||||||
IN_TDINTERNAL="community"
|
IN_TDINTERNAL="community"
|
||||||
if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
|
if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
|
||||||
|
@ -16,6 +17,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TAOS_DIR=`pwd`
|
TAOS_DIR=`pwd`
|
||||||
|
echo "find udf library in $TAOS_DIR"
|
||||||
UDF1_DIR=`find $TAOS_DIR -name "libudf1.so"|grep lib|head -n1`
|
UDF1_DIR=`find $TAOS_DIR -name "libudf1.so"|grep lib|head -n1`
|
||||||
UDF2_DIR=`find $TAOS_DIR -name "libudf2.so"|grep lib|head -n1`
|
UDF2_DIR=`find $TAOS_DIR -name "libudf2.so"|grep lib|head -n1`
|
||||||
|
|
||||||
|
|
|
@ -65,25 +65,25 @@ if $data00 != 1.414213562 then
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
|
sql insert into t2 values(now+2s, 1, null)(now+3s, null, 2);
|
||||||
#sql select udf1(f1, f2) from t2;
|
sql select udf1(f1, f2) from t2;
|
||||||
#print $rows , $data00 , $data10 , $data20 , $data30
|
print $rows , $data00 , $data10 , $data20 , $data30
|
||||||
#if $rows != 4 then
|
if $rows != 4 then
|
||||||
# return -1
|
return -1
|
||||||
#endi
|
endi
|
||||||
#if $data00 != 88 then
|
if $data00 != 88 then
|
||||||
# return -1
|
return -1
|
||||||
#endi
|
endi
|
||||||
#if $data10 != 88 then
|
if $data10 != 88 then
|
||||||
# return -1
|
return -1
|
||||||
#endi
|
endi
|
||||||
#
|
|
||||||
#if $data20 != NULL then
|
if $data20 != NULL then
|
||||||
# return -1
|
return -1
|
||||||
#endi
|
endi
|
||||||
#
|
|
||||||
#if $data30 != NULL then
|
if $data30 != NULL then
|
||||||
# return -1
|
return -1
|
||||||
#endi
|
endi
|
||||||
|
|
||||||
sql select udf2(f1, f2) from t2;
|
sql select udf2(f1, f2) from t2;
|
||||||
print $rows, $data00
|
print $rows, $data00
|
||||||
|
|
Loading…
Reference in New Issue