From 25eb73d3841103e7c0ad1e36b29521714f47d89b Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 17 Jul 2020 09:23:45 +0000 Subject: [PATCH] [TD-953] --- tests/tsim/src/simExe.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index 7826735c2f..3febb927c4 100644 --- a/tests/tsim/src/simExe.c +++ b/tests/tsim/src/simExe.c @@ -21,7 +21,7 @@ #include "tutil.h" #include "cJSON.h" -void simLogSql(char *sql) { +void simLogSql(char *sql, bool useSharp) { static FILE *fp = NULL; char filename[256]; sprintf(filename, "%s/sim.sql", tsScriptDir); @@ -32,7 +32,12 @@ void simLogSql(char *sql) { return; } } - fprintf(fp, "%s;\n", sql); + if (useSharp) { + fprintf(fp, "# %s;\n", sql); + } else { + fprintf(fp, "%s;\n", sql); + } + fflush(fp); } @@ -300,6 +305,7 @@ bool simExecuteSystemCmd(SScript *script, char *option) { sprintf(buf, "cd %s; ", tsScriptDir); simVisuallizeOption(script, option, buf + strlen(buf)); + simLogSql(buf, true); int code = system(buf); int repeatTimes = 0; while (code < 0) { @@ -372,6 +378,10 @@ bool simExecuteSleepCmd(SScript *script, char *option) { taosMsleep(delta); simInfo("script:%s, sleep %dms finished", script->fileName, delta); + char sleepStr[32] = {0}; + sprintf(sleepStr, "sleep %d", delta); + simLogSql(sleepStr, true); + script->linePos++; return true; } @@ -655,7 +665,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) { TAOS_RES* pSql = NULL; for (int attempt = 0; attempt < 3; ++attempt) { - simLogSql(rest); + simLogSql(rest, false); pSql = taos_query(script->taos, rest); ret = taos_errno(pSql); -- GitLab