From fcf8d3962d16ae6a62818ef9ff928a3d7dea9f94 Mon Sep 17 00:00:00 2001
From: dapan1121 <72057773+dapan1121@users.noreply.github.com>
Date: Fri, 10 Mar 2023 21:58:52 +0800
Subject: [PATCH] fix: File inconsistance in replica issue (#20405)

* fix: File inconsistance in replica issue

* ci:Specify the version of the python connector

* ci:Specify the version of the python connector

---------

Co-authored-by: chenhaoran <haoran920c@163.com>
---
 src/query/src/qExecutor.c            | 8 ++++++--
 tests/parallel_test/run_case.sh      | 6 ++++++
 tests/parallel_test/run_container.sh | 1 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 824c9f132b..858673212c 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -52,6 +52,7 @@ enum {
   TS_JOIN_TS_EQUAL = 0,
   TS_JOIN_TS_NOT_EQUALS = 1,
   TS_JOIN_TAG_NOT_EQUALS = 2,
+  TS_JOIN_BLOCK_IGNORE = 3,
 };
 
 typedef enum SResultTsInterpType {
@@ -3231,13 +3232,13 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv* pRuntimeEnv, TSKEY key, tVariant
     if (key < elem.ts) {
       return TS_JOIN_TS_NOT_EQUALS;
     } else if (key > elem.ts) {
-      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_INCONSISTAN);
+      return TS_JOIN_BLOCK_IGNORE;
     }
   } else {
     if (key > elem.ts) {
       return TS_JOIN_TS_NOT_EQUALS;
     } else if (key < elem.ts) {
-      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_INCONSISTAN);
+      return TS_JOIN_BLOCK_IGNORE;
     }
   }
 
@@ -3422,6 +3423,9 @@ void filterColRowsInDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SSDataBlock* pBlock
       } else if (ret == TS_JOIN_TS_NOT_EQUALS) {
         all = false;
         continue;
+      } else if (ret == TS_JOIN_BLOCK_IGNORE) {
+        all = false;
+        break;
       } else {
         assert(ret == TS_JOIN_TS_EQUAL);
         p[offset] = true;
diff --git a/tests/parallel_test/run_case.sh b/tests/parallel_test/run_case.sh
index 50b8b5fcfe..8522207b9c 100755
--- a/tests/parallel_test/run_case.sh
+++ b/tests/parallel_test/run_case.sh
@@ -50,6 +50,12 @@ mkdir -p /var/lib/taos/subscribe
 cd $CONTAINER_TESTDIR/tests/$exec_dir
 ulimit -c unlimited
 
+#define taospy 2.7.3
+pip3 list|grep taospy
+pip3 uninstall taospy -y 
+pip3 install taospy==2.7.3
+
+
 $TIMEOUT_CMD $cmd
 RET=$?
 
diff --git a/tests/parallel_test/run_container.sh b/tests/parallel_test/run_container.sh
index 31e0ccd51b..8d5ae4e990 100755
--- a/tests/parallel_test/run_container.sh
+++ b/tests/parallel_test/run_container.sh
@@ -96,7 +96,6 @@ docker run \
     -v $REPDIR/packaging:$CONTAINER_TESTDIR/packaging:ro \
     -v $REPDIR/README.md:$CONTAINER_TESTDIR/README.md:ro \
     -v $REPDIR/docs:$CONTAINER_TESTDIR/docs \
-    -v $REPDIR/src/connector/python/taos:/usr/local/lib/python3.8/site-packages/taos:ro \
     -e LD_LIBRARY_PATH=/home/debug/build/lib:/home/debug/build/lib64 \
     --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/tests/parallel_test/run_case.sh -d "$exec_dir" -c "$cmd" $timeout_param
 ret=$?
-- 
GitLab