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

change sim log format

This commit is contained in:
Shengliang Guan 2020-07-09 03:45:06 +00:00
parent a1125ff675
commit abfb0b6814
4 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/tsim/inc/sim.h
View File

@ -51,24 +51,12 @@
#define FAILED_POSTFIX "" #define FAILED_POSTFIX ""
#endif #endif
#define simError(...) \ #define simFatal(...) { if (simDebugFlag & DEBUG_FATAL) { taosPrintLog("SIM FATAL ", simDebugFlag, __VA_ARGS__); }}
if (simDebugFlag & DEBUG_ERROR) { \ #define simError(...) { if (simDebugFlag & DEBUG_ERROR) { taosPrintLog("SIM ERROR ", simDebugFlag, __VA_ARGS__); }}
taosPrintLog("ERROR SIM ", 255, __VA_ARGS__); \ #define simWarn(...) { if (simDebugFlag & DEBUG_WARN) { taosPrintLog("SIM WARN ", simDebugFlag, __VA_ARGS__); }}
} #define simInfo(...) { if (simDebugFlag & DEBUG_INFO) { taosPrintLog("SIM INFO ", simDebugFlag, __VA_ARGS__); }}
#define simWarn(...) \ #define simDebug(...) { if (simDebugFlag & DEBUG_DEBUG) { taosPrintLog("SIM DEBUG ", simDebugFlag, __VA_ARGS__); }}
if (simDebugFlag & DEBUG_WARN) { \ #define simTrace(...) { if (simDebugFlag & DEBUG_TRACE) { taosPrintLog("SIM TRACE ", simDebugFlag, __VA_ARGS__); }}
taosPrintLog("WARN SIM ", simDebugFlag, __VA_ARGS__); \
}
#define simTrace(...) \
if (simDebugFlag & DEBUG_TRACE) { \
taosPrintLog("SIM ", simDebugFlag, __VA_ARGS__); \
}
#define simDump(x, y) \
if (simDebugFlag & DEBUG_DUMP) { \
taosDumpData(x, y); \
}
#define simPrint(...) \
{ taosPrintLog("SIM ", 255, __VA_ARGS__); }
enum { SIM_SCRIPT_TYPE_MAIN, SIM_SCRIPT_TYPE_BACKGROUND }; enum { SIM_SCRIPT_TYPE_MAIN, SIM_SCRIPT_TYPE_BACKGROUND };

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

