From cf18ffe4cee873d15c0b31a78e94f58b534c06c9 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 10:24:22 +0800
Subject: [PATCH 01/11] feat: add error code to show

---
 tools/shell/src/shellEngine.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 6d56aa7fe2..713f6757da 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1091,7 +1091,7 @@ void shellCleanupHistory() {
 
 void shellPrintError(TAOS_RES *tres, int64_t st) {
   int64_t et = taosGetTimestampUs();
-  fprintf(stderr, "\r\nDB error: %s (%.6fs)\r\n", taos_errstr(tres), (et - st) / 1E6);
+  fprintf(stderr, "\r\nDB error: %s[%08X] (%.6fs)\r\n", taos_errstr(tres), taos_errno(tres), (et - st) / 1E6);
   taos_free_result(tres);
 }
 
@@ -1303,6 +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, error code:0x08x reason: %s\n", ws_errno(NULL), ws_errstr(NULL));
+      fflush(stdout);
       return -1;
     }
   } else {
@@ -1314,7 +1316,7 @@ int32_t shellExecute() {
     }
 
     if (shell.conn == NULL) {
-      printf("failed to connect to server, reason: %s\n", taos_errstr(NULL));
+      printf("failed to connect to server, reason: %s[%0x08x]\n",taos_errstr(NULL), taos_errno(NULL));
       fflush(stdout);
       return -1;
     }

From c4a5969d7f263c07982bdd1773dc6185fb120aa1 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 10:41:06 +0800
Subject: [PATCH 02/11] uniform show format

---
 tools/shell/src/shellEngine.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 713f6757da..18d56c23aa 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1091,7 +1091,7 @@ void shellCleanupHistory() {
 
 void shellPrintError(TAOS_RES *tres, int64_t st) {
   int64_t et = taosGetTimestampUs();
-  fprintf(stderr, "\r\nDB error: %s[%08X] (%.6fs)\r\n", taos_errstr(tres), taos_errno(tres), (et - st) / 1E6);
+  fprintf(stderr, "\r\nDB error:[%08X] %s (%.6fs)\r\n", taos_errno(tres), taos_errstr(tres), (et - st) / 1E6);
   taos_free_result(tres);
 }
 
@@ -1303,7 +1303,7 @@ int32_t shellExecute() {
 #ifdef WEBSOCKET
   if (shell.args.restful || shell.args.cloud) {
     if (shell_conn_ws_server(1)) {
-      printf("failed to connect to server, error code:0x08x reason: %s\n", ws_errno(NULL), ws_errstr(NULL));
+      printf("failed to connect to server, error code:0x08X reason: %s\n", ws_errno(NULL), ws_errstr(NULL));
       fflush(stdout);
       return -1;
     }
@@ -1316,7 +1316,7 @@ int32_t shellExecute() {
     }
 
     if (shell.conn == NULL) {
-      printf("failed to connect to server, reason: %s[%0x08x]\n",taos_errstr(NULL), taos_errno(NULL));
+      printf("failed to connect to server, error code:0x%08X reason: %s\n", taos_errno(NULL), taos_errstr(NULL));
       fflush(stdout);
       return -1;
     }

From 8c3a5e246456579223fbb0b213b33e87ab2c7703 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 11:03:07 +0800
Subject: [PATCH 03/11] fix: reduce show text length

---
 tools/shell/src/shellEngine.c    | 6 +++---
 tools/shell/src/shellWebsocket.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 18d56c23aa..21048a241c 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1091,7 +1091,7 @@ void shellCleanupHistory() {
 
 void shellPrintError(TAOS_RES *tres, int64_t st) {
   int64_t et = taosGetTimestampUs();
-  fprintf(stderr, "\r\nDB error:[%08X] %s (%.6fs)\r\n", taos_errno(tres), taos_errstr(tres), (et - st) / 1E6);
+  fprintf(stderr, "\r\nDB error:0x%08X %s (%.6fs)\r\n", taos_errno(tres), taos_errstr(tres), (et - st) / 1E6);
   taos_free_result(tres);
 }
 
@@ -1303,7 +1303,7 @@ int32_t shellExecute() {
 #ifdef WEBSOCKET
   if (shell.args.restful || shell.args.cloud) {
     if (shell_conn_ws_server(1)) {
-      printf("failed to connect to server, error code:0x08X reason: %s\n", ws_errno(NULL), ws_errstr(NULL));
+      printf("failed to connect to server, code:0x08X %s\n", ws_errno(NULL), ws_errstr(NULL));
       fflush(stdout);
       return -1;
     }
@@ -1316,7 +1316,7 @@ int32_t shellExecute() {
     }
 
     if (shell.conn == NULL) {
-      printf("failed to connect to server, error code:0x%08X reason: %s\n", taos_errno(NULL), taos_errstr(NULL));
+      printf("failed to connect to server, code:0x%08X %s\n", taos_errno(NULL), taos_errstr(NULL));
       fflush(stdout);
       return -1;
     }
diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index 1ec1697c3a..61074102be 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -286,8 +286,8 @@ void shellRunSingleCommandWebsocketImp(char *command) {
       // if it's not a ws connection error
       if (TSDB_CODE_WS_DSN_ERROR != (code&TSDB_CODE_WS_DSN_ERROR)) {
         et = taosGetTimestampUs();
-        fprintf(stderr, "\nDB: error: %s (%.6fs)\n",
-                ws_errstr(res), (et - st)/1E6);
+        fprintf(stderr, "\nDB: error:0x%08X %s (%.6fs)\n",
+                ws_errno(res), ws_errstr(res), (et - st)/1E6);
         ws_free_result(res);
         return;
       }

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 04/11] 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 <argp.h>
 #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;
     }

From 42b4bc97deaa51d669886697fc75c96a148ba523 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 14:33:42 +0800
Subject: [PATCH 05/11] enh: add three code show detail info remove quota

---
 tools/shell/src/shellArguments.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 6f3c7fe703..50520b8f65 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -104,7 +104,7 @@ void shellPrintHelp() {
 
 const char *argp_program_version = td_version;
 #ifdef CUS_EMAIL
-const char *argp_program_bug_address = CUS_EMAIL"ERROR_CODE_DETAIL;
+const char *argp_program_bug_address = CUS_EMAIL ERROR_CODE_DETAIL;
 #else
 const char *argp_program_bug_address = "support@taosdata.com "ERROR_CODE_DETAIL;
 #endif

From 5882d6bbe7ec207d5245214bb290c8cbcd419d2e Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 16:48:09 +0800
Subject: [PATCH 06/11] fix: adjust show text and format

---
 tools/shell/inc/shellInt.h       | 2 +-
 tools/shell/src/shellArguments.c | 5 ++---
 tools/shell/src/shellAuto.c      | 1 -
 tools/shell/src/shellEngine.c    | 7 +++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h
index 6d372ec559..e1efd3cf95 100644
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
@@ -48,7 +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"
+#define ERROR_CODE_DETAIL "\r\n\r\nView possible causes and suggested actions for error codes, \r\nplease refer to page of 'Reference'-> 'Error Codes' on TDengine's official website./\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 50520b8f65..09e7e035c0 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -92,7 +92,6 @@ 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 <argp.h>
@@ -104,9 +103,9 @@ void shellPrintHelp() {
 
 const char *argp_program_version = td_version;
 #ifdef CUS_EMAIL
-const char *argp_program_bug_address = CUS_EMAIL ERROR_CODE_DETAIL;
+const char *argp_program_bug_address = CUS_EMAIL;
 #else
-const char *argp_program_bug_address = "support@taosdata.com "ERROR_CODE_DETAIL;
+const char *argp_program_bug_address = "support@taosdata.com;
 #endif
 
 static struct argp_option shellOptions[] = {
diff --git a/tools/shell/src/shellAuto.c b/tools/shell/src/shellAuto.c
index 9fc929a595..959e2d6d62 100644
--- a/tools/shell/src/shellAuto.c
+++ b/tools/shell/src/shellAuto.c
@@ -662,7 +662,6 @@ 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 0427868754..7328b67dff 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1091,7 +1091,7 @@ void shellCleanupHistory() {
 
 void shellPrintError(TAOS_RES *tres, int64_t st) {
   int64_t et = taosGetTimestampUs();
-  fprintf(stderr, "\r\nDB error:0x%08X %s (%.6fs)\r\n", taos_errno(tres), taos_errstr(tres), (et - st) / 1E6);
+  fprintf(stderr, "\r\nDB error: %s[0x%08X] (%.6fs)\r\n", taos_errstr(tres), taos_errno(tres), (et - st) / 1E6);
   taos_free_result(tres);
 }
 
@@ -1303,8 +1303,7 @@ 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:0x%08X %s\n%s", ws_errno(NULL), ws_errstr(NULL), ERROR_CODE_DETAIL);
-      printf(ERROR_CODE_DETAIL);
+      printf("failed to connect to server, reason: %s[0x%08X]\n%s", ws_errstr(NULL), ws_errno(NULL), ERROR_CODE_DETAIL);
       fflush(stdout);
       return -1;
     }
@@ -1317,7 +1316,7 @@ int32_t shellExecute() {
     }
 
     if (shell.conn == NULL) {
-      printf("failed to connect to server, code:0x%08X %s\n%s", taos_errno(NULL), taos_errstr(NULL), ERROR_CODE_DETAIL);
+      printf("failed to connect to server, reason: %s[0x%08X]\n%s", taos_errstr(NULL), taos_errno(NULL), ERROR_CODE_DETAIL);
       fflush(stdout);
       return -1;
     }

From 7cd57f906f0b93a94eceb3543dc97bd6058c2a3f Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 16:50:11 +0800
Subject: [PATCH 07/11] fix: lost right quotation

---
 tools/shell/src/shellArguments.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 09e7e035c0..83f2bc947e 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -105,7 +105,7 @@ const char *argp_program_version = td_version;
 #ifdef CUS_EMAIL
 const char *argp_program_bug_address = CUS_EMAIL;
 #else
-const char *argp_program_bug_address = "support@taosdata.com;
+const char *argp_program_bug_address = "support@taosdata.com;"
 #endif
 
 static struct argp_option shellOptions[] = {

From d83bb1c9c1f29cd0363e79ab6bb057c089e2a7e9 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 16:52:08 +0800
Subject: [PATCH 08/11] fix: add semicolon to email address

---
 tools/shell/src/shellArguments.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 83f2bc947e..f542d71d8b 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -105,7 +105,7 @@ const char *argp_program_version = td_version;
 #ifdef CUS_EMAIL
 const char *argp_program_bug_address = CUS_EMAIL;
 #else
-const char *argp_program_bug_address = "support@taosdata.com;"
+const char *argp_program_bug_address = "support@taosdata.com";
 #endif
 
 static struct argp_option shellOptions[] = {

From 9f909340297286e8a46cd30b60d841bea53ac1b4 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 17:06:49 +0800
Subject: [PATCH 09/11] fix: adjust prompt text review with Daniel

---
 tools/shell/inc/shellInt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h
index e1efd3cf95..b1f09d5161 100644
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
@@ -48,7 +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\nplease refer to page of 'Reference'-> 'Error Codes' on TDengine's official website./\r\n"
+#define ERROR_CODE_DETAIL "\r\n\r\nTo view possible causes and suggested actions for error codes, see \r\n\"Error Code Reference\" in the TDengine online documentation.\r\n"
 typedef struct {
   char*   hist[SHELL_MAX_HISTORY_SIZE];
   char    file[TSDB_FILENAME_LEN];

From 47625d6ddcd88a540ff0f8295d3aba5ff129bb2e Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 17:12:12 +0800
Subject: [PATCH 10/11] fix: add to help command

---
 tools/shell/src/shellAuto.c | 1 +
 1 file changed, 1 insertion(+)

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");
 }
 

From cdbb473f7df77d35b4e80b8dbbabf87fe39bad18 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 28 Nov 2024 17:20:13 +0800
Subject: [PATCH 11/11] restore shellArguments.c no modify status

---
 tools/shell/src/shellArguments.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index f542d71d8b..442329674d 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -93,6 +93,7 @@ void shellPrintHelp() {
   printf("\r\n\r\nReport bugs to %s.\r\n", "support@taosdata.com");
 #endif
 }
+
 #ifdef LINUX
 #include <argp.h>
 #ifdef _ALPINE