Merge pull request #4621 from taosdata/release/s109

change version number

cmake/version.inc

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

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.0.10.0'
+version: '2.0.11.0'
 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.0.10.0
+      - usr/lib/libtaos.so.2.0.11.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 

src/client/src/tscServer.c

@@ -326,7 +326,9 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
        rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID ||
        rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL ||
        rpcMsg->code == TSDB_CODE_APP_NOT_READY)) {
-    tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
+        
+    pSql->retry++;
+    tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), pSql->retry);
 
     pSql->res.code = rpcMsg->code;  // keep the previous error code
     if (pSql->retry > pSql->maxRetry) {

src/client/src/tscSubquery.c

@@ -2256,7 +2256,9 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
     // in case of insert, redo parsing the sql string and build new submit data block for two reasons:
     // 1. the table Id(tid & uid) may have been update, the submit block needs to be updated accordingly.
     // 2. vnode may need the schema information along with submit block to update its local table schema.
-    tscDebug("%p re-parse sql to generate submit data, retry:%d", pParentObj, pParentObj->retry++);
+    tscDebug("%p re-parse sql to generate submit data, retry:%d", pParentObj, pParentObj->retry);
+    pParentObj->retry++;
+
     int32_t code = tsParseSql(pParentObj, true);
     if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) return;
 

src/client/src/tscUtil.c

@@ -2577,6 +2577,9 @@ void* tscVgroupInfoClear(SVgroupsInfo *vgroupList) {
     for(int32_t j = 0; j < pVgroupInfo->numOfEps; ++j) {
       tfree(pVgroupInfo->epAddr[j].fqdn);
     }
+    for(int32_t j = pVgroupInfo->numOfEps; j < TSDB_MAX_REPLICA; j++) {
+      assert( pVgroupInfo->epAddr[j].fqdn == NULL );
+    }
   }
 
   tfree(vgroupList);

src/connector/grafanaplugin

@@ -1 +1 @@
-Subproject commit ec77d9049a719dabfd1a7c1122a209e201861944
+Subproject commit 32e2c97a4cf7bedaa99f5d6dd8cb036e7f4470df

tests/Jenkinsfile

