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

[TD-2984] <fix>: combine taosdemo and taosdemox. windows build issue.

This commit is contained in:
Shuduo Sang 2021-02-20 15:08:28 +08:00
parent 0b718f8854
commit e0711cbef7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kit/taosdemo/CMakeLists.txt
View File

@ -22,9 +22,11 @@ IF (TD_LINUX)
ELSE () ELSE ()
TARGET_LINK_LIBRARIES(taosdemo taos cJson) TARGET_LINK_LIBRARIES(taosdemo taos cJson)
ENDIF () ENDIF ()
ENDIF () ELSEIF (TD_WINDOWS)
AUX_SOURCE_DIRECTORY(. SRC)
IF (TD_DARWIN) ADD_EXECUTABLE(taosdemo ${SRC})
TARGET_LINK_LIBRARIES(taosdemo taos_static cJson)
ELSEIF (TD_DARWIN)
# missing a few dependencies, such as <argp.h> # missing a few dependencies, such as <argp.h>
# AUX_SOURCE_DIRECTORY(. SRC) # AUX_SOURCE_DIRECTORY(. SRC)
# ADD_EXECUTABLE(taosdemo ${SRC}) # ADD_EXECUTABLE(taosdemo ${SRC})

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

@ -4423,7 +4423,7 @@ void *superQueryProcess(void *sarg) {
} }
selectAndGetResult(winfo->taos, g_queryInfo.superQueryInfo.sql[i], tmpFile); selectAndGetResult(winfo->taos, g_queryInfo.superQueryInfo.sql[i], tmpFile);
int64_t t2 = taosGetTimestampUs(); int64_t t2 = taosGetTimestampUs();
printf("=[taosc] thread[%"PRIu64"] complete one sql, Spent %f s\n", (uint64_t)pthread_self(), (t2 - t1)/1000000.0); printf("=[taosc] thread[%"PRIu64"] complete one sql, Spent %f s\n", pthread_self(), (t2 - t1)/1000000.0);
} else { } else {
#ifdef TD_LOWA_CURL #ifdef TD_LOWA_CURL
int64_t t1 = taosGetTimestampUs(); int64_t t1 = taosGetTimestampUs();
@ -4439,7 +4439,7 @@ void *superQueryProcess(void *sarg) {
} }
} }
et = taosGetTimestampMs(); et = taosGetTimestampMs();
printf("==thread[%"PRIu64"] complete all sqls to specify tables once queries duration:%.6fs\n\n", (uint64_t)pthread_self(), (double)(et - st)/1000.0); printf("==thread[%"PRIu64"] complete all sqls to specify tables once queries duration:%.6fs\n\n", pthread_self(), (double)(et - st)/1000.0);
} }
return NULL; return NULL;
} }
@ -4488,7 +4488,7 @@ void *subQueryProcess(void *sarg) {
} }
} }
et = taosGetTimestampMs(); et = taosGetTimestampMs();
printf("####thread[%"PRIu64"] complete all sqls to allocate all sub-tables[%d - %d] once queries duration:%.4fs\n\n", (uint64_t)pthread_self(), winfo->start_table_id, winfo->end_table_id, (double)(et - st)/1000.0); printf("####thread[%"PRIu64"] complete all sqls to allocate all sub-tables[%d - %d] once queries duration:%.4fs\n\n", pthread_self(), winfo->start_table_id, winfo->end_table_id, (double)(et - st)/1000.0);
} }
return NULL; return NULL;
} }