Merge pull request #14198 from taosdata/fix/ZhiqiangWang/TD-16357-add-test-time-count-print

test: add test time count print

source/dnode/mnode/impl/test/db/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME dbTest
-        COMMAND dbTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME dbTest
+    COMMAND dbTest
+)

source/dnode/mnode/impl/test/func/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME funcTest
-        COMMAND funcTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME funcTest
+    COMMAND funcTest
+)
\ No newline at end of file

source/dnode/mnode/impl/test/profile/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME profileTest
-        COMMAND profileTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME profileTest
+    COMMAND profileTest
+)

source/dnode/mnode/impl/test/show/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME showTest
-        COMMAND showTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME showTest
+    COMMAND showTest
+)

source/dnode/mnode/impl/test/sma/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME smaTest
-        COMMAND smaTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME smaTest
+    COMMAND smaTest
+)

source/dnode/mnode/impl/test/stb/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME stbTest
-        COMMAND stbTest
-    )
-endif(NOT TD_WINDOWS)
\ No newline at end of file
+add_test(
+    NAME stbTest
+    COMMAND stbTest
+)
\ No newline at end of file

source/dnode/mnode/impl/test/user/CMakeLists.txt

@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME userTest
-        COMMAND userTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME userTest
+    COMMAND userTest
+)

source/libs/parser/src/parInsertData.c

