Merge branch '3.0' into fix/liao_cov

source/libs/stream/src/streamState.c

@@ -650,10 +650,10 @@ int32_t streamStateSessionGetKey(SStreamState* pState, const SSessionKey* key, S
     if (code == 0 && sessionKeyCmpr(key, &tmpKey) == 0) {
       res = 0;
       resKey = tmpKey;
+      streamStateCurPrev(pState, pCur);
     } else {
       break;
     }
-    streamStateCurPrev(pState, pCur);
   }
   *curKey = resKey;
   streamStateFreeCur(pCur);
@@ -700,9 +700,14 @@ int32_t streamStateStateAddIfNotExist(SStreamState* pState, SSessionKey* key, ch
       memcpy(tmp, *pVal, valSize);
       goto _end;
     }
+
+    streamStateCurNext(pState, pCur);
+  } else {
+    *key = tmpKey;
+    streamStateFreeCur(pCur);
+    pCur = streamStateSessionSeekKeyNext(pState, key);
   }
 
-  streamStateCurNext(pState, pCur);
   code = streamStateSessionGetKVByCur(pCur, key, (const void**)pVal, pVLen);
   if (code == 0) {
     void* stateKey = (char*)(*pVal) + (valSize - keyDataLen);

tests/docs-examples-test/taosx.sh

+#!/bin/bash
+
+set -e
+
+taosd >>/dev/null 2>&1 &
+taosadapter >>/dev/null 2>&1 &
+sleep 5
+
+taosBenchmark -y -n 10000 -t 1000
+
+taosx run -f 'tmq:///test' -t 'taos:///test1' -y
+
+taos -s 'select count(*) from test1.meters' |grep 10000000 || (echo database sync failed!; exit 1)
+
+taosx run -f 'tmq:///test' -t 'local:./test-backup' -y
+taosx run -f 'local:./test-backup' -t 'taos:///test2' -y
+
+rm -rf ./test-backup

tests/parallel_test/container_build.sh

@@ -52,7 +52,7 @@ fi
 
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true;make -j $THREAD_COUNT"
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true -DBUILD_TAOSX=true;make -j $THREAD_COUNT"
 
 ret=$?
 exit $ret

tests/script/tsim/stream/state0.sim

@@ -449,12 +449,12 @@ if $data26 != 14 then
   return -1
 endi
 
-sql create database test1 vgroups 1
-sql select * from information_schema.ins_databases
+sql create database test1 vgroups 1;
+sql select * from information_schema.ins_databases;
 
 print $data00 $data01 $data02
 
-sql use test1
+sql use test1;
 
 sql create table t1(ts timestamp, a int, b int , c int, d double, id int);
 sql create stream streams2 trigger at_once  into streamt1 as select  _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(a)  c4, min(c) c5, max(id) c from t1 state_window(a);
@@ -498,7 +498,50 @@ if $data15 != 3 then
   goto loop5
 endi
 
-sql drop database test;
-sql drop database test1;
+sql create database test3 vgroups 1;
+sql use test3;
+
+sql create table t1(ts timestamp, a int, b int , c int, d double, id int);
+sql create stream streams3 trigger at_once  into streamt3 as select  _wstart, count(*) c1, sum(b) c3 from t1 state_window(a);
+sql insert into t1 values(1648791212000,1,2,3,1.0,1);
+sql insert into t1 values(1648791213000,2,2,3,1.0,1);
+sql insert into t1 values(1648791214000,3,2,4,1.0,2);
+sql insert into t1 values(1648791215000,4,2,3,1.0,1);
+sql insert into t1 values(1648791211000,5,2,3,1.0,1);
+sql insert into t1 values(1648791210000,6,2,4,1.0,2);
+sql insert into t1 values(1648791217000,7,2,3,1.0,1);
+sql insert into t1 values(1648791219000,8,2,3,1.0,1);
+sql insert into t1 values(1648791209000,9,2,4,1.0,2);
+sql insert into t1 values(1648791220000,10,2,4,1.0,2);
+
+sql insert into t1 values(1648791212000,1,2,3,1.0,1);
+sql insert into t1 values(1648791213000,2,2,3,1.0,1);
+sql insert into t1 values(1648791214000,3,2,4,1.0,2);
+sql insert into t1 values(1648791215000,4,2,3,1.0,1);
+sql insert into t1 values(1648791211000,5,2,3,1.0,1);
+sql insert into t1 values(1648791210000,6,2,4,1.0,2);
+sql insert into t1 values(1648791217000,7,2,3,1.0,1);
+sql insert into t1 values(1648791219000,8,2,3,1.0,1);
+sql insert into t1 values(1648791209000,9,2,4,1.0,2);
+sql insert into t1 values(1648791220000,10,2,4,1.0,2);
+
+
+$loop_count = 0
+loop6:
+
+sleep 300
+
+sql select * from streamt3;
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+if $rows != 10 then
+  print =====rows=$rows
+  goto loop6
+endi
+
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT