xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Shuduo Sang 2021-08-30 18:51:31 +08:00 committed by GitHub
parent c927ab9c54
commit 061fe86a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kit/taosdemo/taosdemo.c
View File

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