@@ -26,6 +26,7 @@
 typedef struct SBlockKeyTuple {
   TSKEY skey;
   void* payloadAddr;
+  int16_t index;
 } SBlockKeyTuple;
 
 typedef struct SBlockKeyInfo {
@@ -36,7 +37,6 @@ typedef struct SBlockKeyInfo {
 static int32_t rowDataCompar(const void* lhs, const void* rhs) {
   TSKEY left = *(TSKEY*)lhs;
   TSKEY right = *(TSKEY*)rhs;
-
   if (left == right) {
     return 0;
   } else {
@@ -44,6 +44,16 @@ static int32_t rowDataCompar(const void* lhs, const void* rhs) {
   }
 }
 
+static int32_t rowDataComparStable(const void* lhs, const void* rhs) {
+  TSKEY left = *(TSKEY*)lhs;
+  TSKEY right = *(TSKEY*)rhs;
+  if (left == right) {
+    return ((SBlockKeyTuple*)lhs)->index - ((SBlockKeyTuple*)rhs)->index;
+  } else {
+    return left > right ? 1 : -1;
+  }
+}
+
 void setBoundColumnInfo(SParsedDataColInfo* pColList, SSchema* pSchema, col_id_t numOfCols) {
   pColList->numOfCols = numOfCols;
   pColList->numOfBound = numOfCols;
@@ -343,6 +353,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
   while (n < nRows) {
     pBlkKeyTuple->skey = TD_ROW_KEY((STSRow*)pBlockData);
     pBlkKeyTuple->payloadAddr = pBlockData;
+    pBlkKeyTuple->index = n;
 
     // next loop
     pBlockData += extendedRowSize;
@@ -354,7 +365,7 @@ int sortRemoveDataBlockDupRows(STableDataBlocks* dataBuf, SBlockKeyInfo* pBlkKey
     pBlkKeyTuple = pBlkKeyInfo->pKeyTuple;
 
     // todo. qsort is unstable, if timestamp is same, should get the last one
-    qsort(pBlkKeyTuple, nRows, sizeof(SBlockKeyTuple), rowDataCompar);
+    qsort(pBlkKeyTuple, nRows, sizeof(SBlockKeyTuple), rowDataComparStable);
 
     pBlkKeyTuple = pBlkKeyInfo->pKeyTuple;
     int32_t i = 0;

source/libs/planner/test/CMakeLists.txt

@@ -32,9 +32,7 @@ if(${BUILD_WINGETOPT})
     target_link_libraries(plannerTest PUBLIC wingetopt)
 endif()
 
-# if(NOT TD_WINDOWS)
-    add_test(
-        NAME plannerTest
-        COMMAND plannerTest
-    )
-# endif(NOT TD_WINDOWS)
+add_test(
+    NAME plannerTest
+    COMMAND plannerTest
+)

tests/script/sh/cfg.bat

@@ -16,12 +16,12 @@ rem echo NODE:       %NODE%
 set SCRIPT_DIR=%~dp0..\
 rem echo SCRIPT_DIR: %SCRIPT_DIR%
 
-set BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\
+echo %cd% | grep community > nul && set "BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\" || set "BUILD_DIR=%SCRIPT_DIR%..\..\debug\build\bin\"
 set TSIM=%BUILD_DIR%tsim
 rem echo BUILD_DIR:  %BUILD_DIR%
 rem echo TSIM:       %TSIM%
 
-set SIM_DIR=%SCRIPT_DIR%..\..\..\sim\
+echo %cd% | grep community > nul && set "SIM_DIR=%SCRIPT_DIR%..\..\..\sim\" || set "SIM_DIR=%SCRIPT_DIR%..\..\sim\"
 rem echo SIM_DIR:    %SIM_DIR%
 
 set NODE_DIR=%SIM_DIR%%NODE_NAME%\

tests/script/sh/copy_udf.bat

@@ -4,7 +4,7 @@ echo Executing copy_udf.bat
 set SCRIPT_DIR=%cd%
 echo SCRIPT_DIR: %SCRIPT_DIR%
 
-cd ..\..\..
+echo %cd% | grep community > nul && cd ..\..\.. || cd ..\..
 set TAOS_DIR=%cd%
 echo find udf library in %TAOS_DIR%
 set UDF1_DIR=%TAOS_DIR%\debug\build\lib\udf1.dll

tests/script/sh/deploy.bat

@@ -13,12 +13,12 @@ rem echo NODE:       %NODE%
 set SCRIPT_DIR=%~dp0..\
 rem echo SCRIPT_DIR: %SCRIPT_DIR%
 
-set BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\
+echo %cd% | grep community > nul && set "BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\" || set "BUILD_DIR=%SCRIPT_DIR%..\..\debug\build\bin\"
 set TSIM=%BUILD_DIR%tsim
 rem echo BUILD_DIR:  %BUILD_DIR%
 rem echo TSIM:       %TSIM%
 
-set SIM_DIR=%SCRIPT_DIR%..\..\..\sim\
+echo %cd% | grep community > nul && set "SIM_DIR=%SCRIPT_DIR%..\..\..\sim\" || set "SIM_DIR=%SCRIPT_DIR%..\..\sim\"
 rem echo SIM_DIR:    %SIM_DIR%
 
 set NODE_DIR=%SIM_DIR%%NODE_NAME%\

tests/script/sh/exec.bat

@@ -13,12 +13,12 @@ rem echo NODE:       %EXEC_OPTON%
 set SCRIPT_DIR=%~dp0..\
 rem echo SCRIPT_DIR: %SCRIPT_DIR%
 
-set BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\
+echo %cd% | grep community > nul && set "BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\" || set "BUILD_DIR=%SCRIPT_DIR%..\..\debug\build\bin\"
 set TAOSD=%BUILD_DIR%taosd
 rem echo BUILD_DIR:  %BUILD_DIR%
 rem echo TAOSD:      %TAOSD%
 
-set SIM_DIR=%SCRIPT_DIR%..\..\..\sim\
+echo %cd% | grep community > nul && set "SIM_DIR=%SCRIPT_DIR%..\..\..\sim\" || set "SIM_DIR=%SCRIPT_DIR%..\..\sim\"
 rem echo SIM_DIR:    %SIM_DIR%
 
 set NODE_DIR=%SIM_DIR%%NODE_NAME%\

tests/script/tsim/sync/3Replica1VgElect.sim

@@ -197,22 +197,22 @@ print $switch_loop_cnt
 
 if $switch_loop_cnt == 1 then
   sql show vgroups
-  $dnodeId = $data[1][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 2 then
   sql show vgroups
-  $dnodeId = $data[2][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 3 then
   sql show vgroups
-  $dnodeId = $data[3][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 4 then
   sql show vgroups
-  $dnodeId = $data[4][3]  
+  $dnodeId = $data[0][3]  
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 else

tests/script/tsim/sync/3Replica5VgElect.sim

@@ -290,22 +290,22 @@ print $switch_loop_cnt
 
 if $switch_loop_cnt == 1 then
   sql show vgroups
-  $dnodeId = $data[1][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 2 then
   sql show vgroups
-  $dnodeId = $data[2][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 3 then
   sql show vgroups
-  $dnodeId = $data[3][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 4 then
   sql show vgroups
-  $dnodeId = $data[4][3]  
+  $dnodeId = $data[0][3]  
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 else

tests/script/tsim/sync/oneReplica5VgElect.sim

@@ -227,22 +227,22 @@ print $switch_loop_cnt
 
 if $switch_loop_cnt == 1 then
   sql show vgroups
-  $dnodeId = $data[1][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 2 then
   sql show vgroups
-  $dnodeId = $data[2][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 3 then
   sql show vgroups
-  $dnodeId = $data[3][3]
+  $dnodeId = $data[0][3]
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 elif $switch_loop_cnt == 4 then
   sql show vgroups
-  $dnodeId = $data[4][3]  
+  $dnodeId = $data[0][3]  
   $dnodeId = dnode . $dnodeId
   goto switch_leader_to_offine_loop
 else

tests/script/tsim/tmq/consume.bat

+
+@echo off
+
+set EXEC_OPTON=start
+set DB_NAME=db 
+set CDB_NAME=db
+set /a POLL_DELAY=5
+set /a VALGRIND=0
+set SIGNAL=SIGINT
+set /a SHOW_MSG=0
+set /a SHOW_ROW=0
+set /a EXP_USE_SNAPSHOT=0
+
+:param
+if "%1"=="" (
+    goto :end
+)
+if %1 == -d ( set "DB_NAME=%2" && shift && shift && goto :param )
+if %1 == -g ( set "SHOW_MSG=%2" && shift && shift && goto :param )
+if %1 == -r ( set "SHOW_ROW=%2" && shift && shift && goto :param )
+if %1 == -s ( set "EXEC_OPTON=%2" && shift && shift && goto :param )
+if %1 == -v ( set "VALGRIND=1" && shift && goto :param )
+if %1 == -y ( set "POLL_DELAY=%2" && shift && shift && goto :param )
+if %1 == -x ( set "SIGNAL=%2" && shift && shift && goto :param )
+if %1 == -w ( set "CDB_NAME=%2" && shift && shift && goto :param )
+if %1 == -e ( set "EXP_USE_SNAPSHOT=%2" && shift && shift && goto :param )
+echo unkown argument %1
+goto :eof
+:end
+
+echo EXEC_OPTON %EXEC_OPTON%
+echo DB_NAME %DB_NAME%
+echo CDB_NAME %CDB_NAME%
+echo POLL_DELAY %POLL_DELAY%
+echo VALGRIND %VALGRIND%
+echo SIGNAL %SIGNAL%
+echo SHOW_MSG %SHOW_MSG%
+echo SHOW_ROW %SHOW_ROW%
+echo EXP_USE_SNAPSHOT %EXP_USE_SNAPSHOT%
+
+echo %cd% | grep community > nul && cd  ..\..\.. || cd  ..\..
+set BUILD_DIR=%cd%\debug\build\bin
+set SIM_DIR=%cd%\sim
+set PRG_DIR=%SIM_DIR%\tsim
+set CFG_DIR=%PRG_DIR%\cfg
+set LOG_DIR=%PRG_DIR%\log
+set PROGRAM=%BUILD_DIR%\tmq_sim.exe
+
+echo ------------------------------------------------------------------------
+echo BUILD_DIR  : %BUILD_DIR%
+echo SIM_DIR    : %SIM_DIR%
+echo CFG_DIR    : %CFG_DIR%
+echo PRG_DIR    : %PRG_DIR%
+echo CFG_DIR    : %CFG_DIR%
+echo LOG_DIR    : %LOG_DIR%
+echo PROGRAM    : %PROGRAM%
+echo POLL_DELAY : %POLL_DELAY% 
+echo DB_NAME    : %DB_NAME%
+echo ------------------------------------------------------------------------
+
+if "%EXEC_OPTON%" == "start" ( 
+  echo  mintty -h never %PROGRAM% -c %CFG_DIR% -y %POLL_DELAY% -d %DB_NAME% -g %SHOW_MSG% -r %SHOW_ROW% -w %CDB_NAME% -e %EXP_USE_SNAPSHOT%
+  mintty -h never %PROGRAM% -c %CFG_DIR% -y %POLL_DELAY% -d %DB_NAME% -g %SHOW_MSG% -r %SHOW_ROW% -w %CDB_NAME% -e %EXP_USE_SNAPSHOT%
+) else (
+  if "%SIGNAL%" == "SIGKILL" ( ps | grep tmq_sim | awk '{print $2}' | xargs kill -9 ) else ( ps | grep tmq_sim | awk '{print $2}' | xargs kill -SIGINT )
+)
+goto :eof

tests/script/wtest.bat

@@ -6,12 +6,12 @@ rem echo Start TDengine Testing Case ...
 set "SCRIPT_DIR=%~dp0"
 rem echo SCRIPT_DIR: %SCRIPT_DIR%
 
-set "BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\"
+echo %cd% | grep community > nul && set "BUILD_DIR=%SCRIPT_DIR%..\..\..\debug\build\bin\" || set "BUILD_DIR=%SCRIPT_DIR%..\..\debug\build\bin\"
 set "TSIM=%BUILD_DIR%tsim"
 rem echo BUILD_DIR:  %BUILD_DIR%
 rem echo TSIM:       %TSIM%
 
-set "SIM_DIR=%SCRIPT_DIR%..\..\..\sim\"
+echo %cd% | grep community > nul && set "SIM_DIR=%SCRIPT_DIR%..\..\..\sim\" || set "SIM_DIR=%SCRIPT_DIR%..\..\sim\"
 rem echo SIM_DIR:    %SIM_DIR%
 
 set "TSIM_DIR=%SIM_DIR%tsim\"

tests/system-test/0-others/taosShell.py

@@ -44,13 +44,13 @@ def taos_command (buildPath, key, value, expectString, cfgDir, sqlString='', key
 
     tdLog.info ("taos cmd: %s" % taosCmd)
 
-    child = taosExpect.spawn(taosCmd, timeout=3)
+    child = taosExpect.spawn(taosCmd, timeout=10)
     #output = child.readline()
     #print (output.decode())
     if len(expectString) != 0:
-        i = child.expect([expectString, taosExpect.TIMEOUT, taosExpect.EOF], timeout=6)
+        i = child.expect([expectString, taosExpect.TIMEOUT, taosExpect.EOF], timeout=10)
     else:
-        i = child.expect([taosExpect.TIMEOUT, taosExpect.EOF], timeout=6)
+        i = child.expect([taosExpect.TIMEOUT, taosExpect.EOF], timeout=10)
 
     if platform.system().lower() == 'windows':
         retResult = child.before

tests/system-test/simpletest.bat

 
-@REM python3 .\test.py -f 0-others\taosShell.py
-@REM python3 .\test.py -f 0-others\taosShellError.py
+python3 .\test.py -f 0-others\taosShell.py
+python3 .\test.py -f 0-others\taosShellError.py
 python3 .\test.py -f 0-others\taosShellNetChk.py
 python3 .\test.py -f 0-others\telemetry.py
 python3 .\test.py -f 0-others\taosdMonitor.py
 python3 .\test.py -f 0-others\udfTest.py
-@REM python3 .\test.py -f 0-others\udf_create.py
-@REM python3 .\test.py -f 0-others\udf_restart_taosd.py
+python3 .\test.py -f 0-others\udf_create.py
+python3 .\test.py -f 0-others\udf_restart_taosd.py
 @REM python3 .\test.py -f 0-others\cachelast.py
 
 @REM python3 .\test.py -f 0-others\user_control.py

tests/system-test/test.py

@@ -38,7 +38,9 @@ def checkRunTimeError():
     while 1:
         time.sleep(1)
         timeCount = timeCount + 1
+        print("checkRunTimeError",timeCount)
         if (timeCount>900):
+            print("stop the test.")
             os.system("TASKKILL /F /IM taosd.exe")
             os.system("TASKKILL /F /IM taos.exe")
             os.system("TASKKILL /F /IM tmq_sim.exe")