@ -75,7 +75,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
for (int i = 0; i < MAX_QUERY_ROW_NUM; ++i) { for (int i = 0; i < MAX_QUERY_ROW_NUM; ++i) {
if (strncmp(keyName, script->data[i][0], keyLen) == 0) { if (strncmp(keyName, script->data[i][0], keyLen) == 0) {
simTrace("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]); simDebug("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]);
return script->data[i][col]; return script->data[i][col];
} }
} }
@ -90,7 +90,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
return "null"; return "null";
} }
simTrace("script:%s, data[%d][%d]=%s", script->fileName, row, col, script->data[row][col]); simDebug("script:%s, data[%d][%d]=%s", script->fileName, row, col, script->data[row][col]);
return script->data[row][col]; return script->data[row][col];
} }
} }
@ -102,7 +102,7 @@ char *simGetVariable(SScript *script, char *varName, int varLen) {
} }
if (strncmp(varName, var->varName, varLen) == 0) { if (strncmp(varName, var->varName, varLen) == 0) {
// if (strlen(var->varValue) != 0) // if (strlen(var->varValue) != 0)
// simTrace("script:%s, var:%s, value:%s", script->fileName, // simDebug("script:%s, var:%s, value:%s", script->fileName,
// var->varName, var->varValue); // var->varName, var->varValue);
return var->varValue; return var->varValue;
} }
@ -240,7 +240,7 @@ bool simExecuteRunCmd(SScript *script, char *option) {
return false; return false;
} }
simPrint("script:%s, start to execute", newScript->fileName); simInfo("script:%s, start to execute", newScript->fileName);
newScript->type = SIM_SCRIPT_TYPE_MAIN; newScript->type = SIM_SCRIPT_TYPE_MAIN;
simScriptPos++; simScriptPos++;
@ -262,7 +262,7 @@ bool simExecuteRunBackCmd(SScript *script, char *option) {
sprintf(script->error, "lineNum:%d. parse file:%s error", script->lines[script->linePos].lineNum, fileName); sprintf(script->error, "lineNum:%d. parse file:%s error", script->lines[script->linePos].lineNum, fileName);
return false; return false;
} }
simPrint("script:%s, start to execute in background", newScript->fileName); simInfo("script:%s, start to execute in background", newScript->fileName);
newScript->type = SIM_SCRIPT_TYPE_BACKGROUND; newScript->type = SIM_SCRIPT_TYPE_BACKGROUND;
script->bgScripts[script->bgScriptLen++] = newScript; script->bgScripts[script->bgScriptLen++] = newScript;
@ -336,7 +336,7 @@ bool simExecutePrintCmd(SScript *script, char *rest) {
simVisuallizeOption(script, rest, buf); simVisuallizeOption(script, rest, buf);
rest = buf; rest = buf;
simPrint("script:%s, %s", script->fileName, rest); simInfo("script:%s, %s", script->fileName, rest);
script->linePos++; script->linePos++;
return true; return true;
} }
@ -351,9 +351,9 @@ bool simExecuteSleepCmd(SScript *script, char *option) {
delta = atoi(option); delta = atoi(option);
if (delta <= 0) delta = 5; if (delta <= 0) delta = 5;
simPrint("script:%s, sleep %dms begin", script->fileName, delta); simInfo("script:%s, sleep %dms begin", script->fileName, delta);
taosMsleep(delta); taosMsleep(delta);
simPrint("script:%s, sleep %dms finished", script->fileName, delta); simInfo("script:%s, sleep %dms finished", script->fileName, delta);
script->linePos++; script->linePos++;
return true; return true;
@ -372,7 +372,7 @@ bool simExecuteReturnCmd(SScript *script, char *option) {
sprintf(script->error, "lineNum:%d. error return %s", script->lines[script->linePos].lineNum, option); sprintf(script->error, "lineNum:%d. error return %s", script->lines[script->linePos].lineNum, option);
return false; return false;
} else { } else {
simPrint("script:%s, return cmd execute with:%d", script->fileName, ret); simInfo("script:%s, return cmd execute with:%d", script->fileName, ret);
script->linePos = script->numOfLines; script->linePos = script->numOfLines;
} }
@ -418,7 +418,7 @@ void simCloseRestFulConnect(SScript *script) {
void simCloseNativeConnect(SScript *script) { void simCloseNativeConnect(SScript *script) {
if (script->taos == NULL) return; if (script->taos == NULL) return;
simTrace("script:%s, taos:%p closed", script->fileName, script->taos); simDebug("script:%s, taos:%p closed", script->fileName, script->taos);
taos_close(script->taos); taos_close(script->taos);
taosMsleep(1200); taosMsleep(1200);
@ -468,7 +468,7 @@ int simParseHttpCommandResult(SScript *script, char *command) {
cJSON_Delete(root); cJSON_Delete(root);
return retcode; return retcode;
} else { } else {
simTrace("script:%s, json:status:%s not equal to succ, but code is %d, response:%s", script->fileName, simDebug("script:%s, json:status:%s not equal to succ, but code is %d, response:%s", script->fileName,
status->valuestring, retcode, command); status->valuestring, retcode, command);
cJSON_Delete(root); cJSON_Delete(root);
return 0; return 0;
@ -568,10 +568,10 @@ bool simCreateRestFulConnect(SScript *script, char *user, char *pass) {
for (int attempt = 0; attempt < 10; ++attempt) { for (int attempt = 0; attempt < 10; ++attempt) {
success = simExecuteRestFulCommand(script, command) == 0; success = simExecuteRestFulCommand(script, command) == 0;
if (!success) { if (!success) {
simTrace("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt); simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
taosMsleep(1000); taosMsleep(1000);
} else { } else {
simTrace("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt); simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
break; break;
} }
} }
@ -581,7 +581,7 @@ bool simCreateRestFulConnect(SScript *script, char *user, char *pass) {
return false; return false;
} }
simTrace("script:%s, connect taosd successed, auth:%p", script->fileName, script->auth); simDebug("script:%s, connect taosd successed, auth:%p", script->fileName, script->auth);
return true; return true;
} }
@ -592,10 +592,10 @@ bool simCreateNativeConnect(SScript *script, char *user, char *pass) {
for (int attempt = 0; attempt < 10; ++attempt) { for (int attempt = 0; attempt < 10; ++attempt) {
taos = taos_connect(NULL, user, pass, NULL, tsDnodeShellPort); taos = taos_connect(NULL, user, pass, NULL, tsDnodeShellPort);
if (taos == NULL) { if (taos == NULL) {
simTrace("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt); simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
taosMsleep(1000); taosMsleep(1000);
} else { } else {
simTrace("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt); simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
break; break;
} }
} }
@ -606,7 +606,7 @@ bool simCreateNativeConnect(SScript *script, char *user, char *pass) {
} }
script->taos = taos; script->taos = taos;
simTrace("script:%s, connect taosd successed, taos:%p", script->fileName, taos); simDebug("script:%s, connect taosd successed, taos:%p", script->fileName, taos);
return true; return true;
} }
@ -643,11 +643,11 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
ret = taos_errno(pSql); ret = taos_errno(pSql);
if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST || ret == TSDB_CODE_MND_DB_ALREADY_EXIST) { if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST || ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret)); simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
ret = 0; ret = 0;
break; break;
} else if (ret != 0) { } else if (ret != 0) {
simTrace("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s", simDebug("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s",
script->fileName, script->taos, rest, ret, tstrerror(ret), taos_errstr(pSql)); script->fileName, script->taos, rest, ret, tstrerror(ret), taos_errstr(pSql));
if (line->errorJump == SQL_JUMP_TRUE) { if (line->errorJump == SQL_JUMP_TRUE) {
@ -672,7 +672,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
int num_fields = taos_field_count(pSql); int num_fields = taos_field_count(pSql);
if (num_fields != 0) { if (num_fields != 0) {
if (pSql == NULL) { if (pSql == NULL) {
simTrace("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest); simDebug("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest);
if (line->errorJump == SQL_JUMP_TRUE) { if (line->errorJump == SQL_JUMP_TRUE) {
script->linePos = line->jump; script->linePos = line->jump;
return true; return true;
@ -794,11 +794,11 @@ bool simExecuteRestFulSqlCommand(SScript *script, char *rest) {
ret = simExecuteRestFulCommand(script, command); ret = simExecuteRestFulCommand(script, command);
if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST || if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST ||
ret == TSDB_CODE_MND_DB_ALREADY_EXIST) { ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret)); simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
ret = 0; ret = 0;
break; break;
} else if (ret != 0) { } else if (ret != 0) {
simTrace("script:%s, taos:%p, %s failed, ret:%d", simDebug("script:%s, taos:%p, %s failed, ret:%d",
script->fileName, script->taos, rest, ret); script->fileName, script->taos, rest, ret);
if (line->errorJump == SQL_JUMP_TRUE) { if (line->errorJump == SQL_JUMP_TRUE) {
@ -827,7 +827,7 @@ bool simExecuteSqlImpCmd(SScript *script, char *rest, bool isSlow) {
simVisuallizeOption(script, rest, buf); simVisuallizeOption(script, rest, buf);
rest = buf; rest = buf;
simTrace("script:%s, exec:%s", script->fileName, rest); simDebug("script:%s, exec:%s", script->fileName, rest);
strcpy(script->rows, "-1"); strcpy(script->rows, "-1");
for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) { for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) { for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
@ -883,7 +883,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
simVisuallizeOption(script, rest, buf); simVisuallizeOption(script, rest, buf);
rest = buf; rest = buf;
simTrace("script:%s, exec:%s", script->fileName, rest); simDebug("script:%s, exec:%s", script->fileName, rest);
strcpy(script->rows, "-1"); strcpy(script->rows, "-1");
for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) { for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) { for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
@ -929,7 +929,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
} }
if (ret != TSDB_CODE_SUCCESS) { if (ret != TSDB_CODE_SUCCESS) {
simTrace("script:%s, taos:%p, %s execute, expect failed, so success, ret:%d:%s", simDebug("script:%s, taos:%p, %s execute, expect failed, so success, ret:%d:%s",
script->fileName, script->taos, rest, ret, tstrerror(ret)); script->fileName, script->taos, rest, ret, tstrerror(ret));
script->linePos++; script->linePos++;
return true; return true;

2
tests/tsim/src/simMain.c
View File

@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
exit(1); exit(1);
} }
simPrint("simulator is running ..."); simInfo("simulator is running ...");
signal(SIGINT, simHandleSignal); signal(SIGINT, simHandleSignal);
SScript *script = simParseScript(scriptFile); SScript *script = simParseScript(scriptFile);

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

@ -71,7 +71,7 @@ char *simParseHostName(char *varName) {
} }
sprintf(hostName, "'%s:%d'", simHostName, port); sprintf(hostName, "'%s:%d'", simHostName, port);
//simPrint("hostName:%s", hostName); //simInfo("hostName:%s", hostName);
return hostName; return hostName;
} }
@ -102,20 +102,20 @@ void simFreeScript(SScript *script) {
SScript *simProcessCallOver(SScript *script) { SScript *simProcessCallOver(SScript *script) {
if (script->type == SIM_SCRIPT_TYPE_MAIN) { if (script->type == SIM_SCRIPT_TYPE_MAIN) {
if (script->killed) { if (script->killed) {
simPrint("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX
"failed" FAILED_POSTFIX ", error:%s", "failed" FAILED_POSTFIX ", error:%s",
script->fileName, script->error); script->fileName, script->error);
exit(-1); exit(-1);
} else { } else {
simPrint("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX
"success" SUCCESS_POSTFIX, "success" SUCCESS_POSTFIX,
script->fileName); script->fileName);
simCloseTaosdConnect(script); simCloseTaosdConnect(script);
simScriptSucced++; simScriptSucced++;
simScriptPos--; simScriptPos--;
if (simScriptPos == -1) { if (simScriptPos == -1) {
simPrint("----------------------------------------------------------------------"); simInfo("----------------------------------------------------------------------");
simPrint("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced); simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
exit(0); exit(0);
} }
@ -123,7 +123,7 @@ SScript *simProcessCallOver(SScript *script) {
return simScriptList[simScriptPos]; return simScriptList[simScriptPos];
} }
} else { } else {
simPrint("script:%s, is stopped by main script", script->fileName); simInfo("script:%s, is stopped by main script", script->fileName);
simFreeScript(script); simFreeScript(script);
return NULL; return NULL;
} }
@ -143,7 +143,7 @@ void *simExecuteScript(void *inputScript) {
} else { } else {
SCmdLine *line = &script->lines[script->linePos]; SCmdLine *line = &script->lines[script->linePos];
char *option = script->optionBuffer + line->optionOffset; char *option = script->optionBuffer + line->optionOffset;
simTrace("script:%s, line:%d with option \"%s\"", script->fileName, line->lineNum, option); simDebug("script:%s, line:%d with option \"%s\"", script->fileName, line->lineNum, option);
SCommand *cmd = &simCmdList[line->cmdno]; SCommand *cmd = &simCmdList[line->cmdno];
int ret = (*(cmd->executeCmd))(script, option); int ret = (*(cmd->executeCmd))(script, option);