From 4f56af59c588377d9370fb9e3c46fe10901df6e2 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 30 Dec 2023 16:44:52 +0800
Subject: [PATCH 1/4] add -B set bi mode option

---
 tools/shell/inc/shellInt.h       | 1 +
 tools/shell/src/shellArguments.c | 6 ++++++
 tools/shell/src/shellEngine.c    | 9 +++++++++
 3 files changed, 16 insertions(+)

diff --git a/tools/shell/inc/shellInt.h b/tools/shell/inc/shellInt.h
index 1c885b151c..ba3dadc646 100644
--- a/tools/shell/inc/shellInt.h
+++ b/tools/shell/inc/shellInt.h
@@ -66,6 +66,7 @@ typedef struct {
   char        file[PATH_MAX];
   char        password[TSDB_USET_PASSWORD_LEN];
   bool        is_gen_auth;
+  bool        is_bi_mode;
   bool        is_raw_time;
   bool        is_version;
   bool        is_dump_config;
diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 4817b23029..1930a16f46 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -44,6 +44,7 @@
 #define SHELL_NET_ROLE "Net role when network connectivity test, options: client|server."
 #define SHELL_PKT_LEN  "Packet length used for net test, default is 1024 bytes."
 #define SHELL_PKT_NUM  "Packet numbers used for net test, default is 100."
+#define SHELL_BI_MODE  "Set BI mode"
 #define SHELL_VERSION  "Print program version."
 
 #ifdef WEBSOCKET
@@ -59,6 +60,7 @@ void shellPrintHelp() {
   printf("Usage: taos [OPTION...] \r\n\r\n");
   printf("%s%s%s%s\r\n", indent, "-a,", indent, SHELL_AUTH);
   printf("%s%s%s%s\r\n", indent, "-A,", indent, SHELL_GEN_AUTH);
+  printf("%s%s%s%s\r\n", indent, "-B,", indent, SHELL_BI_MODE);
   printf("%s%s%s%s\r\n", indent, "-c,", indent, SHELL_CFG_DIR);
   printf("%s%s%s%s\r\n", indent, "-C,", indent, SHELL_DMP_CFG);
   printf("%s%s%s%s\r\n", indent, "-d,", indent, SHELL_DB);
@@ -127,6 +129,7 @@ static struct argp_option shellOptions[] = {
     {"timeout", 'T', "SECONDS", 0, SHELL_TIMEOUT},
 #endif
     {"pktnum", 'N', "PKTNUM", 0, SHELL_PKT_NUM},
+    {"bimode", 'B', "BIMODE", 0, SHELL_BI_MODE},
     {0},
 };
 
@@ -173,6 +176,9 @@ static int32_t shellParseSingleOpt(int32_t key, char *arg) {
     case 'A':
       pArgs->is_gen_auth = true;
       break;
+    case 'B':
+      pArgs->is_bi_mode = true;
+      break;
     case 'c':
 #ifdef WEBSOCKET
       pArgs->cloud = false;
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index e8a5b04178..40b0236d07 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1291,6 +1291,15 @@ int32_t shellExecute() {
   shellSetConn(shell.conn, runOnce);
   shellReadHistory();
 
+ if(shell.args.is_bi_mode) { 
+  // need set bi mode
+#ifdef WEBSOCKET
+    //ws_taos_set_conn_mode(shell.ws_conn, TAOS_CONN_MODE_BI, 1);
+#else
+    taos_set_conn_mode(shell.conn, TAOS_CONN_MODE_BI, 1);
+#endif
+ }
+
   if (runOnce) {
     if (pArgs->commands != NULL) {
       printf("%s%s\r\n", shell.info.promptHeader, pArgs->commands);

From 861cb8572adcbd56c72834b3660ece57bdb52ad0 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 30 Dec 2023 17:15:08 +0800
Subject: [PATCH 2/4] fix: taos-tools can not  build passed

---
 source/libs/parser/src/parTranslater.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 3bb24566c2..3030ec5734 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -1104,11 +1104,9 @@ static EDealRes translateColumnUseAlias(STranslateContext* pCxt, SColumnNode** p
   return DEAL_RES_CONTINUE;
 }
 
-#ifndef TD_ENTERPRISE
 bool biRewriteToTbnameFunc(STranslateContext* pCxt, SNode** ppNode) {
   return false;
 }
-#endif
 
 static EDealRes translateColumn(STranslateContext* pCxt, SColumnNode** pCol) {
   if (NULL == pCxt->pCurrStmt ||
@@ -3178,9 +3176,7 @@ static int32_t createTags(STranslateContext* pCxt, SNodeList** pOutput) {
   return TSDB_CODE_SUCCESS;
 }
 
-#ifndef TD_ENTERPRISE
 int32_t biRewriteSelectStar(STranslateContext* pCxt, SSelectStmt* pSelect) { return TSDB_CODE_SUCCESS; }
-#endif
 
 static int32_t translateStar(STranslateContext* pCxt, SSelectStmt* pSelect) {
   SNode* pNode = NULL;
@@ -5743,11 +5739,9 @@ static int32_t checkTableDeleteMarkOption(STranslateContext* pCxt, STableOptions
   return code;
 }
 
-#ifndef TD_ENTERPRISE
 int32_t biCheckCreateTableTbnameCol(STranslateContext* pCxt, SCreateTableStmt* pStmt) {
   return TSDB_CODE_SUCCESS;
 }
-#endif
 
 static int32_t checkCreateTable(STranslateContext* pCxt, SCreateTableStmt* pStmt, bool createStable) {
   if (NULL != strchr(pStmt->tableName, '.')) {

From c6549b5ff65c7afccd9294f87693d175559a563c Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 30 Dec 2023 21:24:58 +0800
Subject: [PATCH 3/4] fix: format tweak

---
 tools/shell/src/shellArguments.c | 2 +-
 tools/shell/src/shellEngine.c    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 1930a16f46..71fa777d63 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -129,7 +129,7 @@ static struct argp_option shellOptions[] = {
     {"timeout", 'T', "SECONDS", 0, SHELL_TIMEOUT},
 #endif
     {"pktnum", 'N', "PKTNUM", 0, SHELL_PKT_NUM},
-    {"bimode", 'B', "BIMODE", 0, SHELL_BI_MODE},
+    {"bimode", 'B', 0, 0, SHELL_BI_MODE},
     {0},
 };
 
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 40b0236d07..60b1dfab41 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1293,6 +1293,7 @@ int32_t shellExecute() {
 
  if(shell.args.is_bi_mode) { 
   // need set bi mode
+  printf("Set BI mode is true.\n");
 #ifdef WEBSOCKET
     //ws_taos_set_conn_mode(shell.ws_conn, TAOS_CONN_MODE_BI, 1);
 #else

From 62b2a5320e6e35d909048e7745aa88490cd4c3c3 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 30 Dec 2023 21:29:49 +0800
Subject: [PATCH 4/4] fix: prune assert

---
 tools/shell/src/shellCommand.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tools/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c
index 8c91ff53e2..c6459c4590 100644
--- a/tools/shell/src/shellCommand.c
+++ b/tools/shell/src/shellCommand.c
@@ -62,7 +62,6 @@ int32_t shellCountPrefixOnes(uint8_t c) {
 }
 
 void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
-  ASSERT(pos > 0);
   if (pos <= 0) return;
 
   TdWchar wc;
@@ -82,7 +81,6 @@ void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
 }
 
 void shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
-  ASSERT(pos >= 0);
   if(pos < 0) return;
 
   TdWchar wc;
@@ -91,7 +89,6 @@ void shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *
 }
 
 void shellInsertChar(SShellCmd *cmd, char *c, int32_t size) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   TdWchar wc;
@@ -138,7 +135,6 @@ void shellInsertStr(SShellCmd *cmd, char *str, int32_t size) {
 }
 
 void shellBackspaceChar(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset > 0) {
@@ -159,7 +155,6 @@ void shellBackspaceChar(SShellCmd *cmd) {
 }
 
 void shellClearLineBefore(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -174,7 +169,6 @@ void shellClearLineBefore(SShellCmd *cmd) {
 }
 
 void shellClearLineAfter(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
@@ -184,7 +178,6 @@ void shellClearLineAfter(SShellCmd *cmd) {
 }
 
 void shellDeleteChar(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset < cmd->commandSize) {
@@ -203,7 +196,6 @@ void shellDeleteChar(SShellCmd *cmd) {
 }
 
 void shellMoveCursorLeft(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset > 0) {
@@ -218,7 +210,6 @@ void shellMoveCursorLeft(SShellCmd *cmd) {
 }
 
 void shellMoveCursorRight(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset < cmd->commandSize) {
@@ -233,7 +224,6 @@ void shellMoveCursorRight(SShellCmd *cmd) {
 }
 
 void shellPositionCursorHome(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset > 0) {
@@ -254,7 +244,6 @@ void positionCursorMiddle(SShellCmd *cmd) {
 }
 
 void shellPositionCursorEnd(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (cmd->cursorOffset < cmd->commandSize) {
@@ -290,7 +279,6 @@ void shellPositionCursor(int32_t step, int32_t direction) {
 }
 
 void shellUpdateBuffer(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   if (shellRegexMatch(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
@@ -306,7 +294,6 @@ void shellUpdateBuffer(SShellCmd *cmd) {
 }
 
 bool shellIsReadyGo(SShellCmd *cmd) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return false;
 
   char *total = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
@@ -334,7 +321,6 @@ void shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width) {
 }
 
 void shellResetCommand(SShellCmd *cmd, const char s[]) {
-  ASSERT(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
   if(cmd->cursorOffset > cmd->commandSize || cmd->endOffset < cmd->screenOffset) return;
 
   shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);