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

[TD-953]

This commit is contained in:
Shengliang Guan 2020-07-17 09:23:45 +00:00
parent 2a973bdb2d
commit 25eb73d384
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/tsim/src/simExe.c
View File

@ -21,7 +21,7 @@
#include "tutil.h" #include "tutil.h"
#include "cJSON.h" #include "cJSON.h"
void simLogSql(char *sql) { void simLogSql(char *sql, bool useSharp) {
static FILE *fp = NULL; static FILE *fp = NULL;
char filename[256]; char filename[256];
sprintf(filename, "%s/sim.sql", tsScriptDir); sprintf(filename, "%s/sim.sql", tsScriptDir);
@ -32,7 +32,12 @@ void simLogSql(char *sql) {
return; return;
} }
} }
if (useSharp) {
fprintf(fp, "# %s;\n", sql);
} else {
fprintf(fp, "%s;\n", sql); fprintf(fp, "%s;\n", sql);
}
fflush(fp); fflush(fp);
} }
@ -300,6 +305,7 @@ bool simExecuteSystemCmd(SScript *script, char *option) {
sprintf(buf, "cd %s; ", tsScriptDir); sprintf(buf, "cd %s; ", tsScriptDir);
simVisuallizeOption(script, option, buf + strlen(buf)); simVisuallizeOption(script, option, buf + strlen(buf));
simLogSql(buf, true);
int code = system(buf); int code = system(buf);
int repeatTimes = 0; int repeatTimes = 0;
while (code < 0) { while (code < 0) {
@ -372,6 +378,10 @@ bool simExecuteSleepCmd(SScript *script, char *option) {
taosMsleep(delta); taosMsleep(delta);
simInfo("script:%s, sleep %dms finished", script->fileName, delta); simInfo("script:%s, sleep %dms finished", script->fileName, delta);
char sleepStr[32] = {0};
sprintf(sleepStr, "sleep %d", delta);
simLogSql(sleepStr, true);
script->linePos++; script->linePos++;
return true; return true;
} }
@ -655,7 +665,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
TAOS_RES* pSql = NULL; TAOS_RES* pSql = NULL;
for (int attempt = 0; attempt < 3; ++attempt) { for (int attempt = 0; attempt < 3; ++attempt) {
simLogSql(rest); simLogSql(rest, false);
pSql = taos_query(script->taos, rest); pSql = taos_query(script->taos, rest);
ret = taos_errno(pSql); ret = taos_errno(pSql);