Merge branch 'main' of https://github.com/taosdata/TDengine into main

Jenkinsfile2

@@ -313,7 +313,8 @@ def pre_test_build_win() {
     bat '''
         cd %WIN_CONNECTOR_ROOT%
         python.exe -m pip install --upgrade pip
-        python -m pip install .
+        python -m pip uninstall taospy -y 
+        python -m pip install taospy==2.7.3
         xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
     '''
     return 1
@@ -331,8 +332,6 @@ def run_win_test() {
     bat '''
         echo "windows test ..."
         cd %WIN_CONNECTOR_ROOT%
-        python.exe -m pip install --upgrade pip
-        python -m pip install .
         xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
         ls -l C:\\Windows\\System32\\taos.dll
         time /t

source/dnode/vnode/src/tsdb/tsdbSnapshot.c

@@ -198,7 +198,7 @@ static int32_t tsdbSnapCmprData(STsdbSnapReader* pReader, uint8_t** ppData) {
   ASSERT(pReader->bData.nRow);
 
   int32_t aBufN[5] = {0};
-  code = tCmprBlockData(&pReader->bData, TWO_STAGE_COMP, NULL, NULL, pReader->aBuf, aBufN);
+  code = tCmprBlockData(&pReader->bData, NO_COMPRESSION, NULL, NULL, pReader->aBuf, aBufN);
   if (code) goto _exit;
 
   int32_t size = aBufN[0] + aBufN[1] + aBufN[2] + aBufN[3];
@@ -276,7 +276,7 @@ static int32_t tsdbSnapReadTimeSeriesData(STsdbSnapReader* pReader, uint8_t** pp
       code = tsdbSnapReadNextRow(pReader, &pRowInfo);
       TSDB_CHECK_CODE(code, lino, _exit);
 
-      if (pReader->bData.nRow >= 4096) break;
+      if (pReader->bData.nRow >= 81920) break;
     } while (pRowInfo);
 
     ASSERT(pReader->bData.nRow > 0);

tests/parallel_test/run_case.sh

@@ -69,6 +69,12 @@ ulimit -c unlimited
 
 md5sum /usr/lib/libtaos.so.1
 md5sum /home/TDinternal/debug/build/lib/libtaos.so
+
+#define taospy 2.7.3
+pip3 list|grep taospy
+pip3 uninstall taospy -y
+pip3 install taospy==2.7.3
+
 $TIMEOUT_CMD $cmd
 RET=$?
 echo "cmd exit code: $RET"
@@ -76,6 +82,7 @@ md5sum /usr/lib/libtaos.so.1
 md5sum /home/TDinternal/debug/build/lib/libtaos.so
 pip3 install taospy==2.7.3
 
+
 if [ $RET -ne 0 ]; then
     pwd
 fi

tests/parallel_test/run_container.sh

@@ -130,8 +130,6 @@ docker run \
     -v ${SOURCEDIR}:/usr/local/src/ \
     -v "$TMP_DIR/thread_volume/$thread_no/sim:${SIM_DIR}" \
     -v ${TMP_DIR}/thread_volume/$thread_no/coredump:$coredump_dir \
-    -v $WORKDIR/taos-connector-python/taos:/usr/local/lib/python3.8/site-packages/taos:ro \
-    -v $WORKDIR/taos-connector-python/taosrest:/usr/local/lib/python3.8/site-packages/taosrest:ro \
     --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/tests/parallel_test/run_case.sh -d "$exec_dir" -c "$cmd" $extra_param
 ret=$?
 exit $ret