From 1b71cd4b8d7347f0ecfa1fe4c16d44ed3ab89149 Mon Sep 17 00:00:00 2001 From: shenglian zhou Date: Fri, 22 Sep 2023 13:29:17 +0800 Subject: [PATCH] fix: add $cols to script support --- utils/tsim/inc/simInt.h | 1 + utils/tsim/src/simExe.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/utils/tsim/inc/simInt.h b/utils/tsim/inc/simInt.h index 8ff3f3b183..118881bf38 100644 --- a/utils/tsim/inc/simInt.h +++ b/utils/tsim/inc/simInt.h @@ -161,6 +161,7 @@ typedef struct _script_t { bool killed; void *taos; char rows[12]; // number of rows data retrieved + char cols[12]; // number of columns data retrieved char data[MAX_QUERY_ROW_NUM][MAX_QUERY_COL_NUM][MAX_QUERY_VALUE_LEN]; // query results char system_exit_code[12]; char system_ret_content[MAX_SYSTEM_RESULT_LEN]; diff --git a/utils/tsim/src/simExe.c b/utils/tsim/src/simExe.c index 9a0a156717..1e0a49b9ba 100644 --- a/utils/tsim/src/simExe.c +++ b/utils/tsim/src/simExe.c @@ -93,6 +93,8 @@ char *simGetVariable(SScript *script, char *varName, int32_t varLen) { if (strncmp(varName, "rows", varLen) == 0) return script->rows; + if (strncmp(varName, "cols", varLen) == 0) return script->cols; + if (strncmp(varName, "system_exit", varLen) == 0) return script->system_exit_code; if (strncmp(varName, "system_content", varLen) == 0) return script->system_ret_content; @@ -808,6 +810,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) { taos_free_result(pSql); sprintf(script->rows, "%d", numOfRows); + sprintf(script->cols, "%d", num_fields); script->linePos++; return true; @@ -822,6 +825,7 @@ bool simExecuteSqlImpCmd(SScript *script, char *rest, bool isSlow) { simDebug("script:%s, exec:%s", script->fileName, rest); strcpy(script->rows, "-1"); + strcpy(script->cols, "-1"); for (int32_t row = 0; row < MAX_QUERY_ROW_NUM; ++row) { for (int32_t col = 0; col < MAX_QUERY_COL_NUM; ++col) { strcpy(script->data[row][col], "null"); @@ -918,6 +922,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) { simDebug("script:%s, exec:%s", script->fileName, rest); strcpy(script->rows, "-1"); + strcpy(script->cols, "-1"); for (int32_t row = 0; row < MAX_QUERY_ROW_NUM; ++row) { for (int32_t col = 0; col < MAX_QUERY_COL_NUM; ++col) { strcpy(script->data[row][col], "null");