merge with master branch

Jenkinsfile

 import hudson.model.Result
+import hudson.model.*;
 import jenkins.model.CauseOfInterruption
 properties([pipelineTriggers([githubPush()])])
 node {
@@ -6,6 +7,7 @@ node {
 }
 
 def skipbuild=0
+def win_stop=0
 
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
@@ -110,7 +112,83 @@ def pre_test(){
     '''
     return 1
 }
+def pre_test_win(){
+    bat '''
+    cd C:\\
+    rd /s /Q C:\\TDengine
+    cd C:\\workspace\\TDinternal
+    rd /s /Q C:\\workspace\\TDinternal\\debug
+    cd C:\\workspace\\TDinternal\\community
+    git reset --hard HEAD~10 
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        bat '''
+        cd C:\\workspace\\TDinternal\\community
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        bat '''
+        cd C:\\workspace\\TDinternal\\community
+        git checkout 2.0
+        '''
+      } 
+      else{
+        bat '''
+        cd C:\\workspace\\TDinternal\\community
+        git checkout develop
+        '''
+      }
+    }
+    bat'''
+    cd C:\\workspace\\TDinternal\\community
+    git pull 
+    git fetch origin +refs/pull/%CHANGE_ID%/merge
+    git checkout -qf FETCH_HEAD
+    git clean -dfx
+    cd C:\\workspace\\TDinternal
+    git reset --hard HEAD~10
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        bat '''
+        cd C:\\workspace\\TDinternal
+        git checkout master
+        '''
+        }
+      else if(env.CHANGE_TARGET == '2.0'){
+        bat '''
+        cd C:\\workspace\\TDinternal
+        git checkout 2.0
+        '''
+      } 
+      else{
+        bat '''
+        cd C:\\workspace\\TDinternal
+        git checkout develop
+        '''
+      } 
+    }
+    bat '''
+    cd C:\\workspace\\TDinternal
+    git pull 
 
+    date
+    git clean -dfx
+    mkdir debug
+    cd debug
+    call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
+    cmake ../ -G "NMake Makefiles" 
+    nmake
+    nmake install 
+    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
+    cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
+    python -m pip install .
+    
+    '''
+    return 1
+}
 pipeline {
   agent none
   environment{
@@ -236,9 +314,9 @@ pipeline {
               node nodejsChecker.js host=localhost
               '''
               sh '''
-                cd ${WKC}/tests/examples/C#/taosdemo
-                mcs -out:taosdemo *.cs > /dev/null 2>&1
-                echo '' |./taosdemo -c /etc/taos
+              cd ${WKC}/tests/examples/C#/taosdemo
+              mcs -out:taosdemo *.cs > /dev/null 2>&1
+              ./taosdemo -c /etc/taos -y
               '''
               sh '''
                 cd ${WKC}/tests/gotest
@@ -369,7 +447,37 @@ pipeline {
               date'''              
             }
           }
-        }        
+        } 
+        
+        stage('build'){
+          agent{label " wintest "}
+          steps {
+            pre_test()
+            script{             
+                while(win_stop == 0){
+                  sleep(1)
+                  }
+              }
+            }
+        }
+        stage('test'){
+          agent{label "win"}
+          steps{
+            
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                pre_test_win()
+                bat'''
+                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+                .\\test-all.bat Wintest
+                '''
+            }     
+            script{
+              win_stop=1
+            }
+          }
+        }
+          
+               
     }
   }
   }
@@ -451,4 +559,4 @@ pipeline {
             )
         }
     } 
-}
+}
\ No newline at end of file

cmake/install.inc

@@ -6,6 +6,8 @@ IF (TD_LINUX)
 ELSEIF (TD_WINDOWS)
   IF (TD_POWER)
     SET(CMAKE_INSTALL_PREFIX C:/PowerDB)
+  ELSEIF (TD_PRO)
+    SET(CMAKE_INSTALL_PREFIX C:/ProDB)
   ELSE ()
     SET(CMAKE_INSTALL_PREFIX C:/TDengine)
   ENDIF ()
@@ -24,6 +26,8 @@ ELSEIF (TD_WINDOWS)
 
   IF (TD_POWER)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
+  ELSEIF (TD_PRO)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/prodbc.exe DESTINATION .)
   ELSE ()
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)
     INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.2.0.2")
+  SET(TD_VER_NUMBER "2.2.0.5")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

packaging/tools/make_install.sh

@@ -45,8 +45,10 @@ else
     inc_link_dir="/usr/local/include"
 
     install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
-
+    install_main_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}"
+        
     bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
+    bin_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}/bin"
 fi
 
 service_config_dir="/etc/systemd/system"
@@ -121,16 +123,25 @@ function kill_taosd() {
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
     if [ "$osType" != "Darwin" ]; then
+        ${csudo} rm -rf ${install_main_dir}    || :
+        ${csudo} mkdir -p ${install_main_dir}
+        ${csudo} mkdir -p ${install_main_dir}/cfg
+        ${csudo} mkdir -p ${install_main_dir}/bin
+        ${csudo} mkdir -p ${install_main_dir}/connector
+        ${csudo} mkdir -p ${install_main_dir}/driver
+        ${csudo} mkdir -p ${install_main_dir}/examples
+        ${csudo} mkdir -p ${install_main_dir}/include
         ${csudo} mkdir -p ${install_main_dir}/init.d
+    else
+        ${csudo} rm -rf ${install_main_dir}             || ${csudo} rm -rf ${install_main_2_dir}             || :
+        ${csudo} mkdir -p ${install_main_dir}           || ${csudo} mkdir -p ${install_main_2_dir}
+        ${csudo} mkdir -p ${install_main_dir}/cfg       || ${csudo} mkdir -p ${install_main_2_dir}/cfg
+        ${csudo} mkdir -p ${install_main_dir}/bin       || ${csudo} mkdir -p ${install_main_2_dir}/bin
+        ${csudo} mkdir -p ${install_main_dir}/connector || ${csudo} mkdir -p ${install_main_2_dir}/connector
+        ${csudo} mkdir -p ${install_main_dir}/driver    || ${csudo} mkdir -p ${install_main_2_dir}/driver
+        ${csudo} mkdir -p ${install_main_dir}/examples  || ${csudo} mkdir -p ${install_main_2_dir}/examples
+        ${csudo} mkdir -p ${install_main_dir}/include   || ${csudo} mkdir -p ${install_main_2_dir}/include
     fi
 }
 
@@ -145,33 +156,34 @@ function install_bin() {
         ${csudo} rm -f ${bin_link_dir}/perfMonitor || :
         ${csudo} rm -f ${bin_link_dir}/set_core || :
         ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
-    fi
-    
-    ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin
-    ${csudo} cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin
-
-    if [ "$osType" != "Darwin" ]; then
+        
+        ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin
+        ${csudo} cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin
+        
         ${csudo} cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/startPre.sh   ${install_main_dir}/bin
-    else
-        ${csudo} cp -r ${script_dir}/remove_client.sh   ${install_main_dir}/bin
-    fi
-    ${csudo} chmod 0555 ${install_main_dir}/bin/*
-
-    #Make link
-    [ -x ${install_main_dir}/bin/taos ]      && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos    || :
-    [ -x ${install_main_dir}/bin/taosd ]     && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd   || :
-    [ -x ${install_main_dir}/bin/taosdump ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
-    [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
-
-    if [ "$osType" != "Darwin" ]; then
+        
+        ${csudo} chmod 0555 ${install_main_dir}/bin/*
+        #Make link
+        [ -x ${install_main_dir}/bin/taos ]      && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos    || :
+        [ -x ${install_main_dir}/bin/taosd ]     && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd   || :
+        [ -x ${install_main_dir}/bin/taosdump ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
+        [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
         [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo} ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
         [ -x ${install_main_dir}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-    fi
+        [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
+   else
     
-    if [ "$osType" != "Darwin" ]; then
-       [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
+        ${csudo} cp -r ${binary_dir}/build/bin/*   ${install_main_dir}/bin || ${csudo} cp -r ${binary_dir}/build/bin/*   ${install_main_2_dir}/bin  || :
+        ${csudo} cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin || ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_2_dir}  || :
+        ${csudo} cp -r ${script_dir}/remove_client.sh   ${install_main_dir}/bin || ${csudo} cp -r ${script_dir}/remove_client.sh   ${install_main_2_dir}/bin
+        ${csudo} chmod 0555 ${install_main_dir}/bin/* || ${csudo} chmod 0555 ${install_main_2_dir}/bin/*
+        #Make link
+        [ -x ${install_main_dir}/bin/taos ] || [ -x ${install_main_2_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || ${csudo} ln -s ${install_main_2_dir}/bin/taos  || :
+        [ -x ${install_main_dir}/bin/taosd ] || [ -x ${install_main_2_dir}/bin/taosd ] &&  ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd || ${csudo} ln -s ${install_main_2_dir}/bin/taosd || :
+        [ -x ${install_main_dir}/bin/taosdump ] || [ -x ${install_main_2_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || ln -s ${install_main_2_dir}/bin/taosdump ${bin_link_dir}/taosdump   || :
+        [ -x ${install_main_dir}/bin/taosdemo ] || [ -x ${install_main_2_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || ln -s ${install_main_2_dir}/bin/taosdemo ${bin_link_dir}/taosdemo   || :
     fi
 }
 
@@ -243,10 +255,11 @@ function install_lib() {
           ${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
         fi
     else
-        ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
-
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_dir}/driver || ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_2_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* || ${csudo} chmod 777 ${install_main_2_dir}/driver/*
+  
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${install_main_dir}/driver/libtaos.dylib || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.* ${install_main_2_dir}/driver/libtaos.dylib   || :
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.${verNumber}.dylib ${lib_link_dir}/libtaos.1.dylib   || :
+        ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib   || :
     fi
     
     install_jemalloc
@@ -259,12 +272,12 @@ function install_lib() {
 function install_header() {
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    fi
-    ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    if [ "$osType" != "Darwin" ]; then
+        ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h     || :
+        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
         ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
         ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    else
+        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include || ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_2_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/* || ${csudo} chmod 644 ${install_main_2_dir}/include/*
     fi
 }
 
@@ -276,23 +289,30 @@ function install_config() {
         [ -f ${script_dir}/../cfg/taos.cfg ] &&
         ${csudo} cp ${script_dir}/../cfg/taos.cfg ${cfg_install_dir}
         ${csudo} chmod 644 ${cfg_install_dir}/*
-    fi
-
-    ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    
-    if [ "$osType" != "Darwin" ]; then ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+        ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+        ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    else
+        ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org || ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_2_dir}/cfg/taos.cfg.org
     fi
 }
 
 function install_log() {
     ${csudo} rm -rf ${log_dir}  || :
     ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    else
+        ${csudo} ln -s ${log_dir} ${install_main_dir}/log || ${csudo} ln -s ${log_dir} ${install_main_2_dir}/log
+    fi
 }
 
 function install_data() {
     ${csudo} mkdir -p ${data_dir}
-    ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+    else
+        ${csudo} ln -s ${data_dir} ${install_main_dir}/data || ${csudo} ln -s ${data_dir} ${install_main_2_dir}/data
+    fi
 }
 
 function install_connector() {
@@ -306,12 +326,21 @@ function install_connector() {
     else
         echo "WARNING: go connector not found, please check if want to use it!"
     fi
-    ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
-    ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
+        ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar  || echo &> /dev/null
+    else
+        ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector || ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_2_dir}/connector}
+        ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null || cp ${binary_dir}/build/lib/*.jar ${install_main_2_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || ${csudo} chmod 777 ${install_main_2_dir}/connector/*.jar || echo &> /dev/null
+    fi
 }
 
 function install_examples() {
-    ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples
+    if [ "$osType" != "Darwin" ]; then
+       ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples
+    else
+       ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples || ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_2_dir}/examples
+    fi
 }
 
 function clean_service_on_sysvinit() {
@@ -530,8 +559,16 @@ function install_TDengine() {
 ## ==============================Main program starts from here============================
 echo source directory: $1
 echo binary directory: $2
-if [ -x ${bin_dir}/taos ]; then
-    update_TDengine
+if [ "$osType" != "Darwin" ]; then
+    if [ -x ${bin_dir}/taos ]; then
+        update_TDengine
+    else
+        install_TDengine
+    fi
 else
-    install_TDengine
+    if [ -x ${bin_dir}/taos ] || [ -x ${bin_2_dir}/taos ]; then
+        update_TDengine
+    else
+        install_TDengine
+    fi
 fi

packaging/tools/makepkg_pro.sh

@@ -76,6 +76,15 @@ if [ "$verMode" == "cluster" ]; then
     cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
     rm -rf ${install_dir}/nginxd/png
 
+    # replace the OEM name, add by yangzy@2021-09-22
+    sed -i -e 's/www.taosdata.com/www.hanatech.com.cn/g' $(grep -r 'www.taosdata.com' ${install_dir}/nginxd | sed -r "s/(.*\.html):\s*(.*)/\1/g")
+    sed -i -e 's/TAOS Data/Hanatech/g' $(grep -r 'TAOS Data' ${install_dir}/nginxd | sed -r "s/(.*\.html):\s*(.*)/\1/g")
+    sed -i -e 's/taosd/prodbs/g' `grep -r 'taosd' ${install_dir}/nginxd | grep -E '*\.js\s*.*' | sed -r -e 's/(.*\.js):\s*(.*)/\1/g' | sort | uniq`
+
+    sed -i -e 's/<th style="font-weight: normal">taosd<\/th>/<th style="font-weight: normal">prodbs<\/th>/g' ${install_dir}/nginxd/admin/monitor.html
+    sed -i -e "s/data:\['taosd', 'system'\],/data:\['prodbs', 'system'\],/g" ${install_dir}/nginxd/admin/monitor.html
+    sed -i -e "s/name: 'taosd',/name: 'prodbs',/g" ${install_dir}/nginxd/admin/monitor.html
+
     sed -i "s/TDengine/ProDB/g"   ${install_dir}/nginxd/admin/*.html
     sed -i "s/TDengine/ProDB/g"   ${install_dir}/nginxd/admin/js/*.js
 

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.2.0.2'
+version: '2.2.0.5'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.2.0.2
+      - usr/lib/libtaos.so.2.2.0.5
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 

src/client/src/tscParseInsert.c

@@ -771,6 +771,10 @@ void tscSortRemoveDataBlockDupRowsRaw(STableDataBlocks *dataBuf) {
       TSKEY tj = *(TSKEY *)(pBlockData + dataBuf->rowSize * j);
 
       if (ti == tj) {
+        if (dataBuf->pTableMeta && dataBuf->pTableMeta->tableInfo.update != TD_ROW_DISCARD_UPDATE) {
+          memmove(pBlockData + dataBuf->rowSize * i, pBlockData + dataBuf->rowSize * j, dataBuf->rowSize);
+        }
+
         ++j;
         continue;
       }
@@ -841,6 +845,10 @@ int tscSortRemoveDataBlockDupRows(STableDataBlocks *dataBuf, SBlockKeyInfo *pBlk
       TSKEY tj = (pBlkKeyTuple + j)->skey;
 
       if (ti == tj) {
+        if (dataBuf->pTableMeta && dataBuf->pTableMeta->tableInfo.update != TD_ROW_DISCARD_UPDATE) {
+          memmove(pBlkKeyTuple + i, pBlkKeyTuple + j, sizeof(SBlockKeyTuple));
+        }
+
         ++j;
         continue;
       }

src/client/src/tscParseLineProtocol.c

@@ -1002,6 +1002,7 @@ static int32_t applyChildTableFields(TAOS* taos, SSmlSTableSchema* sTableSchema,
   size_t rows = taosArrayGetSize(cTablePoints);
   SArray* rowsBind = taosArrayInit(rows, POINTER_BYTES);
 
+  int isNullColBind = TSDB_TRUE;
   for (int i = 0; i < rows; ++i) {
     TAOS_SML_DATA_POINT* point = taosArrayGetP(cTablePoints, i);
 
@@ -1012,7 +1013,6 @@ static int32_t applyChildTableFields(TAOS* taos, SSmlSTableSchema* sTableSchema,
       return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }
 
-    int isNullColBind = TSDB_TRUE;
     for (int j = 0; j < numCols; ++j) {
       TAOS_BIND* bind = colBinds + j;
       bind->is_null = &isNullColBind;

src/client/src/tscSQLParser.c

@@ -3011,7 +3011,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg9);
       }
 
-      if (taosArrayGetSize(pItem->pNode->Expr.paramList) <= 0) {
+      if (pItem->pNode->Expr.paramList == NULL || taosArrayGetSize(pItem->pNode->Expr.paramList) <= 0) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg13);        
       }
       
@@ -3672,7 +3672,7 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
       tscColumnListInsert(pTableMetaInfo->tagColList, index.columnIndex, pTableMeta->id.uid, pSchema);
     } else {
       // check if the column type is valid, here only support the bool/tinyint/smallint/bigint group by
-      if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP || pSchema->type == TSDB_DATA_TYPE_FLOAT || pSchema->type == TSDB_DATA_TYPE_DOUBLE) {
+      if (pSchema->type == TSDB_DATA_TYPE_FLOAT || pSchema->type == TSDB_DATA_TYPE_DOUBLE) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
 

src/client/src/tscUtil.c

@@ -4400,6 +4400,7 @@ STableMeta* createSuperTableMeta(STableMetaMsg* pChild) {
   pTableMeta->tableInfo.numOfTags = pChild->numOfTags;
   pTableMeta->tableInfo.numOfColumns = pChild->numOfColumns;
   pTableMeta->tableInfo.precision = pChild->precision;
+  pTableMeta->tableInfo.update = pChild->update;
 
   pTableMeta->id.tid = 0;
   pTableMeta->id.uid = pChild->suid;

grafanaplugin @ 016d8e82

-Subproject commit 32e2c97a4cf7bedaa99f5d6dd8cb036e7f4470df
+Subproject commit 016d8e82a24d72779be0ab0090580a372b4fffca

src/inc/taosmsg.h

@@ -779,6 +779,7 @@ typedef struct STableMetaMsg {
   char          tableFname[TSDB_TABLE_FNAME_LEN];   // table id
   uint8_t       numOfTags;
   uint8_t       precision;
+  uint8_t       update;
   uint8_t       tableType;
   int16_t       numOfColumns;
   int16_t       sversion;

src/kit/shell/CMakeLists.txt

@@ -34,6 +34,8 @@ ELSEIF (TD_WINDOWS)
 
   IF (TD_POWER)
     SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME power)
+  ELSEIF (TD_PRO)
+    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME prodbc)
   ELSE ()
     SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
   ENDIF ()

src/kit/shell/src/shellCheck.c

@@ -111,6 +111,7 @@ static void *shellCheckThreadFp(void *arg) {
   int32_t start = pThread->threadIndex * interval;
   int32_t end = (pThread->threadIndex + 1) * interval;
 
+  if (start >= tbNum) return NULL;
   if (end > tbNum) end = tbNum + 1;
 
   char file[32] = {0};
@@ -193,9 +194,11 @@ void shellCheck(TAOS *con, SShellArguments *_args) {
     return;
   }
 
-  fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, _args->threadNum);
-  shellRunCheckThreads(con, _args);
-
+  if (tbNum > 0) {
+    fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, _args->threadNum);
+    shellRunCheckThreads(con, _args);
+  }
+  
   int64_t end = taosGetTimestampMs();
   fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,
           (end - start) / 1000.0);

src/mnode/src/mnodeTable.c

@@ -1793,6 +1793,7 @@ static int32_t mnodeDoGetSuperTableMeta(SMnodeMsg *pMsg, STableMetaMsg* pMeta) {
   pMeta->sversion     = htons(pTable->sversion);
   pMeta->tversion     = htons(pTable->tversion);
   pMeta->precision    = pMsg->pDb->cfg.precision;
+  pMeta->update       = pMsg->pDb->cfg.update;
   pMeta->numOfTags    = (uint8_t)pTable->numOfTags;
   pMeta->numOfColumns = htons((int16_t)pTable->numOfColumns);
   pMeta->tableType    = pTable->info.type;
@@ -2510,6 +2511,7 @@ static int32_t mnodeDoGetChildTableMeta(SMnodeMsg *pMsg, STableMetaMsg *pMeta) {
   pMeta->uid       = htobe64(pTable->uid);
   pMeta->tid       = htonl(pTable->tid);
   pMeta->precision = pDb->cfg.precision;
+  pMeta->update    = pDb->cfg.update;
   pMeta->tableType = pTable->info.type;
   tstrncpy(pMeta->tableFname, pTable->info.tableId, TSDB_TABLE_FNAME_LEN);
 

src/os/src/detail/osTime.c

@@ -343,10 +343,40 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
   assert(toPrecision == TSDB_TIME_PRECISION_MILLI ||
          toPrecision == TSDB_TIME_PRECISION_MICRO ||
          toPrecision == TSDB_TIME_PRECISION_NANO);
-  static double factors[3][3] = { {1.,            1000.,            1000000.},
-                                  {1.0 / 1000,    1.,               1000.},
-                                  {1.0 / 1000000, 1.0 / 1000,       1.} };
-  return (int64_t)((double)time * factors[fromPrecision][toPrecision]);
+  switch(fromPrecision) {
+    case TSDB_TIME_PRECISION_MILLI: {
+      switch (toPrecision) {
+        case TSDB_TIME_PRECISION_MILLI:
+          return time;
+        case TSDB_TIME_PRECISION_MICRO:
+          return time * 1000;
+        case TSDB_TIME_PRECISION_NANO:
+          return time * 1000000;
+      }
+    } // end from milli
+    case TSDB_TIME_PRECISION_MICRO: {
+      switch (toPrecision) {
+        case TSDB_TIME_PRECISION_MILLI:
+          return time / 1000;
+        case TSDB_TIME_PRECISION_MICRO:
+          return time;
+        case TSDB_TIME_PRECISION_NANO:
+          return time * 1000;
+      }
+    } //end from micro
+    case TSDB_TIME_PRECISION_NANO: {
+      switch (toPrecision) {
+        case TSDB_TIME_PRECISION_MILLI:
+          return time / 1000000;
+        case TSDB_TIME_PRECISION_MICRO:
+          return time / 1000;
+        case TSDB_TIME_PRECISION_NANO:
+          return time;
+      }
+    } //end from nano
+    default:
+      assert(0);
+  } //end switch fromPrecision
 }
 
 static int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) {

src/query/inc/qAggMain.h

@@ -191,6 +191,7 @@ typedef struct SQLFunctionCtx {
 
   SResultRowCellInfo *resultInfo;
 
+  int16_t      colId;
   SExtTagsInfo tagInfo;
   SPoint1      start;
   SPoint1      end;

src/query/inc/qTableMeta.h

@@ -53,6 +53,7 @@ typedef struct SGroupbyExpr {
 typedef struct STableComInfo {
   uint8_t numOfTags;
   uint8_t precision;
+  uint8_t update;
   int16_t numOfColumns;
   int32_t rowSize;
 } STableComInfo;

src/query/src/qAggMain.c

@@ -3697,7 +3697,7 @@ static void interp_function_impl(SQLFunctionCtx *pCtx) {
 
   bool ascQuery = (pCtx->order == TSDB_ORDER_ASC);
 
-  if (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP) {
+  if (pCtx->colId == 0 && pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP) {
     *(TSKEY *)pCtx->pOutput = pCtx->startTs;
   } else if (type == TSDB_FILL_NULL) {
     setNull(pCtx->pOutput, pCtx->outputType, pCtx->outputBytes);

src/query/src/qExecutor.c

@@ -1232,6 +1232,7 @@ static void doSetInputDataBlock(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx,
 
         // in case of the block distribution query, the inputBytes is not a constant value.
         pCtx[i].pInput = p->pData;
+        pCtx[i].colId  = p->info.colId;
         assert(p->info.colId == pColIndex->colId && pCtx[i].inputType == p->info.type);
 
         if (pCtx[i].functionId < 0) {

src/query/src/qTableMeta.c

@@ -84,6 +84,7 @@ STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg) {
   pTableMeta->tableInfo = (STableComInfo) {
       .numOfTags    = pTableMetaMsg->numOfTags,
       .precision    = pTableMetaMsg->precision,
+      .update       = pTableMetaMsg->update,
       .numOfColumns = pTableMetaMsg->numOfColumns,
   };
 

src/tsdb/src/tsdbRead.c

@@ -653,55 +653,8 @@ SArray* tsdbGetQueriedTableList(TsdbQueryHandleT *pHandle) {
   return res;
 }
 
-// leave only one table for each group
-static STableGroupInfo* trimTableGroup(STimeWindow* window, STableGroupInfo* pGroupList) {
-  assert(pGroupList);
-  size_t numOfGroup = taosArrayGetSize(pGroupList->pGroupList);
-
-  STableGroupInfo* pNew = calloc(1, sizeof(STableGroupInfo));
-  pNew->pGroupList = taosArrayInit(numOfGroup, POINTER_BYTES);
-
-  for(int32_t i = 0; i < numOfGroup; ++i) {
-    SArray* oneGroup = taosArrayGetP(pGroupList->pGroupList, i);
-    size_t numOfTables = taosArrayGetSize(oneGroup);
-
-    SArray* px = taosArrayInit(4, sizeof(STableKeyInfo));
-    for (int32_t j = 0; j < numOfTables; ++j) {
-      STableKeyInfo* pInfo = (STableKeyInfo*)taosArrayGet(oneGroup, j);
-      if (window->skey <= pInfo->lastKey && ((STable*)pInfo->pTable)->lastKey != TSKEY_INITIAL_VAL) {
-        taosArrayPush(px, pInfo);
-        pNew->numOfTables += 1;
-        break;
-      }
-    }
-
-    // there are no data in this group
-    if (taosArrayGetSize(px) == 0) {
-      taosArrayDestroy(px);
-    } else {
-      taosArrayPush(pNew->pGroupList, &px);
-    }
-  }
-
-  return pNew;
-}
-
 TsdbQueryHandleT tsdbQueryRowsInExternalWindow(STsdbRepo *tsdb, STsdbQueryCond* pCond, STableGroupInfo *groupList, uint64_t qId, SMemRef* pRef) {
-  STableGroupInfo* pNew = trimTableGroup(&pCond->twindow, groupList);
-
-  if (pNew->numOfTables == 0) {
-    tsdbDebug("update query time range to invalidate time window");
-
-    assert(taosArrayGetSize(pNew->pGroupList) == 0);
-    bool asc = ASCENDING_TRAVERSE(pCond->order);
-    if (asc) {
-      pCond->twindow.ekey = pCond->twindow.skey - 1;
-    } else {
-      pCond->twindow.skey = pCond->twindow.ekey - 1;
-    }
-  }
-
-  STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, pNew, qId, pRef);
+  STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, groupList, qId, pRef);
   pQueryHandle->loadExternalRow = true;
   pQueryHandle->currentLoadExternalRows = true;
 

tests/gotest/batchtest.bat

+
 @echo off
 echo ==== start Go connector test cases test ====
 cd /d %~dp0
@@ -8,7 +9,7 @@ if "%severIp%"=="" (set severIp=127.0.0.1)
 if "%serverPort%"=="" (set serverPort=6030)
 
 go env -w GO111MODULE=on
-go env -w GOPROXY=https://goproxy.io,direct
+go env -w GOPROXY=https://goproxy.cn,direct
 
 cd case001
 case001.bat %severIp% %serverPort%  
@@ -18,3 +19,10 @@ rem case002.bat
 
 :: cd case002
 :: case002.bat
+
+
+rem cd nanosupport 
+rem nanoCase.bat 
+
+:: cd nanosupport 
+:: nanoCase.bat 

tests/gotest/batchtest.sh

@@ -14,8 +14,9 @@ if [ ! -n "$serverPort" ]; then
 fi
 
 go env -w GO111MODULE=on
-go env -w GOPROXY=https://goproxy.io,direct
+go env -w GOPROXY=https://goproxy.cn,direct
 
 bash ./case001/case001.sh $severIp $serverPort
 bash ./case002/case002.sh $severIp $serverPort
 #bash ./case003/case003.sh $severIp $serverPort
+bash ./nanosupport/nanoCase.sh $severIp $serverPort

tests/gotest/case001/case001.sh

@@ -15,8 +15,7 @@ script_dir="$(dirname $(readlink -f $0))"
 ###### step 3: start build
 cd $script_dir
 rm -f go.*
-go mod init demotest > /dev/null 2>&1
-go mod tidy > /dev/null 2>&1
-go build  > /dev/null 2>&1
+go mod init demotest
+go build 
 sleep 1s
 ./demotest -h $1 -p $2

tests/gotest/case002/case002.bat

 @echo off
-echo ==== start run cases001.go
+echo ==== start run cases002.go
 
 del go.*
 go mod init demotest

tests/gotest/case002/case002.go

@@ -43,10 +43,9 @@ func main() {
 		os.Exit(1)
 	}
 	defer db.Close()
-	db.Exec("drop if exists database test")
-	db.Exec("create if not exists database test")
+	db.Exec("drop database if exists test")
+	db.Exec("create database if not exists test ")
 	db.Exec("use test")
-	db.Exec("drop if exists database test")
 	db.Exec("create table test (ts timestamp ,level int)")
 	for i := 0; i < 10; i++ {
 		sqlcmd := fmt.Sprintf("insert into test values(%d,%d)", ts+i, i)

tests/gotest/case002/case002.sh

 #!/bin/bash
 
-echo "==== start run cases001.go"
+echo "==== start run cases002.go"
 
 set +e
 #set -x

tests/gotest/nanosupport/connector/executor.go

+package connector
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"time"
+
+	"github.com/taosdata/go-utils/log"
+	"github.com/taosdata/go-utils/tdengine/config"
+	"github.com/taosdata/go-utils/tdengine/connector"
+	tdengineExecutor "github.com/taosdata/go-utils/tdengine/executor"
+)
+
+type Executor struct {
+	executor *tdengineExecutor.Executor
+	ctx      context.Context
+}
+
+var Logger = log.NewLogger("taos test")
+
+func NewExecutor(conf *config.TDengineGo, db string, showSql bool) (*Executor, error) {
+	tdengineConnector, err := connector.NewTDengineConnector("go", conf)
+	if err != nil {
+		return nil, err
+	}
+	executor := tdengineExecutor.NewExecutor(tdengineConnector, db, showSql, Logger)
+	return &Executor{
+		executor: executor,
+		ctx:      context.Background(),
+	}, nil
+}
+
+func (e *Executor) Execute(sql string) (int64, error) {
+	return e.executor.DoExec(e.ctx, sql)
+}
+func (e *Executor) Query(sql string) (*connector.Data, error) {
+	fmt.Println("query :", sql)
+	return e.executor.DoQuery(e.ctx, sql)
+}
+func (e *Executor) CheckData(row, col int, value interface{}, data *connector.Data) (bool, error) {
+	if data == nil {
+		return false, fmt.Errorf("data is nil")
+	}
+	if col >= len(data.Head) {
+		return false, fmt.Errorf("col out of data")
+	}
+	if row >= len(data.Data) {
+		return false, fmt.Errorf("row out of data")
+	}
+	dataValue := data.Data[row][col]
+
+	if dataValue == nil && value != nil {
+		return false, fmt.Errorf("dataValue is nil but value is not nil")
+	}
+	if dataValue == nil && value == nil {
+		return true, nil
+	}
+	if reflect.TypeOf(dataValue) != reflect.TypeOf(value) {
+		return false, fmt.Errorf("type not match expect %s got %s", reflect.TypeOf(value), reflect.TypeOf(dataValue))
+	}
+	switch value.(type) {
+	case time.Time:
+		t, _ := dataValue.(time.Time)
+		if value.(time.Time).Nanosecond() != t.Nanosecond() {
+			return false, fmt.Errorf("value not match expect %d got %d", value.(time.Time).Nanosecond(), t.Nanosecond())
+		}
+	case string:
+		if value.(string) != dataValue.(string) {
+			return false, fmt.Errorf("value not match expect %s got %s", value.(string), dataValue.(string))
+		}
+	case int8:
+		if value.(int8) != dataValue.(int8) {
+			return false, fmt.Errorf("value not match expect %d got %d", value.(int8), dataValue.(int8))
+		}
+	case int16:
+		if value.(int16) != dataValue.(int16) {
+			return false, fmt.Errorf("value not match expect %d got %d", value.(int16), dataValue.(int16))
+		}
+	case int32:
+		if value.(int32) != dataValue.(int32) {
+			return false, fmt.Errorf("value not match expect %d got %d", value.(int32), dataValue.(int32))
+		}
+	case int64:
+		if value.(int64) != dataValue.(int64) {
+			return false, fmt.Errorf("value not match expect %d got %d", value.(int64), dataValue.(int64))
+		}
+	case float32:
+		if value.(float32) != dataValue.(float32) {
+			return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+		}
+	case float64:
+		if value.(float64) != dataValue.(float64) {
+			return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+		}
+	case bool:
+		if value.(bool) != dataValue.(bool) {
+			return false, fmt.Errorf("value not match expect %t got %t", value.(bool), dataValue.(bool))
+		}
+	default:
+		return false, fmt.Errorf("unsupport type %v", reflect.TypeOf(value))
+	}
+	return true, nil
+}
+
+func (e *Executor) CheckData2(row, col int, value interface{}, data *connector.Data) {
+
+	match, err := e.CheckData(row, col, value, data)
+	fmt.Println("expect data is :", value)
+	fmt.Println("go got data is :", data.Data[row][col])
+	if err != nil {
+		fmt.Println(err)
+	}
+	if !match {
+		fmt.Println(" data not match")
+
+	}
+
+	/*
+		fmt.Println(value)
+		if data == nil {
+			// return false, fmt.Errorf("data is nil")
+			// fmt.Println("check failed")
+		}
+		if col >= len(data.Head) {
+			// return false, fmt.Errorf("col out of data")
+			// fmt.Println("check failed")
+		}
+		if row >= len(data.Data) {
+			// return false, fmt.Errorf("row out of data")
+			// fmt.Println("check failed")
+		}
+		dataValue := data.Data[row][col]
+
+		if dataValue == nil && value != nil {
+			// return false, fmt.Errorf("dataValue is nil but value is not nil")
+			// fmt.Println("check failed")
+		}
+		if dataValue == nil && value == nil {
+			// return true, nil
+			fmt.Println("check pass")
+		}
+		if reflect.TypeOf(dataValue) != reflect.TypeOf(value) {
+			// return false, fmt.Errorf("type not match expect %s got %s", reflect.TypeOf(value), reflect.TypeOf(dataValue))
+			fmt.Println("check failed")
+		}
+		switch value.(type) {
+		case time.Time:
+			t, _ := dataValue.(time.Time)
+			if value.(time.Time).Nanosecond() != t.Nanosecond() {
+				// return false, fmt.Errorf("value not match expect %d got %d", value.(time.Time).Nanosecond(), t.Nanosecond())
+				// fmt.Println("check failed")
+			}
+		case string:
+			if value.(string) != dataValue.(string) {
+				// return false, fmt.Errorf("value not match expect %s got %s", value.(string), dataValue.(string))
+				// fmt.Println("check failed")
+			}
+		case int8:
+			if value.(int8) != dataValue.(int8) {
+				// return false, fmt.Errorf("value not match expect %d got %d", value.(int8), dataValue.(int8))
+				// fmt.Println("check failed")
+			}
+		case int16:
+			if value.(int16) != dataValue.(int16) {
+				// return false, fmt.Errorf("value not match expect %d got %d", value.(int16), dataValue.(int16))
+				// fmt.Println("check failed")
+			}
+		case int32:
+			if value.(int32) != dataValue.(int32) {
+				// return false, fmt.Errorf("value not match expect %d got %d", value.(int32), dataValue.(int32))
+				// fmt.Println("check failed")
+			}
+		case int64:
+			if value.(int64) != dataValue.(int64) {
+				// return false, fmt.Errorf("value not match expect %d got %d", value.(int64), dataValue.(int64))
+				// fmt.Println("check failed")
+			}
+		case float32:
+			if value.(float32) != dataValue.(float32) {
+				// return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+				// fmt.Println("check failed")
+			}
+		case float64:
+			if value.(float64) != dataValue.(float64) {
+				// return false, fmt.Errorf("value not match expect %f got %f", value.(float32), dataValue.(float32))
+				// fmt.Println("check failed")
+			}
+		case bool:
+			if value.(bool) != dataValue.(bool) {
+				// return false, fmt.Errorf("value not match expect %t got %t", value.(bool), dataValue.(bool))
+				// fmt.Println("check failed")
+			}
+		default:
+			// return false, fmt.Errorf("unsupport type %v", reflect.TypeOf(value))
+			// fmt.Println("check failed")
+		}
+		// return true, nil
+		// fmt.Println("check pass")
+	*/
+}
+
+func (e *Executor) CheckRow(count int, data *connector.Data) {
+
+	if len(data.Data) != count {
+		fmt.Println("check failed !")
+	}
+}

tests/gotest/nanosupport/nanoCase.bat

+@echo off
+echo ==== start run nanosupport.go
+
+del go.*
+go mod init nano
+go mod tidy
+go build
+nano.exe -h %1 -p %2
+cd ..

tests/gotest/nanosupport/nanoCase.sh

+#!/bin/bash
+
+echo "==== start run nanosupport.go "
+
+set +e
+#set -x
+
+script_dir="$(dirname $(readlink -f $0))"
+#echo "pwd: $script_dir, para0: $0"
+
+#execName=$0
+#execName=`echo ${execName##*/}`
+#goName=`echo ${execName%.*}`
+
+###### step 3: start build
+cd $script_dir
+rm -f go.*
+go mod init nano
+go mod tidy
+go build
+sleep 10s
+./nano -h $1 -p $2

tests/gotest/nanosupport/nanosupport.go

+package main
+
+import (
+	"fmt"
+	"log"
+	"nano/connector"
+	"time"
+
+	"github.com/taosdata/go-utils/tdengine/config"
+)
+
+func main() {
+	e, err := connector.NewExecutor(&config.TDengineGo{
+		Address:     "root:taosdata@/tcp(127.0.0.1:6030)/",
+		MaxIdle:     20,
+		MaxOpen:     30,
+		MaxLifetime: 30,
+	}, "db", false)
+	if err != nil {
+		panic(err)
+	}
+	prepareData(e)
+	data, err := e.Query("select * from tb")
+	if err != nil {
+		panic(err)
+	}
+
+	layout := "2006-01-02 15:04:05.999999999"
+	t0, _ := time.Parse(layout, "2021-06-10 00:00:00.100000001")
+	t1, _ := time.Parse(layout, "2021-06-10 00:00:00.150000000")
+	t2, _ := time.Parse(layout, "2021-06-10 00:00:00.299999999")
+	t3, _ := time.Parse(layout, "2021-06-10 00:00:00.300000000")
+	t4, _ := time.Parse(layout, "2021-06-10 00:00:00.300000001")
+	t5, _ := time.Parse(layout, "2021-06-10 00:00:00.999999999")
+
+	e.CheckData2(0, 0, t0, data)
+	e.CheckData2(1, 0, t1, data)
+	e.CheckData2(2, 0, t2, data)
+	e.CheckData2(3, 0, t3, data)
+	e.CheckData2(4, 0, t4, data)
+	e.CheckData2(5, 0, t5, data)
+	e.CheckData2(3, 1, int32(3), data)
+	e.CheckData2(4, 1, int32(5), data)
+	e.CheckData2(5, 1, int32(7), data)
+
+	fmt.Println(" start check nano support!")
+
+	data, _ = e.Query("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb where ts > \"2021-06-10 0:00:00.100000001\" and ts < \"2021-06-10 0:00:00.160000000\";")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;")
+	e.CheckData2(0, 0, int64(1), data)
+	data, _ = e.Query("select count(*) from tb where ts > \"2021-06-10 0:00:00.100000000\" and ts < \"2021-06-10 0:00:00.150000000\";")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb where ts > 1623254400400000000;")
+	e.CheckData2(0, 0, int64(1), data)
+	data, _ = e.Query("select count(*) from tb where ts < \"2021-06-10 00:00:00.400000000\";")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb where ts < now + 400000000b;")
+	e.CheckData2(0, 0, int64(6), data)
+
+	data, _ = e.Query("select count(*) from tb where ts >= \"2021-06-10 0:00:00.100000001\";")
+	e.CheckData2(0, 0, int64(6), data)
+
+	data, _ = e.Query("select count(*) from tb where ts <= 1623254400300000000;")
+	e.CheckData2(0, 0, int64(4), data)
+
+	data, _ = e.Query("select count(*) from tb where ts = \"2021-06-10 0:00:00.000000000\";")
+
+	data, _ = e.Query("select count(*) from tb where ts = 1623254400150000000;")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb where ts = \"2021-06-10 0:00:00.100000001\";")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb where ts between \"2021-06-10 0:00:00.299999999\" and \"2021-06-10 0:00:00.300000001\";")
+	e.CheckData2(0, 0, int64(3), data)
+
+	data, _ = e.Query("select avg(speed) from tb interval(5000000000b);")
+	e.CheckRow(1, data)
+
+	data, _ = e.Query("select avg(speed) from tb interval(100000000b)")
+	e.CheckRow(4, data)
+
+	data, _ = e.Query("select avg(speed) from tb interval(1000b);")
+	e.CheckRow(5, data)
+
+	data, _ = e.Query("select avg(speed) from tb interval(1u);")
+	e.CheckRow(5, data)
+
+	data, _ = e.Query("select avg(speed) from tb interval(100000000b) sliding (100000000b);")
+	e.CheckRow(4, data)
+
+	data, _ = e.Query("select last(*) from tb")
+	tt, _ := time.Parse(layout, "2021-06-10 0:00:00.999999999")
+	e.CheckData2(0, 0, tt, data)
+
+	data, _ = e.Query("select first(*) from tb")
+	tt1, _ := time.Parse(layout, "2021-06-10 0:00:00.100000001")
+	e.CheckData2(0, 0, tt1, data)
+
+	e.Execute("insert into tb values(now + 500000000b, 6);")
+	data, _ = e.Query("select * from tb;")
+	e.CheckRow(7, data)
+
+	e.Execute("create table tb2 (ts timestamp, speed int, ts2 timestamp);")
+	e.Execute("insert into tb2 values(\"2021-06-10 0:00:00.100000001\", 1, \"2021-06-11 0:00:00.100000001\");")
+	e.Execute("insert into tb2 values(1623254400150000000, 2, 1623340800150000000);")
+	e.Execute("import into tb2 values(1623254400300000000, 3, 1623340800300000000);")
+	e.Execute("import into tb2 values(1623254400299999999, 4, 1623340800299999999);")
+	e.Execute("insert into tb2 values(1623254400300000001, 5, 1623340800300000001);")
+	e.Execute("insert into tb2 values(1623254400999999999, 7, 1623513600999999999);")
+
+	data, _ = e.Query("select * from tb2;")
+	tt2, _ := time.Parse(layout, "2021-06-10 0:00:00.100000001")
+	tt3, _ := time.Parse(layout, "2021-06-10 0:00:00.150000000")
+
+	e.CheckData2(0, 0, tt2, data)
+	e.CheckData2(1, 0, tt3, data)
+	e.CheckData2(2, 1, int32(4), data)
+	e.CheckData2(3, 1, int32(3), data)
+	tt4, _ := time.Parse(layout, "2021-06-11 00:00:00.300000001")
+	e.CheckData2(4, 2, tt4, data)
+	e.CheckRow(6, data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 > \"2021-06-11 0:00:00.100000000\" and ts2 < \"2021-06-11 0:00:00.100000002\";")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 > 1623340800500000000;")
+	e.CheckData2(0, 0, int64(1), data)
+	data, _ = e.Query("select count(*) from tb2 where ts2 < \"2021-06-11 0:00:00.400000000\";")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 < now + 400000000b;")
+	e.CheckData2(0, 0, int64(6), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 >= \"2021-06-11 0:00:00.100000001\";")
+	e.CheckData2(0, 0, int64(6), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 <= 1623340800400000000;")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 = \"2021-06-11 0:00:00.000000000\";")
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 = \"2021-06-11 0:00:00.300000001\";")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 = 1623340800300000001;")
+	e.CheckData2(0, 0, int64(1), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 between \"2021-06-11 0:00:00.299999999\" and \"2021-06-11 0:00:00.300000001\";")
+	e.CheckData2(0, 0, int64(3), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 <> 1623513600999999999;")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 <> \"2021-06-11 0:00:00.100000001\";")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 <> \"2021-06-11 0:00:00.100000000\";")
+	e.CheckData2(0, 0, int64(6), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 != 1623513600999999999;")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 != \"2021-06-11 0:00:00.100000001\";")
+	e.CheckData2(0, 0, int64(5), data)
+
+	data, _ = e.Query("select count(*) from tb2 where ts2 != \"2021-06-11 0:00:00.100000000\";")
+	e.CheckData2(0, 0, int64(6), data)
+
+	e.Execute("insert into tb2 values(now + 500000000b, 6, now +2d);")
+	data, _ = e.Query("select * from tb2;")
+	e.CheckRow(7, data)
+
+	e.Execute("create table tb3 (ts timestamp, speed int);")
+	_, err = e.Execute("insert into tb3 values(16232544001500000, 2);")
+	if err != nil {
+		fmt.Println("check pass! ")
+	}
+
+	e.Execute("insert into tb3 values(\"2021-06-10 0:00:00.123456\", 2);")
+	data, _ = e.Query("select * from tb3 where ts = \"2021-06-10 0:00:00.123456000\";")
+	e.CheckRow(1, data)
+
+	e.Execute("insert into tb3 values(\"2021-06-10 0:00:00.123456789000\", 2);")
+	data, _ = e.Query("select * from tb3 where ts = \"2021-06-10 0:00:00.123456789\";")
+	e.CheckRow(1, data)
+
+	// check timezone support
+
+	e.Execute("drop database if exists nsdb;")
+	e.Execute("create database nsdb precision 'ns';")
+	e.Execute("use nsdb;")
+	e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+	e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456789' , 1 ) values('2021-06-10T0:00:00.123456789+07:00' , 1.0);")
+	data, _ = e.Query("select first(*) from tb1;")
+
+	ttt, _ := time.Parse(layout, "2021-06-10 01:00:00.123456789")
+	e.CheckData2(0, 0, ttt, data)
+
+	e.Execute("create database usdb precision 'us';")
+	e.Execute("use usdb;")
+	e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+	e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123456' , 1 ) values('2021-06-10T0:00:00.123456+07:00' , 1.0);")
+	data, _ = e.Query("select first(*) from tb1;")
+	ttt2, _ := time.Parse(layout, "2021-06-10 01:00:00.123456")
+	e.CheckData2(0, 0, ttt2, data)
+
+	e.Execute("drop database if exists msdb;")
+	e.Execute("create database msdb precision 'ms';")
+	e.Execute("use msdb;")
+	e.Execute("create stable st (ts timestamp ,speed float ) tags(time timestamp ,id int);")
+	e.Execute("insert into tb1 using st tags('2021-06-10 0:00:00.123' , 1 ) values('2021-06-10T0:00:00.123+07:00' , 1.0);")
+	data, _ = e.Query("select first(*) from tb1;")
+	ttt3, _ := time.Parse(layout, "2021-06-10 01:00:00.123")
+	e.CheckData2(0, 0, ttt3, data)
+	fmt.Println("all test done!")
+
+}
+
+func prepareData(e *connector.Executor) {
+	sqlList := []string{
+		"reset query cache;",
+		"drop database if exists db;",
+		"create database db;",
+		"use db;",
+		"reset query cache;",
+		"drop database if exists db;",
+		"create database db precision 'ns';",
+		"show databases;",
+		"use db;",
+		"create table tb (ts timestamp, speed int);",
+		"insert into tb values('2021-06-10 0:00:00.100000001', 1);",
+		"insert into tb values(1623254400150000000, 2);",
+		"import into tb values(1623254400300000000, 3);",
+		"import into tb values(1623254400299999999, 4);",
+		"insert into tb values(1623254400300000001, 5);",
+		"insert into tb values(1623254400999999999, 7);",
+	}
+	for _, sql := range sqlList {
+		err := executeSql(e, sql)
+		if err != nil {
+			log.Fatalf("prepare data error:%v, sql:%s", err, sql)
+		}
+	}
+}
+
+func executeSql(e *connector.Executor, sql string) error {
+	_, err := e.Execute(sql)
+	if err != nil {
+		return err
+	}
+	return nil
+}

tests/pytest/client/taoshellCheckCase.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys, shutil
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import subprocess
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def getBuildPath(self) -> str:
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/debug/build/bin")]
+                    break
+        return buildPath
+
+    def execute_cmd(self,cmd):
+        out = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,stderr=subprocess.PIPE).stderr.read().decode("utf-8")
+        if out.find("error:") >=0:
+            print(cmd)
+            print(out)
+            sys.exit()
+        
+            
+
+    def run(self):
+        tdSql.prepare()
+        build_path = self.getBuildPath() + "/debug/build/bin"
+        tdLog.info("====== check tables use taos -d  -k  ========")
+
+        tdSql.execute("drop database if exists test")
+        tdSql.execute("drop database if exists dumptest")
+        tdSql.execute("create database if not exists test")
+        tdLog.info("====== only create database test ==== ")
+        self.execute_cmd(build_path + "/" + "taos -d test -k 1  > res.txt 2>&1")
+
+        tdSql.execute("use test")
+        tdSql.execute("create stable st (ts timestamp , id int , val double , str binary(20) ) tags (ind int)")
+        tdSql.execute("create table tb1 using st tags(1)")
+        tdLog.info("======= only create one table ==========")
+        self.execute_cmd(build_path + "/" + "taos -d test -k 1  > res.txt 2>&1")
+
+        tdSql.execute("create table tb2 using st tags(2)")
+        tdSql.execute("create table tb3 using st tags(3)")
+        tdLog.info("======= only create three table =======")
+        self.execute_cmd(build_path + "/" + "taos -d test -k 1  > res.txt 2>&1")
+
+        tdSql.execute("create table tb4 using st tags(4)")
+        tdSql.execute("create table tb5 using st tags(5)")
+        tdLog.info("======= only create five table =======")
+        self.execute_cmd(build_path + "/" + "taos -d test -k 1  > res.txt 2>&1")
+
+        start_time = 1604298064000
+        rows = 10
+        tb_nums = 5
+        tdLog.info("====== start insert rows ========")
+
+        for i in range(1, tb_nums + 1):
+            for j in range(rows):
+                start_time += 10
+                tdSql.execute(
+                    "insert into tb%d values(%d, %d,%f,%s) " % (i, start_time, j, float(j), "'str" + str(j) + "'"))
+        tdSql.query("select count(*) from st")
+        tdSql.checkData(0, 0, 50)
+
+        for i in range(1, tb_nums + 1):
+            tdSql.execute("select * from test.tb%s" % (str(i)))
+
+        tdLog.info("====== check taos -D filedir  ========")
+
+        if not os.path.exists("./dumpdata"):
+            os.mkdir("./dumpdata")
+        else:
+            shutil.rmtree("./dumpdata")
+            os.mkdir("./dumpdata")
+
+        os.system(build_path + "/" + "taosdump -D test -o ./dumpdata")
+        sleep(2)
+        os.system("cd ./dumpdata && mv dbs.sql tables.sql")
+        os.system('sed -i "s/test/dumptest/g" `grep test -rl ./dumpdata`')
+        os.system(build_path + "/" + "taos -D ./dumpdata")
+        tdSql.query("select count(*) from dumptest.st")
+        tdSql.checkData(0, 0, 50)
+
+        tdLog.info("========test other file name about tables.sql========")
+        os.system("rm -rf ./dumpdata/*")
+        os.system(build_path + "/" + "taosdump -D test -o ./dumpdata")
+        sleep(2)
+        os.system("cd ./dumpdata && mv dbs.sql table.sql")
+        os.system('sed -i "s/test/tt/g" `grep test -rl ./dumpdata`')
+        cmd = build_path + "/" + "taos -D ./dumpdata"
+        out = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,stderr=subprocess.PIPE).stderr.read().decode("utf-8")
+        if out.find("error:") >=0:
+            print("===========expected error occured======")
+        
+            
+        tdLog.info("====== check taos shell params  ========")
+
+        tdLog.info("====== step 1 : insert data with some unicode ========")
+
+        sqls = ["drop database if exists dbst",
+                "create database dbst",
+                "use dbst",
+                "create stable dbst.st (ts timestamp , id int , val double , str binary(200) ,char nchar(200) ) tags (ind int)",
+                "create table dbst.tb1 using dbst.st tags(1)",
+                "create table dbst.tb2 using dbst.st tags(2)",
+                "insert into dbst.tb1 values('2021-07-14T10:40:00.006+0800' , 1 , 1.0 , 'binary_1','中文-1') ",
+                "insert into dbst.tb1 values('2021-07-14T10:40:00.006Z' , 1 , 1.0 , 'binary\\'1','中文?-1')",
+                "insert into dbst.tb1 values('2021-07-14 10:40:00.000',1,1.0,'！@#¥%……&*', '中文12&%#@!*')",
+                "insert into dbst.tb1 values(now ,1,1.0,'(){}[];./?&*\n', '中文&%#@!*34')",
+                "insert into dbst.tb1 values(now ,1,1.0,'\\t\\0', '中文_\\t\\0')",
+                # "insert into dbst.tb1 values(now ,1,1.0,'\t\"', '中文_\t\\')", 
+                "CREATE STABLE dbst.stb (TS TIMESTAMP , ID INT , VAL DOUBLE , STR BINARY(200) ,CHAR NCHAR(200) ) TAGS (IND INT)",
+                "CREATE TABLE dbst.tbb1 USING dbst.STB TAGS(1)",
+                "CREATE TABLE dbst.tbb2 USING dbst.STB TAGS(2)",
+                "INSERT INTO dbst.TBB1 VALUES('2021-07-14T10:40:00.006+0800' , 1 , 1.0 , 'BINARY_1','中文-1')",
+                "INSERT INTO dbst.TBB1 VALUES('2021-07-14T10:40:00.006Z' , 1 , 1.0 , 'BINARY1','中文?-1')",
+                "INSERT INTO dbst.TBB1 VALUES('2021-07-14 10:40:00.000',1,1.0,'！@#¥%……&*', '中文12&%#@!*');"]
+        for sql in sqls:
+            cmd = build_path + "/" + "taos -s \""+sql+"\"" 
+            self.execute_cmd(cmd)        
+            
+        basic_code = ['!' ,'#', '$', '%', '&', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1',
+                      '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', 'A',
+                     'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M','N', 'O', 'P', 'Q', 'R',
+                     'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\',']' ,'^', '_', '`', 'a', 'b', 'c',
+                    'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r','s', 't', 'u',
+                     'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~']
+        for code in basic_code:
+            # bug -> : this is a bug need be repaired to support '`'  and '\'
+            if code=='\\':
+                cmd =  build_path + "/" + "taos -s \" insert into dbst.tb2 values(now ,2,2.0," +r'"\\"'+",'中文"+r'\\'+ "')\""
+                continue   
+            elif code =='`': 
+                cmd = build_path + "/" + "taos -s \" insert into dbst.tb2 values(now ,2,2.0,'"+code+"','汉字"+code+"\')\""
+                continue
+            else:
+                cmd = build_path + "/" + "taos -s \" insert into dbst.tb2 values(now ,2,2.0,'"+code+"','汉字"+code+"\')\""
+                
+            self.execute_cmd(cmd)
+            
+            
+        tdLog.info("====== step 2 : query result of results ========")
+
+        querys = ["select count(*) from dbst.tb2",
+        "show dbst.tables",
+        "show dbst.tables like tb_",
+        "show dbst.tables like 't%'",
+        "select * from dbst.stb",
+        "select avg(val),max(id),min(id) from dbst.st ",
+        "select last_row(*) from dbst.st",
+        "select * from dbst.st where ts >'2021-07-14T10:40:00.006+0800' and ind = 1 ",
+        "select max(val) from dbst.st where ts >'2021-07-14T10:40:00.006+0800' group by tbname",
+        "select count(*) from dbst.st interval(1s) group by tbname",
+        "show queries ",
+        "show connections",
+        "show functions",
+        "select * from dbst.tb2 where str like 'a'",
+        "select bottom(id, 3) from dbst.st; ",
+        "select _block_dist() from dbst.st;",
+        "select 5 from dbst.tb1;",
+        "select id , val from dbst.st",
+        "describe dbst.st",
+        "alter stable dbst.st modify column str binary(205);" ]
+
+        for query in querys:
+            cmd = build_path + "/" + "taos -s \""+query+"\""
+            self.execute_cmd(cmd)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/crash_gen/valgrind_taos.supp

@@ -18213,4 +18213,21 @@
    obj:/usr/bin/python3.8
    fun:PyVectorcall_Call
    fun:_PyEval_EvalFrameDefault
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:_buffer_get_info
+   fun:array_getbuffer
+   fun:__Pyx__GetBufferAndValidate.constprop.64
+   fun:__pyx_f_5numpy_6random_13bit_generator_12SeedSequence_mix_entropy
+   fun:__pyx_pw_5numpy_6random_13bit_generator_12SeedSequence_1__init__
+   obj:/usr/bin/python3.8
+   fun:__Pyx__PyObject_CallOneArg
+   fun:__Pyx_PyObject_CallOneArg
+   fun:__pyx_pw_5numpy_6random_13bit_generator_12BitGenerator_1__init__
+   obj:/usr/bin/python3.8
+   obj:/usr/bin/python3.8
 }
\ No newline at end of file

tests/pytest/fulltest.bat

+python .\test.py -f insert\basic.py 
+python .\test.py -f insert\int.py 
+python .\test.py -f insert\float.py 
+python .\test.py -f insert\bigint.py 
+python .\test.py -f insert\bool.py 
+python .\test.py -f insert\double.py 
+python .\test.py -f insert\smallint.py 
+python .\test.py -f insert\tinyint.py 
+python .\test.py -f insert\date.py 
+python .\test.py -f insert\binary.py 
+python .\test.py -f insert\nchar.py 
+
+python .\test.py -f query\filter.py 
+python .\test.py -f query\filterCombo.py 
+python .\test.py -f query\queryNormal.py 
+python .\test.py -f query\queryError.py 
+python .\test.py -f query\filterAllIntTypes.py 
+python .\test.py -f query\filterFloatAndDouble.py 
+python .\test.py -f query\filterOtherTypes.py 
+python .\test.py -f query\querySort.py 
+python .\test.py -f query\queryJoin.py 
\ No newline at end of file

tests/pytest/fulltest.sh

@@ -45,7 +45,7 @@ python3 ./test.py -f table/del_stable.py
 
 #stable
 python3 ./test.py -f stable/insert.py
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py 
+# python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py 
 
 # tag
 python3 ./test.py -f tag_lite/filter.py
@@ -211,7 +211,7 @@ python3 ./test.py -f perfbenchmark/bug3433.py
 python3 ./test.py -f perfbenchmark/taosdemoInsert.py
 
 #taosdemo
-python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py 
+# python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py 
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 
 #query
@@ -263,7 +263,7 @@ python3 ./test.py -f query/nestedQuery/queryInterval.py
 python3 ./test.py -f query/queryStateWindow.py
 # python3 ./test.py -f query/nestedQuery/queryWithOrderLimit.py
 python3 ./test.py -f query/nestquery_last_row.py
-#python3 ./test.py -f query/nestedQuery/nestedQuery.py
+python3 ./test.py -f query/nestedQuery/nestedQuery.py
 python3 ./test.py -f query/queryCnameDisplay.py
 python3 ./test.py -f query/operator_cost.py
 python3 test.py -f query/nestedQuery/queryWithSpread.py
@@ -293,6 +293,7 @@ python3 ./test.py -f client/client.py
 python3 ./test.py -f client/version.py
 python3 ./test.py -f client/alterDatabase.py
 python3 ./test.py -f client/noConnectionErrorTest.py
+python3 ./test.py -f client/taoshellCheckCase.py
 # python3 test.py -f client/change_time_1_1.py
 # python3 test.py -f client/change_time_1_2.py
 

tests/pytest/insert/binary.py

 # -*- coding: utf-8 -*-
 
+import platform
 import sys
 from util.log import *
 from util.cases import *
@@ -53,9 +54,10 @@ class TDTestCase:
         tdLog.info("tdSql.checkData(0, 0, '34567')")
         tdSql.checkData(0, 0, '34567')
         tdLog.info("insert into tb values (now+4a, \"'';\")")
-        config_dir = subprocess.check_output(str("ps -ef |grep dnode1|grep -v grep |awk '{print $NF}'"), stderr=subprocess.STDOUT, shell=True).decode('utf-8').replace('\n', '')
-        result = ''.join(os.popen(r"""taos  -s "insert into db.tb values (now+4a, \"'';\")" -c %s"""%(config_dir)).readlines())
-        if "Query OK" not in result: tdLog.exit("err:insert '';")            
+        if platform.system() == "Linux":
+            config_dir = subprocess.check_output(str("ps -ef |grep dnode1|grep -v grep |awk '{print $NF}'"), stderr=subprocess.STDOUT, shell=True).decode('utf-8').replace('\n', '')
+            result = ''.join(os.popen(r"""taos  -s "insert into db.tb values (now+4a, \"'';\")" -c %s"""%(config_dir)).readlines())
+            if "Query OK" not in result: tdLog.exit("err:insert '';")            
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         tdLog.info('show databases')

tests/pytest/insert/nchar.py

@@ -15,6 +15,7 @@ import sys
 from util.log import *
 from util.cases import *
 from util.sql import *
+import platform
 
 
 class TDTestCase:
@@ -37,7 +38,7 @@ class TDTestCase:
 
         tdSql.error("insert into tb values (now, 'taosdata001')")
 
-        tdSql.error("insert into tb(now, 😀)")
+        if platform.system() == "Linux" : tdSql.error("insert into tb(now, 😀)")
         tdSql.query("select * from tb")
         tdSql.checkRows(2)
         

tests/pytest/query/queryNormal.py

@@ -17,6 +17,7 @@ from util.log import *
 from util.cases import *
 from util.sql import *
 from util.dnodes import *
+import platform
 
 class TDTestCase:
     def init(self, conn, logSql):
@@ -137,8 +138,9 @@ class TDTestCase:
         tdSql.checkData(1, 1, 421)
         tdSql.checkData(1, 2, "tm1")
         
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        if platform.system() == "Linux": 
+            tdDnodes.stop(1)
+            tdDnodes.start(1)
 
         tdSql.query("select last(*) from m1 group by tbname")
         tdSql.checkData(0, 0, "2020-03-01 01:01:01")

tests/pytest/test-all.bat

+@echo off
+SETLOCAL EnableDelayedExpansion
+for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) do     rem"') do (  set "DEL=%%a")
+for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+    echo Processing %%i
+    call %%i ARG1 -w 1 -m %1 > result.txt 2>error.txt
+    if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. )   
+)
+exit
+
+:colorEcho
+echo off
+<nul set /p ".=%DEL%" > "%~2"
+findstr /v /a:%1 /R "^$" "%~2" nul
+del "%~2" > nul 2>&1i
\ No newline at end of file

tests/pytest/test.py

@@ -18,6 +18,7 @@ import getopt
 import subprocess
 import time
 from distutils.log import warn as printf
+from fabric2 import Connection
 
 from util.log import *
 from util.dnodes import *
@@ -35,8 +36,9 @@ if __name__ == "__main__":
     logSql = True
     stop = 0
     restart = False
-    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghr', [
-        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help'])
+    windows = 0
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrw', [
+        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'windows'])
     for key, value in opts:
         if key in ['-h', '--help']:
             tdLog.printNoPrefix(
@@ -49,6 +51,7 @@ if __name__ == "__main__":
             tdLog.printNoPrefix('-c Test Cluster Flag')
             tdLog.printNoPrefix('-g valgrind Test Flag')
             tdLog.printNoPrefix('-r taosd restart test')
+            tdLog.printNoPrefix('-w taos on windows')
             sys.exit(0)
 
         if key in ['-r', '--restart']: 
@@ -81,6 +84,9 @@ if __name__ == "__main__":
         if key in ['-s', '--stop']:
             stop = 1
 
+        if key in ['-w', '--windows']:
+            windows = 1
+
     if (stop != 0):
         if (valgrind == 0):
             toBeKilled = "taosd"
@@ -111,66 +117,81 @@ if __name__ == "__main__":
 
         tdLog.info('stop All dnodes')
     
-    tdDnodes.init(deployPath)
-    tdDnodes.setTestCluster(testCluster)
-    tdDnodes.setValgrind(valgrind)
-    tdDnodes.stopAll()
-    is_test_framework = 0
-    key_word = 'tdCases.addLinux'
-    try:
-        if key_word in open(fileName).read():
-            is_test_framework = 1
-    except:
-        pass
-    if is_test_framework:
-        moduleName = fileName.replace(".py", "").replace("/", ".")
-        uModule = importlib.import_module(moduleName)
-        try:
-            ucase = uModule.TDTestCase()
-            tdDnodes.deploy(1,ucase.updatecfgDict)
-        except :
-            tdDnodes.deploy(1,{})
-    else:
-        tdDnodes.deploy(1,{})
-    tdDnodes.start(1)
-
     if masterIp == "":
         host = '127.0.0.1'
     else:
         host = masterIp
 
     tdLog.info("Procedures for tdengine deployed in %s" % (host))
-
-    tdCases.logSql(logSql)
-
-    if testCluster:
-        tdLog.info("Procedures for testing cluster")
-        if fileName == "all":
-            tdCases.runAllCluster()
-        else:
-            tdCases.runOneCluster(fileName)
-    else:
+    if windows:
+        tdCases.logSql(logSql)
         tdLog.info("Procedures for testing self-deployment")
+        td_clinet = TDSimClient("C:\\TDengine")
+        td_clinet.deploy()
+        remote_conn = Connection("root@%s"%host)
+        with remote_conn.cd('/var/lib/jenkins/workspace/TDinternal/community/tests/pytest'):
+            remote_conn.run("python3 ./test.py")
         conn = taos.connect(
-            host,
-            config=tdDnodes.getSimCfgPath())
-        if fileName == "all":
-            tdCases.runAllLinux(conn)
+            host="%s"%(host),
+            config=td_clinet.cfgDir)
+        tdCases.runOneWindows(conn, fileName)
+    else:
+        tdDnodes.init(deployPath)
+        tdDnodes.setTestCluster(testCluster)
+        tdDnodes.setValgrind(valgrind)
+        tdDnodes.stopAll()
+        is_test_framework = 0
+        key_word = 'tdCases.addLinux'
+        try:
+            if key_word in open(fileName).read():
+                is_test_framework = 1
+        except:
+            pass
+        if is_test_framework:
+            moduleName = fileName.replace(".py", "").replace("/", ".")
+            uModule = importlib.import_module(moduleName)
+            try:
+                ucase = uModule.TDTestCase()
+                tdDnodes.deploy(1,ucase.updatecfgDict)
+            except :
+                tdDnodes.deploy(1,{})
+        else:
+            pass
+            tdDnodes.deploy(1,{})
+        tdDnodes.start(1)
+
+
+
+        tdCases.logSql(logSql)
+
+        if testCluster:
+            tdLog.info("Procedures for testing cluster")
+            if fileName == "all":
+                tdCases.runAllCluster()
+            else:
+                tdCases.runOneCluster(fileName)
         else:
-            tdCases.runOneLinux(conn, fileName)
-    if restart:
-        if fileName == "all":
-            tdLog.info("not need to query ")
-        else:    
-            sp = fileName.rsplit(".", 1)
-            if len(sp) == 2 and sp[1] == "py":
-                tdDnodes.stopAll()
-                tdDnodes.start(1)
-                time.sleep(1)            
-                conn = taos.connect( host, config=tdDnodes.getSimCfgPath())
-                tdLog.info("Procedures for tdengine deployed in %s" % (host))
-                tdLog.info("query test after taosd restart")
-                tdCases.runOneLinux(conn, sp[0] + "_" + "restart.py")
+            tdLog.info("Procedures for testing self-deployment")
+            conn = taos.connect(
+                host,
+                config=tdDnodes.getSimCfgPath())
+            if fileName == "all":
+                tdCases.runAllLinux(conn)
             else:
-                tdLog.info("not need to query")
+                tdCases.runOneWindows(conn, fileName)
+        if restart:
+            if fileName == "all":
+                tdLog.info("not need to query ")
+            else:    
+                sp = fileName.rsplit(".", 1)
+                if len(sp) == 2 and sp[1] == "py":
+                    tdDnodes.stopAll()
+                    tdDnodes.start(1)
+                    time.sleep(1)            
+                    conn = taos.connect( host, config=tdDnodes.getSimCfgPath())
+                    tdLog.info("Procedures for tdengine deployed in %s" % (host))
+                    tdLog.info("query test after taosd restart")
+                    tdCases.runOneLinux(conn, sp[0] + "_" + "restart.py")
+                else:
+                    tdLog.info("not need to query")
     conn.close()

tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdumpTestNanoSupport.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1625068800000000000   # this is timestamp  "2021-07-01 00:00:00"
+        self.numberOfTables = 10
+        self.numberOfRecords = 100
+
+    def checkCommunity(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+        if ("community" in selfPath):
+            return False
+        else:
+            return True
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+    
+
+
+    def createdb(self, precision="ns"):
+        tb_nums = self.numberOfTables
+        per_tb_rows = self.numberOfRecords
+
+        def build_db(precision, start_time):
+            tdSql.execute("drop database if exists timedb1")
+            tdSql.execute(
+                "create database timedb1 days 10 keep 365 blocks 8 precision "+"\""+precision+"\"")
+
+            tdSql.execute("use timedb1")
+            tdSql.execute(
+                "create stable st(ts timestamp, c1 int, c2 nchar(10),c3 timestamp) tags(t1 int, t2 binary(10))")
+            for tb in range(tb_nums):
+                tbname = "t"+str(tb)
+                tdSql.execute("create table " + tbname +
+                              " using st tags(1, 'beijing')")
+                sql = "insert into " + tbname + " values"
+                currts = start_time
+                if precision == "ns":
+                    ts_seed = 1000000000
+                elif precision == "us":
+                    ts_seed = 1000000
+                else:
+                    ts_seed = 1000
+
+                for i in range(per_tb_rows):
+                    sql += "(%d, %d, 'nchar%d',%d)" % (currts + i*ts_seed, i %
+                                                       100, i % 100, currts + i*100)  # currts +1000ms (1000000000ns)
+                tdSql.execute(sql)
+
+        if precision == "ns":
+            start_time = 1625068800000000000
+            build_db(precision, start_time)
+
+        elif precision == "us":
+            start_time = 1625068800000000
+            build_db(precision, start_time)
+
+        elif precision == "ms":
+            start_time = 1625068800000
+            build_db(precision, start_time)
+
+        else:
+            print("other time precision not valid , please check! ")
+    
+
+    def run(self):
+
+        # clear envs
+        os.system("rm -rf ./taosdumptest/")
+        tdSql.execute("drop database if exists dumptmp1")
+        tdSql.execute("drop database if exists dumptmp2")
+        tdSql.execute("drop database if exists dumptmp3")
+
+        if not os.path.exists("./taosdumptest/tmp1"):
+            os.makedirs("./taosdumptest/dumptmp1")
+        else:
+            print("path exist!")
+
+        if not os.path.exists("./taosdumptest/dumptmp2"):
+            os.makedirs("./taosdumptest/dumptmp2")
+
+        if not os.path.exists("./taosdumptest/dumptmp3"):
+            os.makedirs("./taosdumptest/dumptmp3")
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        # create nano second database
+
+        self.createdb(precision="ns")
+
+        # dump all data
+
+        os.system(
+            "%staosdump --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath)
+
+        # dump part data with -S  -E
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000000000 -E 1625068860000000000  -C ns  -o ./taosdumptest/dumptmp2 ' %
+            binPath)
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000000000  -o ./taosdumptest/dumptmp3  ' %
+            binPath)
+
+        # replace strings to dump in databases
+        os.system(
+            "sed -i \"s/timedb1/dumptmp1/g\" `grep timedb1 -rl ./taosdumptest/dumptmp1`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp2/g\" `grep timedb1 -rl ./taosdumptest/dumptmp2`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp3/g\" `grep timedb1 -rl ./taosdumptest/dumptmp3`")
+
+        os.system( "%staosdump -i ./taosdumptest/dumptmp1" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp2" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp3" %binPath)
+
+        # dump data and check for taosdump
+        tdSql.query("select count(*) from dumptmp1.st")
+        tdSql.checkData(0,0,1000)
+
+        tdSql.query("select count(*) from dumptmp2.st")
+        tdSql.checkData(0,0,510)
+
+        tdSql.query("select count(*) from dumptmp3.st")
+        tdSql.checkData(0,0,900)
+
+        # check data
+        origin_res = tdSql.getResult("select * from timedb1.st")
+        dump_res = tdSql.getResult("select * from dumptmp1.st")
+        if origin_res == dump_res:
+            tdLog.info("test nano second : dump check data pass for all data!" )
+        else:
+            tdLog.info("test nano second : dump check data failed for all data!" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000000000 and ts <= 1625068860000000000")
+        dump_res = tdSql.getResult("select * from dumptmp2.st")
+        if origin_res == dump_res:
+            tdLog.info(" test nano second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test nano second : dump check data failed for data !" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000000000 ")
+        dump_res = tdSql.getResult("select * from dumptmp3.st")
+        if origin_res == dump_res:
+            tdLog.info(" test nano second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test nano second : dump check data failed for data !" )
+        
+
+        # us second support test case
+
+        os.system("rm -rf ./taosdumptest/")
+        tdSql.execute("drop database if exists dumptmp1")
+        tdSql.execute("drop database if exists dumptmp2")
+        tdSql.execute("drop database if exists dumptmp3")
+
+        if not os.path.exists("./taosdumptest/tmp1"):
+            os.makedirs("./taosdumptest/dumptmp1")
+        else:
+            print("path exits!")
+
+        if not os.path.exists("./taosdumptest/dumptmp2"):
+            os.makedirs("./taosdumptest/dumptmp2")
+
+        if not os.path.exists("./taosdumptest/dumptmp3"):
+            os.makedirs("./taosdumptest/dumptmp3")
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        self.createdb(precision="us")
+
+        os.system(
+            "%staosdump --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath)
+
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000000 -E 1625068860000000  -C us  -o ./taosdumptest/dumptmp2 ' %
+            binPath)
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000000  -o ./taosdumptest/dumptmp3  ' %
+            binPath)
+
+        os.system(
+            "sed -i \"s/timedb1/dumptmp1/g\" `grep timedb1 -rl ./taosdumptest/dumptmp1`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp2/g\" `grep timedb1 -rl ./taosdumptest/dumptmp2`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp3/g\" `grep timedb1 -rl ./taosdumptest/dumptmp3`")
+
+        os.system( "%staosdump -i ./taosdumptest/dumptmp1" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp2" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp3" %binPath)
+
+ 
+        tdSql.query("select count(*) from dumptmp1.st")
+        tdSql.checkData(0,0,1000)
+
+        tdSql.query("select count(*) from dumptmp2.st")
+        tdSql.checkData(0,0,510)
+
+        tdSql.query("select count(*) from dumptmp3.st")
+        tdSql.checkData(0,0,900)
+
+    
+        origin_res = tdSql.getResult("select * from timedb1.st")
+        dump_res = tdSql.getResult("select * from dumptmp1.st")
+        if origin_res == dump_res:
+            tdLog.info("test us second : dump check data pass for all data!" )
+        else:
+            tdLog.info("test us second : dump check data failed for all data!" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000000 and ts <= 1625068860000000")
+        dump_res = tdSql.getResult("select * from dumptmp2.st")
+        if origin_res == dump_res:
+            tdLog.info(" test us second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test us second : dump check data failed for data!" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000000 ")
+        dump_res = tdSql.getResult("select * from dumptmp3.st")
+        if origin_res == dump_res:
+            tdLog.info(" test us second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test us second : dump check data failed for data! " )
+
+        
+        # ms second support test case
+
+        os.system("rm -rf ./taosdumptest/")
+        tdSql.execute("drop database if exists dumptmp1")
+        tdSql.execute("drop database if exists dumptmp2")
+        tdSql.execute("drop database if exists dumptmp3")
+
+        if not os.path.exists("./taosdumptest/tmp1"):
+            os.makedirs("./taosdumptest/dumptmp1")
+        else:
+            print("path exits!")
+
+        if not os.path.exists("./taosdumptest/dumptmp2"):
+            os.makedirs("./taosdumptest/dumptmp2")
+
+        if not os.path.exists("./taosdumptest/dumptmp3"):
+            os.makedirs("./taosdumptest/dumptmp3")
+
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosdump not found!")
+        else:
+            tdLog.info("taosdump found in %s" % buildPath)
+        binPath = buildPath + "/build/bin/"
+
+        self.createdb(precision="ms")
+
+        os.system(
+            "%staosdump --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath)
+
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000 -E 1625068860000  -C ms  -o ./taosdumptest/dumptmp2 ' %
+            binPath)
+        os.system(
+            '%staosdump --databases timedb1 -S 1625068810000  -o ./taosdumptest/dumptmp3  ' %
+            binPath)
+
+        os.system(
+            "sed -i \"s/timedb1/dumptmp1/g\" `grep timedb1 -rl ./taosdumptest/dumptmp1`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp2/g\" `grep timedb1 -rl ./taosdumptest/dumptmp2`")
+        os.system(
+            "sed -i \"s/timedb1/dumptmp3/g\" `grep timedb1 -rl ./taosdumptest/dumptmp3`")
+
+        os.system( "%staosdump -i ./taosdumptest/dumptmp1" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp2" %binPath)
+        os.system( "%staosdump -i ./taosdumptest/dumptmp3" %binPath)
+
+ 
+        tdSql.query("select count(*) from dumptmp1.st")
+        tdSql.checkData(0,0,1000)
+
+        tdSql.query("select count(*) from dumptmp2.st")
+        tdSql.checkData(0,0,510)
+
+        tdSql.query("select count(*) from dumptmp3.st")
+        tdSql.checkData(0,0,900)
+
+    
+        origin_res = tdSql.getResult("select * from timedb1.st")
+        dump_res = tdSql.getResult("select * from dumptmp1.st")
+        if origin_res == dump_res:
+            tdLog.info("test ms second : dump check data pass for all data!" )
+        else:
+            tdLog.info("test ms second : dump check data failed for all data!" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000 and ts <= 1625068860000")
+        dump_res = tdSql.getResult("select * from dumptmp2.st")
+        if origin_res == dump_res:
+            tdLog.info(" test ms second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test ms second : dump check data failed for data!" )
+        
+        origin_res = tdSql.getResult("select * from timedb1.st where ts >=1625068810000 ")
+        dump_res = tdSql.getResult("select * from dumptmp3.st")
+        if origin_res == dump_res:
+            tdLog.info(" test ms second : dump check data pass for data! " )
+        else:
+            tdLog.info(" test ms second : dump check data failed for data! " )
+
+        
+        os.system("rm -rf ./taosdumptest/")
+        os.system("rm -rf ./dump_result.txt")
+        os.system("rm -rf *.py.sql")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/update/merge_commit_data2_update0.py

@@ -27,7 +27,7 @@ class TDTestCase:
 
     def restart_taosd(self,db):
         tdDnodes.stop(1)
-        tdDnodes.startWithoutSleep(1)
+        tdDnodes.start(1)
         tdSql.execute("use %s;" % db)
 
     def date_to_timestamp_microseconds(self, date):

tests/pytest/util/cases.py

@@ -34,7 +34,7 @@ class TDCases:
         self.clusterCases = []
 
     def __dynamicLoadModule(self, fileName):
-        moduleName = fileName.replace(".py", "").replace("/", ".")
+        moduleName = fileName.replace(".py", "").replace(os.sep, ".")
         return importlib.import_module(moduleName, package='..')
 
     def logSql(self, logSql):
@@ -80,7 +80,7 @@ class TDCases:
                 runNum += 1
                 continue
 
-    def runAllWindows(self, conn):
+    def runAllWindows(self, conn, fileName):
         # TODO: load all Windows cases here
         runNum = 0
         for tmp in self.windowsCases:
@@ -101,12 +101,17 @@ class TDCases:
         for tmp in self.windowsCases:
             if tmp.name.find(fileName) != -1:
                 case = testModule.TDTestCase()
-                case.init(conn)
-                case.run()
+                case.init(conn, self._logSql)
+                try:
+                    case.run()
+                except Exception as e:
+                    tdLog.notice(repr(e))
+                    tdLog.exit("%s failed" % (fileName))
                 case.stop()
                 runNum += 1
                 continue
         tdLog.notice("total %d Windows case(s) executed" % (runNum))
+        
 
     def runAllCluster(self):
         # TODO: load all cluster case module here

tests/pytest/util/dnodes.py

@@ -14,15 +14,18 @@
 import sys
 import os
 import os.path
+import platform
+import pathlib
+import shutil
 import subprocess
 from time import sleep
 from util.log import *
 
 
 class TDSimClient:
-    def __init__(self):
+    def __init__(self, path):
         self.testCluster = False
-
+        self.path = path
         self.cfgDict = {
             "numOfLogLines": "100000000",
             "numOfThreadsPerCore": "2.0",
@@ -41,10 +44,7 @@ class TDSimClient:
             "jnidebugFlag": "135",
             "qdebugFlag": "135",
             "telemetryReporting": "0",
-            }
-    def init(self, path):
-        self.__init__()
-        self.path = path
+        }
 
     def getLogDir(self):
         self.logDir = "%s/sim/psim/log" % (self.path)
@@ -61,35 +61,48 @@ class TDSimClient:
         self.cfgDict.update({option: value})
 
     def cfg(self, option, value):
-        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
-
+    def os_string(self,path):
+        os_path = path.replace("/",os.sep)
+        return os_path
     def deploy(self):
-        self.logDir = "%s/sim/psim/log" % (self.path)
-        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
-        self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
-
-        cmd = "rm -rf " + self.logDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-    
-        cmd = "mkdir -p " + self.logDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        cmd = "rm -rf " + self.cfgDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        cmd = "mkdir -p " + self.cfgDir
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
-        cmd = "touch " + self.cfgPath
-        if os.system(cmd) != 0:
-            tdLog.exit(cmd)
-
+        self.logDir = self.os_string("%s/sim/psim/log" % (self.path))
+        self.cfgDir = self.os_string("%s/sim/psim/cfg" % (self.path))
+        self.cfgPath = self.os_string("%s/sim/psim/cfg/taos.cfg" % (self.path))
+
+        # cmd = "rm -rf " + self.logDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        if os.path.exists(self.logDir): 
+            try:
+                shutil.rmtree(self.logDir)
+            except:
+                tdLog.exit("del %s failed"%self.logDir)
+        # cmd = "mkdir -p " + self.logDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.logDir)
+        # cmd = "rm -rf " + self.cfgDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        if os.path.exists(self.cfgDir): 
+            try:
+                shutil.rmtree(self.cfgDir)
+            except:
+                tdLog.exit("del %s failed"%self.cfgDir)
+        # cmd = "mkdir -p " + self.cfgDir
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        os.makedirs(self.cfgDir)
+        # cmd = "touch " + self.cfgPath
+        # if os.system(cmd) != 0:
+        #     tdLog.exit(cmd)
+        try:
+            pathlib.Path(self.cfgPath).touch()
+        except:
+             tdLog.exit("create %s failed"%self.cfgPath)
         if self.testCluster:
             self.cfg("masterIp", "192.168.0.1")
             self.cfg("secondIp", "192.168.0.2")
@@ -246,7 +259,7 @@ class TDDnode:
             projPath = selfPath[:selfPath.find("tests")]
 
         for root, dirs, files in os.walk(projPath):
-            if ("taosd" in files):
+            if (("taosd") in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
                 if ("packaging" not in rootRealPath):
                     buildPath = root[:len(root)-len("/build/bin")]
@@ -404,7 +417,7 @@ class TDDnode:
             tdLog.exit(cmd)
 
     def cfg(self, option, value):
-        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        cmd = "echo %s %s >> %s" % (option, value, self.cfgPath)
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
 
@@ -480,8 +493,7 @@ class TDDnodes:
         for i in range(len(self.dnodes)):
             self.dnodes[i].init(self.path)
 
-        self.sim = TDSimClient()
-        self.sim.init(self.path)
+        self.sim = TDSimClient(self.path)
 
     def setTestCluster(self, value):
         self.testCluster = value