Merge branch '3.0' into feature/TD-11463-3.0

tests/script/jenkins/basic.txt

@@ -40,12 +40,12 @@
 ./test.sh -f tsim/tmq/basic1.sim
 
 # --- stable
-./test.sh -f general/stable/disk.sim
-./test.sh -f general/stable/dnode3.sim
-./test.sh -f general/stable/metrics.sim
-./test.sh -f general/stable/refcount.sim
-# ./test.sh -f general/stable/show.sim
-./test.sh -f general/stable/values.sim
-./test.sh -f general/stable/vnode3.sim
+./test.sh -f tsim/stable/disk.sim
+./test.sh -f tsim/stable/dnode3.sim
+./test.sh -f tsim/stable/metrics.sim
+./test.sh -f tsim/stable/refcount.sim
+# ./test.sh -f tsim/stable/show.sim
+./test.sh -f tsim/stable/values.sim
+./test.sh -f tsim/stable/vnode3.sim
 
 #======================b1-end===============

tests/script/tsim/tmq/basic1.sim

@@ -66,15 +66,15 @@ print =============== will support: * from stb; function from stb/ctb
 
 sql create topic topic_stb_column as select ts, c1, c3 from stb
 #sql create topic topic_stb_all as select * from stb
-#sql create topic topic_stb_function as select ts, abs(c1), sina(c2) from stb
+sql create topic topic_stb_function as select ts, abs(c1), sin(c2) from stb
 
 sql create topic topic_ctb_column as select ts, c1, c3 from ct0
 sql create topic topic_ctb_all as select * from ct0
-#sql create topic topic_ctb_function as select ts, abs(c1), sina(c2) from ct0
+sql create topic topic_ctb_function as select ts, abs(c1), sin(c2) from ct0
 
 sql create topic topic_ntb_column as select ts, c1, c3 from ntb
 sql create topic topic_ntb_all as select * from ntb
-#sql create topic topic_ntb_function as select ts, abs(c1), sina(c2) from ntb
+sql create topic topic_ntb_function as select ts, abs(c1), sin(c2) from ntb
 
 sql show tables
 if $rows != 3 then 
@@ -147,6 +147,13 @@ endi
 #  return -1
 #endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_stb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_stb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 20, 0}@ then
+  return -1
+endi
+
 print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_column" -k "group.id:tg2"
 system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_column" -k "group.id:tg2"
 print cmd result----> $system_content
@@ -161,6 +168,13 @@ if $system_content != @{consume success: 10, 0}@ then
   return -1
 endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 10, 0}@ then
+  return -1
+endi
+
 print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_column" -k "group.id:tg2"
 system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_column" -k "group.id:tg2"
 print cmd result----> $system_content
@@ -175,6 +189,13 @@ if $system_content != @{consume success: 20, 0}@ then
   return -1
 endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 20, 0}@ then
+  return -1
+endi
+
 print =============== create database , vgroup 4
 $dbNamme = d1
 sql create database $dbNamme vgroups 4

tests/test/c/tmqSim.c

@@ -226,7 +226,7 @@ void loop_consume(tmq_t* tmq) {
   int32_t totalRows = 0;
   int32_t skipLogNum = 0;
   while (running) {
-    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 1);
+    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 3000);
     if (tmqMsg) {
 	  totalMsgs++;