Merge pull request #14412 from taosdata/test3.0/lihui

Test3.0/lihui

tests/test/c/tmqSim.c

@@ -633,6 +633,7 @@ void loop_consume(SThreadInfo* pInfo) {
     }
   }
 
+  int64_t    lastTotalMsgs = 0;
   uint64_t   lastPrintTime = taosGetTimestampMs();
   uint64_t   startTs = taosGetTimestampMs();
 
@@ -650,9 +651,11 @@ void loop_consume(SThreadInfo* pInfo) {
 	  
 	  int64_t currentPrintTime = taosGetTimestampMs();
 	  if (currentPrintTime - lastPrintTime > 10 * 1000) {
-        taosFprintfFile(g_fp, "consumer id %d has currently poll total msgs: %" PRId64 "\n", pInfo->consumerId,
-                        totalMsgs);
+		  taosFprintfFile(g_fp,	
+		  	              "consumer id %d has currently poll total msgs: %" PRId64 ", period rate: %.3f msgs/second\n", 
+		  	              pInfo->consumerId, totalMsgs, (totalMsgs - lastTotalMsgs) * 1000.0/(currentPrintTime - lastPrintTime));
 		  lastPrintTime = currentPrintTime;
+		  lastTotalMsgs = totalMsgs;
 	  }
 	  
       if (0 == once_flag) {
@@ -660,7 +663,7 @@ void loop_consume(SThreadInfo* pInfo) {
         notifyMainScript(pInfo, NOTIFY_CMD_START_CONSUM);
       }
 
-      if (totalRows >= pInfo->expectMsgCnt) {
+      if ((totalRows >= pInfo->expectMsgCnt) || (totalMsgs >= pInfo->expectMsgCnt)) {
         char tmpString[128];
         taosFprintfFile(g_fp, "%s over than expect rows, so break consume\n", getCurrentTimeString(tmpString));
         break;
@@ -884,7 +887,7 @@ int main(int32_t argc, char* argv[]) {
   
   double tInMs = (double)t / 1000000.0;
   taosFprintfFile(g_fp,
-                  "Spent %.4f seconds to poll msgs: %" PRIu64 " with %d thread(s), throughput: %.2f msgs/second\n\n",
+				"Spent %.3f seconds to poll msgs: %" PRIu64 " with %d thread(s), throughput: %.3f msgs/second\n\n",
 				tInMs, totalMsgs, g_stConfInfo.numOfThread, (double)(totalMsgs / tInMs));
 
   taosFprintfFile(g_fp, "==== close tmqlog ====\n");