Merge branch 'develop' into feature/2.0tsdb

src/client/src/tscUtil.c

@@ -1840,7 +1840,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
     size_t size = taosArrayGetSize(pNewQueryInfo->colList);
     
     tscTrace(
-        "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%z, colList:%z,"
+        "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%zu, colList:%zu,"
         "fieldInfo:%d, name:%s, qrang:%" PRId64 " - %" PRId64 " order:%d, limit:%" PRId64,
         pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
         size, pNewQueryInfo->fieldsInfo.numOfOutput, pFinalInfo->name, pNewQueryInfo->window.skey,

src/rpc/src/rpcMain.c

@@ -574,19 +574,13 @@ static void rpcReleaseConn(SRpcConn *pConn) {
     char hashstr[40] = {0};
     size_t size = snprintf(hashstr, sizeof(hashstr), "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
     taosHashRemove(pRpc->hash, hashstr, size);
-  
     rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
-    pConn->pRspMsg = NULL;
-    pConn->inType = 0;
-    pConn->inTranId = 0;
-  } else {
-    pConn->outType = 0;
-    pConn->outTranId = 0;
-    pConn->pReqMsg = NULL;
   } 
 
   taosFreeId(pRpc->idPool, pConn->sid);
-  pConn->pContext = NULL;
+  int64_t lockedBy = pConn->lockedBy; 
+  memset(pConn, 0, sizeof(SRpcConn));
+  pConn->lockedBy = lockedBy;
 
   tTrace("%s, rpc connection is released", pConn->info);
 }
@@ -611,7 +605,6 @@ static SRpcConn *rpcAllocateClientConn(SRpcInfo *pRpc) {
     terrno = TSDB_CODE_RPC_MAX_SESSIONS;
   } else {
     pConn = pRpc->connList + sid;
-    memset(pConn, 0, sizeof(SRpcConn));
 
     pConn->pRpc = pRpc;
     pConn->sid = sid;

tests/script/fullGeneralSuite.sim

 #unsupport run general/alter/cached_schema_after_alter.sim
-#unsupport run general/alter/count.sim
-#unsupport run general/alter/import.sim
+run general/alter/count.sim
+run general/alter/import.sim
 #unsupport run general/alter/insert1.sim
-#unsupport run general/alter/insert2.sim
-#unsupport run general/alter/metrics.sim
-#unsupport run general/alter/table.sim
+run general/alter/insert2.sim
+run general/alter/metrics.sim
+run general/alter/table.sim
 run general/cache/new_metrics.sim
 run general/cache/restart_metrics.sim
 run general/cache/restart_table.sim
@@ -87,8 +87,8 @@ run general/insert/query_file_memory.sim
 run general/insert/query_multi_file.sim
 run general/insert/tcp.sim
 #unsupport run general/parser/alter.sim
-#unsupport run general/parser/alter1.sim
-#unsupport run general/parser/alter_stable.sim
+run general/parser/alter1.sim
+run general/parser/alter_stable.sim
 run general/parser/auto_create_tb.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/col_arithmetic_operation.sim
@@ -125,13 +125,13 @@ run general/parser/fill.sim
 run general/parser/fill_stb.sim
 run general/parser/interp.sim
 run general/parser/where.sim
-#unsupport run general/parser/join.sim
-#unsupport run general/parser/join_multivnode.sim
+run general/parser/join.sim
+run general/parser/join_multivnode.sim
 run general/parser/select_with_tags.sim
-#unsupport run general/parser/groupby.sim
-#unsupport run general/parser/bug.sim
-#unsupport run general/parser/tags_dynamically_specifiy.sim
-#unsupport run general/parser/set_tag_vals.sim
+run general/parser/groupby.sim
+run general/parser/bug.sim
+run general/parser/tags_dynamically_specifiy.sim
+run general/parser/set_tag_vals.sim
 #unsupport run general/parser/repeatAlter.sim
 #unsupport run general/parser/slimit_alter_tags.sim
 #unsupport run general/parser/stream_on_sys.sim
@@ -173,25 +173,25 @@ run general/tag/3.sim
 run general/tag/4.sim
 run general/tag/5.sim
 run general/tag/6.sim
-#unsupport run general/tag/add.sim
+run general/tag/add.sim
 run general/tag/bigint.sim
 run general/tag/binary_binary.sim
 run general/tag/binary.sim
 run general/tag/bool_binary.sim
 run general/tag/bool_int.sim
 run general/tag/bool.sim
-#unsupport run general/tag/change.sim
+run general/tag/change.sim
 run general/tag/column.sim
 #unsupport run general/tag/commit.sim
 run general/tag/create.sim
-#unsupport run general/tag/delete.sim
+run general/tag/delete.sim
 run general/tag/double.sim
 run general/tag/filter.sim
 run general/tag/float.sim
 run general/tag/int_binary.sim
 run general/tag/int_float.sim
 run general/tag/int.sim
-#unsupport run general/tag/set.sim
+run general/tag/set.sim
 run general/tag/smallint.sim
 run general/tag/tinyint.sim
 run general/user/authority.sim
@@ -211,6 +211,7 @@ run general/vector/table_field.sim
 run general/vector/table_mix.sim
 run general/vector/table_query.sim
 run general/vector/table_time.sim
+run general/stream/restart_stream.sim
 run general/stream/stream_1.sim
 run general/stream/stream_2.sim
 run general/stream/stream_3.sim

tests/script/jenkins/basic.txt

@@ -120,7 +120,7 @@ cd ../../../debug; make
 #./test.sh -f general/parser/import_file.sim
 ./test.sh -f general/parser/lastrow.sim
 ./test.sh -f general/parser/nchar.sim
-#./test.sh -f general/parser/null_char.sim
+./test.sh -f general/parser/null_char.sim
 ./test.sh -f general/parser/single_row_in_tb.sim
 ./test.sh -f general/parser/select_from_cache_disk.sim
 ./test.sh -f general/parser/mixed_blocks.sim
@@ -159,20 +159,20 @@ cd ../../../debug; make
 ./test.sh -f general/stable/values.sim
 ./test.sh -f general/stable/vnode3.sim
 
-./test.sh general/stream/stream_1.sim
-./test.sh general/stream/stream_2.sim
-./test.sh general/stream/stream_3.sim
-./test.sh general/stream/stream_restart.sim
-./test.sh general/stream/table_1.sim
-./test.sh general/stream/metrics_1.sim
-./test.sh general/stream/table_n.sim
-./test.sh general/stream/metrics_n.sim
-./test.sh general/stream/table_del.sim
-./test.sh general/stream/metrics_del.sim
-./test.sh general/stream/table_replica1_vnoden.sim
-./test.sh general/stream/metrics_replica1_vnoden.sim
+./test.sh -f general/stream/metrics_1.sim
+./test.sh -f general/stream/metrics_del.sim
+./test.sh -f general/stream/metrics_n.sim
+./test.sh -f general/stream/metrics_replica1_vnoden.sim
 #./test.sh -f general/stream/new_stream.sim
-#./test.sh -f general/stream/restart_stream.sim
+./test.sh -f general/stream/restart_stream.sim
+./test.sh -f general/stream/stream_1.sim
+./test.sh -f general/stream/stream_2.sim
+./test.sh -f general/stream/stream_3.sim
+./test.sh -f general/stream/stream_restart.sim
+./test.sh -f general/stream/table_1.sim
+./test.sh -f general/stream/table_del.sim
+./test.sh -f general/stream/table_n.sim
+./test.sh -f general/stream/table_replica1_vnoden.sim
 
 ./test.sh -f general/table/autocreate.sim
 ./test.sh -f general/table/basic1.sim

tests/script/regressionSuite.sim

-#unsupport run general/alter/cached_schema_after_alter.sim
-#unsupport run general/alter/count.sim
-#unsupport run general/alter/import.sim
-#unsupport run general/alter/insert1.sim
-#unsupport run general/alter/insert2.sim
-#unsupport run general/alter/metrics.sim
-#unsupport run general/alter/table.sim
+##unsupport run general/alter/cached_schema_after_alter.sim
+unsupport run general/alter/count.sim
+unsupport run general/alter/import.sim
+##unsupport run general/alter/insert1.sim
+unsupport run general/alter/insert2.sim
+unsupport run general/alter/metrics.sim
+unsupport run general/alter/table.sim
 run general/cache/new_metrics.sim
 run general/cache/restart_metrics.sim
 run general/cache/restart_table.sim
@@ -86,14 +86,14 @@ run general/insert/query_block2_file.sim
 run general/insert/query_file_memory.sim
 run general/insert/query_multi_file.sim
 run general/insert/tcp.sim
-#unsupport run general/parser/alter.sim
-#unsupport run general/parser/alter1.sim
-#unsupport run general/parser/alter_stable.sim
+##unsupport run general/parser/alter.sim
+run general/parser/alter1.sim
+run general/parser/alter_stable.sim
 run general/parser/auto_create_tb.sim
 run general/parser/auto_create_tb_drop_tb.sim
 run general/parser/col_arithmetic_operation.sim
 run general/parser/columnValue.sim
-# run general/parser/commit.sim
+#run general/parser/commit.sim
 run general/parser/create_db.sim
 run general/parser/create_mt.sim
 run general/parser/create_tb.sim
@@ -103,17 +103,17 @@ run general/parser/import_commit2.sim
 run general/parser/import_commit3.sim
 run general/parser/insert_tb.sim
 run general/parser/first_last.sim
-#unsupport run general/parser/import_file.sim
+##unsupport run general/parser/import_file.sim
 run general/parser/lastrow.sim
 run general/parser/nchar.sim
-#unsupport run general/parser/null_char.sim
+##unsupport run general/parser/null_char.sim
 run general/parser/single_row_in_tb.sim
 run general/parser/select_from_cache_disk.sim
 run general/parser/limit.sim
-# run general/parser/limit1.sim
+run general/parser/limit1.sim
 run general/parser/limit1_tblocks100.sim
 run general/parser/mixed_blocks.sim
-# run general/parser/selectResNum.sim
+run general/parser/selectResNum.sim
 run general/parser/select_across_vnodes.sim
 run general/parser/slimit1.sim
 run general/parser/tbnameIn.sim
@@ -123,18 +123,18 @@ run general/parser/limit2.sim
 run general/parser/slimit.sim
 run general/parser/fill.sim
 run general/parser/fill_stb.sim
-# run general/parser/interp.sim
+run general/parser/interp.sim
 # run general/parser/where.sim
-#unsupport run general/parser/join.sim
-#unsupport run general/parser/join_multivnode.sim
+run general/parser/join.sim
+run general/parser/join_multivnode.sim
 run general/parser/select_with_tags.sim
-#unsupport run general/parser/groupby.sim
-#unsupport run general/parser/bug.sim
-#unsupport run general/parser/tags_dynamically_specifiy.sim
-#unsupport run general/parser/set_tag_vals.sim
-#unsupport run general/parser/repeatAlter.sim
-#unsupport run general/parser/slimit_alter_tags.sim
-#unsupport run general/parser/stream_on_sys.sim
+run general/parser/groupby.sim
+run general/parser/bug.sim
+run general/parser/tags_dynamically_specifiy.sim
+run general/parser/set_tag_vals.sim
+##unsupport run general/parser/repeatAlter.sim
+##unsupport run general/parser/slimit_alter_tags.sim
+##unsupport run general/parser/stream_on_sys.sim
 run general/parser/stream.sim
 #unsupport run general/parser/repeatStream.sim
 run general/stable/disk.sim
@@ -173,25 +173,25 @@ run general/tag/3.sim
 run general/tag/4.sim
 run general/tag/5.sim
 run general/tag/6.sim
-#unsupport run general/tag/add.sim
+run general/tag/add.sim
 run general/tag/bigint.sim
 run general/tag/binary_binary.sim
 run general/tag/binary.sim
 run general/tag/bool_binary.sim
 run general/tag/bool_int.sim
 run general/tag/bool.sim
-#unsupport run general/tag/change.sim
+run general/tag/change.sim
 run general/tag/column.sim
-#unsupport run general/tag/commit.sim
+##unsupport run general/tag/commit.sim
 run general/tag/create.sim
-#unsupport run general/tag/delete.sim
+run general/tag/delete.sim
 run general/tag/double.sim
 run general/tag/filter.sim
 run general/tag/float.sim
 run general/tag/int_binary.sim
 run general/tag/int_float.sim
 run general/tag/int.sim
-#unsupport run general/tag/set.sim
+run general/tag/set.sim
 run general/tag/smallint.sim
 run general/tag/tinyint.sim
 run general/user/authority.sim
@@ -211,6 +211,7 @@ run general/vector/table_field.sim
 run general/vector/table_mix.sim
 run general/vector/table_query.sim
 run general/vector/table_time.sim
+run general/stream/restart_stream.sim
 run general/stream/stream_1.sim
 run general/stream/stream_2.sim
 run general/stream/stream_3.sim