Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/row_optimize

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG 23e2b73
+        GIT_TAG e00ebd9
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

packaging/docker/run.sh

@@ -4,7 +4,7 @@ TAOS_RUN_TAOSBENCHMARK_TEST_ONCE=0
 #ADMIN_URL=${ADMIN_URL:-http://172.26.10.84:10001}
 TAOSD_STARTUP_TIMEOUT_SECOND=${TAOSD_STARTUP_TIMEOUT_SECOND:-160}
 TAOS_TIMEOUT_SECOND=${TAOS_TIMEOUT_SECOND:-5}
-BACKUP_CORE_FOLDER=/data/corefile
+BACKUP_CORE_FOLDER=/var/log/corefile
 ALERT_URL=app/system/alert/add
 
 echo "ADMIN_URL: ${ADMIN_URL}"
@@ -37,7 +37,7 @@ function post_error_msg() {
         echo "service_state: ${service_state}"
         echo "`date` service_msg: ${service_msg}"
         echo "${taos_version}"
-        curl -X POST -H "Content-Type: application/json" \
+        curl --connect-timeout 10 --max-time 20 -X POST -H "Content-Type: application/json" \
             -d"{\"appName\":\"${app_name}\",\
             \"alertLevel\":\"${service_state}\",\
             \"taosVersion\":\"${taos_version}\",\
@@ -59,7 +59,8 @@ function check_taosd_exit_type() {
     if [ ! -z "$core_files" ]; then
         # move core files to another folder
         mkdir -p ${BACKUP_CORE_FOLDER}
-        mv ${core_folder}/${core_prefix}* ${BACKUP_CORE_FOLDER}/
+        cp ${core_folder}/${core_prefix}* ${BACKUP_CORE_FOLDER}/
+        rm -f ${core_folder}/${core_prefix}*
         set_service_state "error" "taosd exit with core file"
     else
         set_service_state "error" "taosd exit without core file"
@@ -77,7 +78,7 @@ function post_disk_error_msg() {
         echo "disk_state: ${disk_state}"
         echo "`date` disk_msg: ${disk_msg}"
         echo "${taos_version}"
-        curl -X POST -H "Content-Type: application/json" \
+        curl --connect-timeout 10 --max-time 20 -X POST -H "Content-Type: application/json" \
             -d"{\"appName\":\"${app_name}\",\
             \"alertLevel\":\"${disk_state}\",\
             \"taosVersion\":\"${taos_version}\",\
@@ -200,5 +201,5 @@ do
     if [ $? -ne 0 ]; then
         taosadapter &
     fi
-    sleep 30
+    sleep 10
 done

source/libs/stream/src/streamState.c

@@ -411,6 +411,7 @@ int32_t streamStateGetFirst(SStreamState* pState, SWinKey* key) {
   streamStatePut(pState, &tmp, NULL, 0);
   SStreamStateCur* pCur = streamStateSeekKeyNext(pState, &tmp);
   int32_t          code = streamStateGetKVByCur(pCur, key, NULL, 0);
+  streamStateFreeCur(pCur);
   streamStateDel(pState, &tmp);
   return code;
 }

tests/parallel_test/cases.task

@@ -439,31 +439,31 @@
 ,,,system-test,python3 ./test.py -f 1-insert/database_pre_suf.py
 ,,,system-test,python3 ./test.py -f 1-insert/InsertFuturets.py
 ,,,system-test,python3 ./test.py -f 0-others/show.py
-,,,system-test,./pytest.sh python3 ./test.py -f 2-query/abs.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/abs.py
 ,,,system-test,python3 ./test.py -f 2-query/abs.py -R
-,,,system-test,python3 ./test.py -f 2-query/and_or_for_byte.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/and_or_for_byte.py
 ,,,system-test,python3 ./test.py -f 2-query/and_or_for_byte.py -R
-,,,system-test,./pytest.sh python3 ./test.py -f 2-query/apercentile.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/apercentile.py
 ,,,system-test,python3 ./test.py -f 2-query/apercentile.py -R
-,,,system-test,python3 ./test.py -f 2-query/arccos.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/arccos.py
 ,,,system-test,python3 ./test.py -f 2-query/arccos.py -R
-,,,system-test,python3 ./test.py -f 2-query/arcsin.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/arcsin.py
 ,,,system-test,python3 ./test.py -f 2-query/arcsin.py -R
-,,,system-test,python3 ./test.py -f 2-query/arctan.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/arctan.py
 ,,,system-test,python3 ./test.py -f 2-query/arctan.py -R
 ,,,system-test,python3 ./test.py -f 2-query/avg.py
 ,,,system-test,python3 ./test.py -f 2-query/avg.py -R
-,,,system-test,python3 ./test.py -f 2-query/between.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/between.py
 ,,,system-test,python3 ./test.py -f 2-query/between.py -R
-,,,system-test,python3 ./test.py -f 2-query/bottom.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/bottom.py
 ,,,system-test,python3 ./test.py -f 2-query/bottom.py -R
-,,,system-test,python3 ./test.py -f 2-query/cast.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/cast.py
 ,,,system-test,python3 ./test.py -f 2-query/cast.py -R
-,,,system-test,python3 ./test.py -f 2-query/ceil.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/ceil.py
 ,,,system-test,python3 ./test.py -f 2-query/ceil.py -R
-,,,system-test,python3 ./test.py -f 2-query/char_length.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/char_length.py
 ,,,system-test,python3 ./test.py -f 2-query/char_length.py -R
-,,,system-test,python3 ./test.py -f 2-query/check_tsdb.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/check_tsdb.py
 ,,,system-test,python3 ./test.py -f 2-query/check_tsdb.py -R
 ,,,system-test,python3 ./test.py -f 2-query/concat.py
 ,,,system-test,python3 ./test.py -f 2-query/concat.py -R

tests/script/sh/checkAsan.sh

@@ -21,7 +21,14 @@ LOG_DIR=$TAOS_DIR/sim/asan
 error_num=`cat ${LOG_DIR}/*.asan | grep "ERROR" | wc -l`
 memory_leak=`cat ${LOG_DIR}/*.asan | grep "Direct leak" | wc -l`
 indirect_leak=`cat ${LOG_DIR}/*.asan | grep "Indirect leak" | wc -l`
-runtime_error=`cat ${LOG_DIR}/*.asan | grep "runtime error" | grep -v "trees.c:873" | wc -l`
+
+# ignore
+# /root/TDengine/source/libs/scalar/src/sclfunc.c:735:11: runtime error: 4.75783e+11 is outside the range of representable values of type 'signed char'
+# /root/TDengine/source/libs/scalar/src/sclfunc.c:790:11: runtime error: 3.4e+38 is outside the range of representable values of type 'long int'
+# /root/TDengine/source/libs/scalar/src/sclfunc.c:772:11: runtime error: 3.52344e+09 is outside the range of representable values of type 'int'
+# /root/TDengine/source/libs/scalar/src/sclfunc.c:753:11: runtime error: 4.75783e+11 is outside the range of representable values of type 'short int'
+runtime_error=`cat ${LOG_DIR}/*.asan | grep "runtime error" | grep -v "trees.c:873" | grep -v "sclfunc.c.*outside the range of representable values of type" | wc -l`
+
 python_error=`cat ${LOG_DIR}/*.info | grep -w "stack" | wc -l`
 
 echo -e "\033[44;32;1m"asan error_num: $error_num"\033[0m"