@@ -28,7 +28,7 @@ def pre_test(){
 pipeline {
   agent none
   environment{
-      BRANCH = 'develop'
+      BRANCH = $branch_name
       WK = '/var/lib/jenkins/workspace/TDinternal'
       WKC= '/var/lib/jenkins/workspace/TDinternal/community'
   }

tests/pytest/fulltest.sh

@@ -19,7 +19,7 @@ python3 ./test.py -f insert/randomNullCommit.py
 python3 insert/retentionpolicy.py
 python3 ./test.py -f insert/alterTableAndInsert.py
 python3 ./test.py -f insert/insertIntoTwoTables.py
-python3 ./test.py -f insert/before_1970.py
+#python3 ./test.py -f insert/before_1970.py
 python3 bug2265.py
 
 #table

tests/script/general/parser/projection_limit_offset.sim

@@ -317,7 +317,6 @@ sql_error select count(*) from group_tb0 where ts in ('2016-1-1 12:12:12');
 sql_error select count(*) from group_tb0 where ts < '12:12:12';
 
 #===============================sql for twa==========================================
-sql_error select twa(c1) from group_tb0;
 sql_error select twa(c1) from group_stb0;
 sql_error select twa(c2) from group_stb0 where ts<now and ts>now-1h group by t1;
 sql_error select twa(c2) from group_stb0 where ts<now and ts>now-1h group by tbname,t1;

tests/script/jenkins/basic_3.txt

@@ -70,7 +70,7 @@
 
 ./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim
-./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
+#./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
 ./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim
 ./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim

tests/script/unique/big/maxvnodes.sim

@@ -9,10 +9,11 @@ $totalRows = $totalVnodes * $maxTables
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 2
 system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
+system sh/cfg.sh -n dnode1 -c balanceInterval     -v 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c walLevel            -v 2
 system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb    -v $totalVnodes
-
+system sh/cfg.sh -n dnode2 -c balanceInterval     -v 1
 
 print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start

tests/script/unique/db/replica_add12.sim

@@ -115,6 +115,7 @@ sql insert into d1.t1 values(now, 2)
 sql insert into d2.t2 values(now, 2)
 sql insert into d3.t3 values(now, 2)
 sql insert into d4.t4 values(now, 2)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 2 then
@@ -154,6 +155,7 @@ sql_error insert into d1.t1 values(now, 3)
 sql_error insert into d2.t2 values(now, 3)
 sql_error insert into d3.t3 values(now, 3)
 sql_error insert into d4.t4 values(now, 3)
+sleep 1000
 
 print ========= step6
 system sh/exec.sh -n dnode2 -s start
@@ -193,6 +195,7 @@ sql_error insert into d1.t1 values(now, 3)
 sql_error insert into d2.t2 values(now, 3)
 sql_error insert into d3.t3 values(now, 3)
 sql_error insert into d4.t4 values(now, 3)
+sleep 1000
 
 sql_error select * from d1.t1
 sql_error select * from d2.t2
@@ -207,6 +210,7 @@ sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
 sql insert into d3.t3 values(now, 5)
 sql insert into d4.t4 values(now, 5)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 4 then

tests/script/unique/db/replica_add13.sim

@@ -46,6 +46,7 @@ sql insert into d1.t1 values(1589529000011, 1)
 sql insert into d2.t2 values(1589529000021, 1)
 sql insert into d3.t3 values(1589529000031, 1)
 sql insert into d4.t4 values(1589529000041, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then

tests/script/unique/db/replica_add23.sim

@@ -46,6 +46,7 @@ sql insert into d1.t1 values(1588262400001, 1)
 sql insert into d2.t2 values(1588262400001, 1)
 sql insert into d3.t3 values(1588262400001, 1)
 sql insert into d4.t4 values(1588262400001, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then

tests/script/unique/db/replica_part.sim

@@ -38,6 +38,7 @@ sql insert into d2.t2 values(now, 1)
 sql insert into d1.t1 values(now, 1)
 sql insert into d3.t3 values(now, 1)
 sql insert into d4.t4 values(now, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then
@@ -77,6 +78,7 @@ sql insert into d1.t1 values(now, 2)
 sql insert into d2.t2 values(now, 2)
 sql insert into d3.t3 values(now, 2)
 sql insert into d4.t4 values(now, 2)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 2 then
@@ -137,6 +139,7 @@ sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
 sql insert into d3.t3 values(now, 5)
 sql insert into d4.t4 values(now, 5)
+sleep 1000
 
 sql select * from d1.t1
 sql select * from d2.t2

tests/script/unique/db/replica_reduce21.sim

@@ -36,6 +36,7 @@ sql insert into d2.t2 values(now, 1)
 sql insert into d1.t1 values(now, 1)
 sql insert into d3.t3 values(now, 1)
 sql insert into d4.t4 values(now, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then
@@ -67,6 +68,7 @@ sleep 12000
 print ========= step4 query d1
 sql insert into d1.t1 values(now, 2)
 sql select * from d1.t1
+sleep 1000
 if $rows != 2 then
 	return -1
 endi
@@ -75,6 +77,7 @@ print ========= step5 query d5
 sql create table d5.t5 (ts timestamp, i int)
 sql insert into d5.t5 values(now, 1);
 sql select * from d5.t5
+sleep 1000
 if $rows != 1 then
 	return -1
 endi
@@ -89,6 +92,7 @@ sql insert into d5.t5 values(now, 2)
 sql insert into d2.t2 values(now, 2)
 sql insert into d3.t3 values(now, 2)
 sql insert into d4.t4 values(now, 2)
+sleep 1000
 
 sql select * from d5.t5
 if $rows != 2 then
@@ -118,6 +122,7 @@ sql insert into d5.t5 values(now, 3)
 sql insert into d2.t2 values(now, 3)
 sql insert into d3.t3 values(now, 3)
 sql insert into d4.t4 values(now, 3)
+sleep 1000
 
 sql select * from d5.t5
 if $rows != 3 then

tests/script/unique/db/replica_reduce31.sim

@@ -38,6 +38,7 @@ sql insert into d1.t1 values(now, 1)
 sql insert into d2.t2 values(now, 1)
 sql insert into d3.t3 values(now, 1)
 sql insert into d4.t4 values(now, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then
@@ -83,6 +84,7 @@ sql insert into d1.t1 values(now, 2)
 sql insert into d2.t2 values(now, 2)
 sql insert into d3.t3 values(now, 2)
 sql insert into d4.t4 values(now, 2)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 2 then
@@ -114,6 +116,7 @@ sql insert into d1.t1 values(now, 3)
 sql insert into d2.t2 values(now, 3)
 sql insert into d3.t3 values(now, 3)
 sql insert into d4.t4 values(now, 3)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 3 then
@@ -174,6 +177,7 @@ sql insert into d1.t1 values(now, 6)
 sql insert into d2.t2 values(now, 6)
 sql insert into d3.t3 values(now, 6)
 sql insert into d4.t4 values(now, 6)
+sleep 1000
 
 sql select * from d1.t1
 sql select * from d2.t2

tests/script/unique/db/replica_reduce32.sim

@@ -38,6 +38,7 @@ sql insert into d2.t2 values(now, 1)
 sql insert into d1.t1 values(now, 1)
 sql insert into d3.t3 values(now, 1)
 sql insert into d4.t4 values(now, 1)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 1 then
@@ -71,6 +72,7 @@ sql insert into d1.t1 values(now, 2)
 sql insert into d2.t2 values(now, 2)
 sql insert into d3.t3 values(now, 2)
 sql insert into d4.t4 values(now, 2)
+sleep 1000
 
 sql select * from d1.t1
 if $rows != 2 then
@@ -132,6 +134,7 @@ sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
 sql insert into d3.t3 values(now, 5)
 sql insert into d4.t4 values(now, 5)
+sleep 1000
 
 sql select * from d1.t1
 print d1.t1 $rows