From 28a2dea8fd9be75fa5c4c1d4a15f326ab9b17235 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Thu, 28 Nov 2024 14:23:39 +0800 Subject: [PATCH] enh: add three code show detail info --- tools/shell/inc/shellInt.h | 1 + tools/shell/src/shellArguments.c | 6 +++--- tools/shell/src/shellAuto.c | 1 + tools/shell/src/shellEngine.c | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h index ba3dadc646..6d372ec559 100644 --- a/tools/shell/inc/shellInt.h +++ b/tools/shell/inc/shellInt.h @@ -48,6 +48,7 @@ #define SHELL_FLOAT_WIDTH 20 #define SHELL_DOUBLE_WIDTH 25 +#define ERROR_CODE_DETAIL "\r\n\r\nView possible causes and suggested actions for error codes: \r\n https://docs.taosdata.com/reference/error-code/\r\n" typedef struct { char* hist[SHELL_MAX_HISTORY_SIZE]; char file[TSDB_FILENAME_LEN]; diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c index 442329674d..6f3c7fe703 100644 --- a/tools/shell/src/shellArguments.c +++ b/tools/shell/src/shellArguments.c @@ -92,8 +92,8 @@ void shellPrintHelp() { #else printf("\r\n\r\nReport bugs to %s.\r\n", "support@taosdata.com"); #endif + printf("%s", ERROR_CODE_DETAIL); } - #ifdef LINUX #include #ifdef _ALPINE @@ -104,9 +104,9 @@ void shellPrintHelp() { const char *argp_program_version = td_version; #ifdef CUS_EMAIL -const char *argp_program_bug_address = CUS_EMAIL; +const char *argp_program_bug_address = CUS_EMAIL"ERROR_CODE_DETAIL; #else -const char *argp_program_bug_address = "support@taosdata.com"; +const char *argp_program_bug_address = "support@taosdata.com "ERROR_CODE_DETAIL; #endif static struct argp_option shellOptions[] = { diff --git a/tools/shell/src/shellAuto.c b/tools/shell/src/shellAuto.c index 959e2d6d62..9fc929a595 100644 --- a/tools/shell/src/shellAuto.c +++ b/tools/shell/src/shellAuto.c @@ -662,6 +662,7 @@ void showHelp() { now - current time \n\ Example : \n\ select * from t1 where ts > now - 2w + 3d and ts <= now - 1w -2h ;\n"); + printf(ERROR_CODE_DETAIL); printf("\n"); } diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c index 21048a241c..0427868754 100644 --- a/tools/shell/src/shellEngine.c +++ b/tools/shell/src/shellEngine.c @@ -1303,7 +1303,8 @@ int32_t shellExecute() { #ifdef WEBSOCKET if (shell.args.restful || shell.args.cloud) { if (shell_conn_ws_server(1)) { - printf("failed to connect to server, code:0x08X %s\n", ws_errno(NULL), ws_errstr(NULL)); + printf("failed to connect to server, code:0x%08X %s\n%s", ws_errno(NULL), ws_errstr(NULL), ERROR_CODE_DETAIL); + printf(ERROR_CODE_DETAIL); fflush(stdout); return -1; } @@ -1316,7 +1317,7 @@ int32_t shellExecute() { } if (shell.conn == NULL) { - printf("failed to connect to server, code:0x%08X %s\n", taos_errno(NULL), taos_errstr(NULL)); + printf("failed to connect to server, code:0x%08X %s\n%s", taos_errno(NULL), taos_errstr(NULL), ERROR_CODE_DETAIL); fflush(stdout); return -1; }