From 061fe86a537beae5ab46a8cf21bf82ea44a546e7 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Mon, 30 Aug 2021 18:51:31 +0800
Subject: [PATCH] Feature/sangshuduo/td 5875 taosdemo ue improve (#7703)

* [TD-5875]<featur>: taosdemo show progress

* empty commit for CI

* better msg for create child table.

* fix total child tables bug.

* fix INF rps if spent 0 ms to insert.
---
 src/kit/taosdemo/taosdemo.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 05bfb25026..70ccbe0924 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -8398,7 +8398,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
 
     free(stmtBuffer);
 
-    int64_t start = taosGetTimestampMs();
+    int64_t start = taosGetTimestampUs();
 
     for (int i = 0; i < threads; i++) {
         pthread_join(pids[i], NULL);
@@ -8442,18 +8442,18 @@ static void startMultiThreadInsertData(int threads, char* db_name,
     if (cntDelay == 0)    cntDelay = 1;
     avgDelay = (double)totalDelay / cntDelay;
 
-   int64_t end = taosGetTimestampMs();
+    int64_t end = taosGetTimestampUs();
     int64_t t = end - start;
+    if (0 == t) t = 1;
 
-    double tInMs = (double) t / 1000.0;
+    double tInMs = (double) t / 1000000.0;
 
     if (stbInfo) {
         fprintf(stderr, "Spent %.4f seconds to insert rows: %"PRIu64", affected rows: %"PRIu64" with %d thread(s) into %s.%s. %.2f records/second\n\n",
                 tInMs, stbInfo->totalInsertRows,
                 stbInfo->totalAffectedRows,
                 threads, db_name, stbInfo->sTblName,
-                (double) tInMs?
-                (double)(stbInfo->totalInsertRows/tInMs):FLT_MAX);
+                (double)(stbInfo->totalInsertRows/tInMs));
 
         if (g_fpOfInsertResult) {
             fprintf(g_fpOfInsertResult,
@@ -8461,24 +8461,21 @@ static void startMultiThreadInsertData(int threads, char* db_name,
                     tInMs, stbInfo->totalInsertRows,
                     stbInfo->totalAffectedRows,
                     threads, db_name, stbInfo->sTblName,
-                    (tInMs)?
-                    (double)(stbInfo->totalInsertRows/tInMs):FLT_MAX);
+                    (double)(stbInfo->totalInsertRows/tInMs));
         }
     } else {
         fprintf(stderr, "Spent %.4f seconds to insert rows: %"PRIu64", affected rows: %"PRIu64" with %d thread(s) into %s %.2f records/second\n\n",
                 tInMs, g_args.totalInsertRows,
                 g_args.totalAffectedRows,
                 threads, db_name,
-                (tInMs)?
-                (double)(g_args.totalInsertRows/tInMs):FLT_MAX);
+                (double)(g_args.totalInsertRows/tInMs));
         if (g_fpOfInsertResult) {
             fprintf(g_fpOfInsertResult,
                     "Spent %.4f seconds to insert rows: %"PRIu64", affected rows: %"PRIu64" with %d thread(s) into %s %.2f records/second\n\n",
                     tInMs, g_args.totalInsertRows,
                     g_args.totalAffectedRows,
                     threads, db_name,
-                    (tInMs)?
-                    (double)(g_args.totalInsertRows/tInMs):FLT_MAX);
+                    (double)(g_args.totalInsertRows/tInMs));
         }
     }
 
-- 
GitLab