other: merge 3.0

tools/shell/inc/shell.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_SHELL_H_
-#define _TD_SHELL_H_
-
-#include "os.h"
-
-#include "taos.h"
-#include "taosdef.h"
-
-#define MAX_USERNAME_SIZE      64
-#define MAX_DBNAME_SIZE        64
-#define MAX_IP_SIZE            20
-#define MAX_HISTORY_SIZE       1000
-#define MAX_COMMAND_SIZE       1048586
-#define HISTORY_FILE           ".taos_history"
-
-#define DEFAULT_RES_SHOW_NUM   100
-
-typedef struct SShellHistory {
-  char* hist[MAX_HISTORY_SIZE];
-  int   hstart;
-  int   hend;
-} SShellHistory;
-
-typedef struct SShellArguments {
-  char* host;
-  char* password;
-  char* user;
-  char* auth;
-  char* database;
-  char* timezone;
-  bool  is_raw_time;
-  bool  is_use_passwd;
-  bool  dump_config;
-  char  file[TSDB_FILENAME_LEN];
-  char  dir[TSDB_FILENAME_LEN];
-  int   threadNum;
-  int   check;
-  bool  status;
-  bool  verbose;
-  char* commands;
-  int   abort;
-  int   port;
-  int   pktLen;
-  int   pktNum;
-  char* pktType;
-  char* netTestRole;
-} SShellArguments;
-
-/**************** Function declarations ****************/
-extern void shellParseArgument(int argc, char* argv[], SShellArguments* arguments);
-extern TAOS* shellInit(SShellArguments* args);
-extern void* shellLoopQuery(void* arg);
-extern void taos_error(TAOS_RES* tres, int64_t st);
-extern int regex_match(const char* s, const char* reg, int cflags);
-int32_t shellReadCommand(TAOS* con, char command[]);
-int32_t shellRunCommand(TAOS* con, char* command);
-void shellRunCommandOnServer(TAOS* con, char command[]);
-void read_history();
-void write_history();
-void source_file(TAOS* con, char* fptr);
-void source_dir(TAOS* con, SShellArguments* args);
-void get_history_path(char* history);
-void shellCheck(TAOS* con, SShellArguments* args);
-void cleanup_handler(void* arg);
-void exitShell();
-int shellDumpResult(TAOS_RES* con, char* fname, int* error_no, bool printMode);
-void shellGetGrantInfo(void *con);
-int isCommentLine(char *line);
-
-/**************** Global variable declarations ****************/
-extern char           PROMPT_HEADER[];
-extern char           CONTINUE_PROMPT[];
-extern int            prompt_size;
-extern SShellHistory  history;
-extern SShellArguments args;
-extern int64_t         result;
-
-#endif

tools/shell/inc/shellCommand.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_SHELL_COMMAND_H_
-#define _TD_SHELL_COMMAND_H_
-
-#include "shell.h"
-
-#define LEFT  1
-#define RIGHT 2
-#define UP    3
-#define DOWN  4
-
-typedef struct Command Command;
-struct Command {
-  char *   buffer;
-  char *   command;
-  unsigned commandSize;
-  unsigned bufferSize;
-  unsigned cursorOffset;
-  unsigned screenOffset;
-  unsigned endOffset;
-};
-
-extern void backspaceChar(Command *cmd);
-extern void clearLineBefore(Command *cmd);
-extern void clearLineAfter(Command *cmd);
-extern void deleteChar(Command *cmd);
-extern void moveCursorLeft(Command *cmd);
-extern void moveCursorRight(Command *cmd);
-extern void positionCursorHome(Command *cmd);
-extern void positionCursorEnd(Command *cmd);
-extern void showOnScreen(Command *cmd);
-extern void updateBuffer(Command *cmd);
-extern int isReadyGo(Command *cmd);
-extern void resetCommand(Command *cmd, const char s[]);
-
-int countPrefixOnes(unsigned char c);
-void clearScreen(int ecmd_pos, int cursor_pos);
-void printChar(char c, int times);
-void positionCursor(int step, int direction);
-
-#endif

tools/shell/inc/shellInt.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TD_SHELL_INT_H_
+#define _TD_SHELL_INT_H_
+
+#include "os.h"
+#include "taos.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "trpc.h"
+#include "ttypes.h"
+#include "tutil.h"
+
+#define SHELL_MAX_HISTORY_SIZE                 1000
+#define SHELL_MAX_COMMAND_SIZE                 1048586
+#define SHELL_HISTORY_FILE                     ".taos_history"
+#define SHELL_DEFAULT_RES_SHOW_NUM             100
+#define SHELL_DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
+#define SHELL_MAX_PKG_LEN                      2 * 1024 * 1024
+#define SHELL_MIN_PKG_LEN                      1
+#define SHELL_DEF_PKG_LEN                      1024
+#define SHELL_MAX_PKG_NUM                      1 * 1024 * 1024
+#define SHELL_MIN_PKG_NUM                      1
+#define SHELL_DEF_PKG_NUM                      100
+
+typedef struct {
+  char*   hist[SHELL_MAX_HISTORY_SIZE];
+  char    file[TSDB_FILENAME_LEN];
+  int32_t hstart;
+  int32_t hend;
+} SShellHistory;
+
+typedef struct {
+  const char* host;
+  const char* user;
+  const char* auth;
+  const char* database;
+  const char* cfgdir;
+  const char* commands;
+  const char* netrole;
+  char        file[PATH_MAX];
+  char        password[TSDB_USET_PASSWORD_LEN];
+  bool        is_gen_auth;
+  bool        is_raw_time;
+  bool        is_version;
+  bool        is_dump_config;
+  bool        is_check;
+  bool        is_startup;
+  bool        is_help;
+  uint16_t    port;
+  int32_t     pktLen;
+  int32_t     pktNum;
+  int32_t     displayWidth;
+  int32_t     abort;
+} SShellArgs;
+
+typedef struct {
+  const char* clientVersion;
+  const char* promptHeader;
+  const char* promptContinue;
+  const char* osname;
+  int32_t     promptSize;
+  char        programVersion[32];
+} SShellOsDetails;
+
+typedef struct {
+  SShellArgs      args;
+  SShellHistory   history;
+  SShellOsDetails info;
+  TAOS*           conn;
+  TdThread        pid;
+  tsem_t          cancelSem;
+  int64_t         result;
+} SShellObj;
+
+// shellArguments.c
+int32_t shellParseArgs(int32_t argc, char* argv[]);
+
+// shellCommand.c
+int32_t shellReadCommand(char* command);
+
+// shellEngine.c
+int32_t shellExecute();
+
+// shellUtil.c
+int32_t shellCheckIntSize();
+void    shellPrintVersion();
+void    shellPrintHelp();
+void    shellGenerateAuth();
+void    shellDumpConfig();
+void    shellCheckServerStatus();
+bool    shellRegexMatch(const char* s, const char* reg, int32_t cflags);
+void    shellExit();
+
+// shellNettest.c
+void shellTestNetWork();
+
+// shellMain.c
+extern SShellObj shell;
+extern void      taos_init();
+
+#endif /*_TD_SHELL_INT_H_*/

tools/shell/inc/syncMsg.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_SYNC_MSG_H
-#define TDENGINE_SYNC_MSG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "tsync.h"
-
-typedef enum {
-  TAOS_SMSG_START         = 0,
-  TAOS_SMSG_SYNC_DATA     = 1,
-  TAOS_SMSG_SYNC_DATA_RSP = 2,
-  TAOS_SMSG_SYNC_FWD      = 3,
-  TAOS_SMSG_SYNC_FWD_RSP  = 4,
-  TAOS_SMSG_SYNC_REQ      = 5,
-  TAOS_SMSG_SYNC_REQ_RSP  = 6,
-  TAOS_SMSG_SYNC_MUST     = 7,
-  TAOS_SMSG_SYNC_MUST_RSP = 8,
-  TAOS_SMSG_STATUS        = 9,
-  TAOS_SMSG_STATUS_RSP    = 10,
-  TAOS_SMSG_SETUP         = 11,
-  TAOS_SMSG_SETUP_RSP     = 12,
-  TAOS_SMSG_SYNC_FILE     = 13,
-  TAOS_SMSG_SYNC_FILE_RSP = 14,
-  TAOS_SMSG_TEST          = 15,
-  TAOS_SMSG_END           = 16
-} ESyncMsgType;
-
-typedef enum {
-  SYNC_STATUS_BROADCAST,
-  SYNC_STATUS_BROADCAST_RSP,
-  SYNC_STATUS_SETUP_CONN,
-  SYNC_STATUS_SETUP_CONN_RSP,
-  SYNC_STATUS_EXCHANGE_DATA,
-  SYNC_STATUS_EXCHANGE_DATA_RSP,
-  SYNC_STATUS_CHECK_ROLE,
-  SYNC_STATUS_CHECK_ROLE_RSP
-} ESyncStatusType;
-
-#pragma pack(push, 1)
-
-typedef struct {
-  int8_t   type;       // msg type
-  int8_t   protocol;   // protocol version
-  uint16_t signature;  // fixed value
-  int32_t  code;       //
-  int32_t  cId;        // cluster Id
-  int32_t  vgId;       // vg ID
-  int32_t  len;        // content length, does not include head
-  uint32_t cksum;
-} SSyncHead;
-
-typedef struct {
-  SSyncHead head;
-  uint16_t  port;
-  uint16_t  tranId;
-  int32_t   sourceId;  // only for arbitrator
-  char      fqdn[TSDB_FQDN_LEN];
-} SSyncMsg;
-
-typedef struct {
-  SSyncHead head;
-  int8_t    sync;
-  int8_t    reserved;
-  uint16_t  tranId;
-  int8_t    reserverd[4];
-} SSyncRsp;
-
-typedef struct {
-  int8_t    role;
-  uint64_t  version;
-} SPeerStatus;
-
-typedef struct {
-  SSyncHead   head;
-  int8_t      role;
-  int8_t      ack;
-  int8_t      type;
-  int8_t      reserved[3];
-  uint16_t    tranId;
-  uint64_t    version;
-  SPeerStatus peersStatus[TAOS_SYNC_MAX_REPLICA];
-} SPeersStatus;
-
-typedef struct {
-  SSyncHead head;
-  uint64_t  fversion;
-} SFileVersion;
-
-typedef struct {
-  SSyncHead head;
-  int8_t    ack;
-} SFileAck;
-
-typedef struct {
-  SSyncHead head;
-  uint64_t  version;
-  int32_t   code;
-} SFwdRsp;
-
-#pragma pack(pop)
-
-#define SYNC_PROTOCOL_VERSION 1
-#define SYNC_SIGNATURE ((uint16_t)(0xCDEF))
-
-extern char *statusType[];
-
-uint16_t syncGenTranId();
-int32_t  syncCheckHead(SSyncHead *pHead);
-
-void syncBuildSyncFwdMsg(SSyncHead *pHead, int32_t vgId, int32_t len);
-void syncBuildSyncFwdRsp(SFwdRsp *pMsg, int32_t vgId, uint64_t version, int32_t code);
-void syncBuildSyncReqMsg(SSyncMsg *pMsg, int32_t vgId);
-void syncBuildSyncDataMsg(SSyncMsg *pMsg, int32_t vgId);
-void syncBuildSyncSetupMsg(SSyncMsg *pMsg, int32_t vgId);
-void syncBuildPeersStatus(SPeersStatus *pMsg, int32_t vgId);
-void syncBuildSyncTestMsg(SSyncMsg *pMsg, int32_t vgId);
-
-void syncBuildFileAck(SFileAck *pMsg, int32_t vgId);
-void syncBuildFileVersion(SFileVersion *pMsg, int32_t vgId);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEPEER_H

tools/shell/inc/tsync.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_SYNC_H
-#define TDENGINE_SYNC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TAOS_SYNC_MAX_REPLICA 5
-#define TAOS_SYNC_MAX_INDEX   0x7FFFFFFF
-
-typedef enum {
-  TAOS_SYNC_ROLE_OFFLINE  = 0,
-  TAOS_SYNC_ROLE_UNSYNCED = 1,
-  TAOS_SYNC_ROLE_SYNCING  = 2,
-  TAOS_SYNC_ROLE_SLAVE    = 3,
-  TAOS_SYNC_ROLE_MASTER   = 4
-} ESyncRole;
-
-typedef enum {
-  TAOS_SYNC_STATUS_INIT  = 0,
-  TAOS_SYNC_STATUS_START = 1,
-  TAOS_SYNC_STATUS_FILE  = 2,
-  TAOS_SYNC_STATUS_CACHE = 3
-} ESyncStatus;
-
-typedef struct {
-  uint32_t  nodeId;    // node ID assigned by TDengine
-  uint16_t  nodePort;  // node sync Port
-  char      nodeFqdn[TSDB_FQDN_LEN]; // node FQDN  
-} SNodeInfo;
-
-typedef struct {
-  int8_t     quorum;    // number of confirms required, >=1 
-  int8_t     replica;   // number of replications, >=1
-  SNodeInfo  nodeInfo[TAOS_SYNC_MAX_REPLICA];
-} SSyncCfg;
-
-typedef struct {
-  int32_t  selfIndex;
-  uint32_t nodeId[TAOS_SYNC_MAX_REPLICA];
-  int32_t  role[TAOS_SYNC_MAX_REPLICA];
-} SNodesRole;
-
-// get the wal file from index or after
-// return value, -1: error, 1:more wal files, 0:last WAL. if name[0]==0, no WAL file
-typedef int32_t  (*FGetWalInfo)(int32_t vgId, char *fileName, int64_t *fileId); 
- 
-// when a forward pkt is received, call this to handle data
-typedef int32_t  (*FWriteToCache)(int32_t vgId, void *pHead, int32_t qtype, void *pMsg);
-
-// when forward is confirmed by peer, master call this API to notify app
-typedef void     (*FConfirmForward)(int32_t vgId, void *mhandle, int32_t code);
-
-// when role is changed, call this to notify app
-typedef void     (*FNotifyRole)(int32_t vgId, int8_t role);
-
-// if a number of retrieving data failed, call this to start flow control 
-typedef void     (*FNotifyFlowCtrl)(int32_t vgId, int32_t level);
-
-// when data file is synced successfully, notity app
-typedef void     (*FStartSyncFile)(int32_t vgId);
-typedef void     (*FStopSyncFile)(int32_t vgId, uint64_t fversion);
-
-// get file version
-typedef int32_t  (*FGetVersion)(int32_t vgId, uint64_t *fver, uint64_t *vver);
-
-typedef int32_t  (*FSendFile)(void *tsdb, SOCKET socketFd);
-typedef int32_t  (*FRecvFile)(void *tsdb, SOCKET socketFd);
-
-typedef struct {
-  int32_t  vgId;       // vgroup ID
-  uint64_t version;    // initial version
-  SSyncCfg syncCfg;    // configuration from mgmt
-  char     path[TSDB_FILENAME_LEN];  // path to the file
-  void *   pTsdb;
-  FGetWalInfo       getWalInfoFp;
-  FWriteToCache     writeToCacheFp;
-  FConfirmForward   confirmForward;
-  FNotifyRole       notifyRoleFp;
-  FNotifyFlowCtrl   notifyFlowCtrlFp;
-  FStartSyncFile    startSyncFileFp;
-  FStopSyncFile     stopSyncFileFp;
-  FGetVersion       getVersionFp;
-  FSendFile         sendFileFp;
-  FRecvFile         recvFileFp;
-} SSyncInfo;
-
-typedef void *tsync_h;
-
-int32_t syncInit();
-void    syncCleanUp();
-
-int64_t syncStart(const SSyncInfo *);
-void    syncStop(int64_t rid);
-int32_t syncReconfig(int64_t rid, const SSyncCfg *);
-int32_t syncForwardToPeer(int64_t rid, void *pHead, void *mhandle, int32_t qtype, bool force);
-void    syncConfirmForward(int64_t rid, uint64_t version, int32_t code, bool force);
-void    syncRecover(int64_t rid);  // recover from other nodes:
-int32_t syncGetNodesRole(int64_t rid, SNodesRole *);
-
-extern char *syncRole[];
-
-//global configurable parameters
-extern int32_t  sDebugFlag;
-extern char     tsArbitrator[];
-extern uint16_t tsSyncPort;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_SYNC_H

tools/shell/src/backup/shellCheck.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-#include "shell.h"
-#include "shellCommand.h"
-#include "tglobal.h"
-#include "tutil.h"
-
-#define SHELL_SQL_LEN 1024
-static int32_t tbNum = 0;
-static int32_t tbMallocNum = 0;
-static char ** tbNames = NULL;
-static int32_t checkedNum = 0;
-static int32_t errorNum = 0;
-
-typedef struct {
-  TdThread threadID;
-  int       threadIndex;
-  int       totalThreads;
-  void *    taos;
-  char *    db;
-} ShellThreadObj;
-
-static int32_t shellUseDb(TAOS *con, char *db) {
-  if (db == NULL) {
-    fprintf(stdout, "no dbname input\n");
-    return -1;
-  }
-
-  char sql[SHELL_SQL_LEN] = {0};
-  snprintf(sql, SHELL_SQL_LEN, "use %s", db);
-
-  TAOS_RES *pSql = taos_query(con, sql);
-  int32_t   code = taos_errno(pSql);
-  if (code != 0) {
-    fprintf(stdout, "failed to execute sql:%s since %s", sql, taos_errstr(pSql));
-  }
-
-  taos_free_result(pSql);
-  return code;
-}
-
-static int32_t shellShowTables(TAOS *con, char *db) {
-  char sql[SHELL_SQL_LEN] = {0};
-  snprintf(sql, SHELL_SQL_LEN, "show %s.tables", db);
-
-  TAOS_RES *pSql = taos_query(con, sql);
-  int32_t   code = taos_errno(pSql);
-
-  if (code != 0) {
-    fprintf(stdout, "failed to execute sql:%s since %s\n", sql, taos_errstr(pSql));
-  } else {
-    TAOS_ROW row;
-    while ((row = taos_fetch_row(pSql))) {
-      int32_t tbIndex = tbNum++;
-      if (tbMallocNum < tbNum) {
-        tbMallocNum = (tbMallocNum * 2 + 1);
-        char** tbNames1 = taosMemoryRealloc(tbNames, tbMallocNum * sizeof(char *));
-        if (tbNames1 == NULL) {
-          fprintf(stdout, "failed to malloc tablenames, num:%d\n", tbMallocNum);
-          code = TSDB_CODE_TSC_OUT_OF_MEMORY;
-          break;
-        }
-        tbNames = tbNames1;
-      }
-
-      tbNames[tbIndex] = taosMemoryMalloc(TSDB_TABLE_NAME_LEN);
-      strncpy(tbNames[tbIndex], (const char *)row[0], TSDB_TABLE_NAME_LEN);
-      if (tbIndex % 100000 == 0 && tbIndex != 0) {
-        fprintf(stdout, "%d tablenames fetched\n", tbIndex);
-      }
-    }
-  }
-
-  taos_free_result(pSql);
-
-  fprintf(stdout, "total %d tablenames fetched, over\n", tbNum);
-  return code;
-}
-
-static void shellFreeTbnames() {
-  for (int32_t i = 0; i < tbNum; ++i) {
-    taosMemoryFree(tbNames[i]);
-  }
-  taosMemoryFree(tbNames);
-}
-
-static void *shellCheckThreadFp(void *arg) {
-  ShellThreadObj *pThread = (ShellThreadObj *)arg;
-
-  setThreadName("shellCheckThrd");
-
-  int32_t interval = tbNum / pThread->totalThreads + 1;
-  int32_t start = pThread->threadIndex * interval;
-  int32_t end = (pThread->threadIndex + 1) * interval;
-
-  if (end > tbNum) end = tbNum + 1;
-
-  char file[32] = {0};
-  snprintf(file, 32, "tb%d.txt", pThread->threadIndex);
-
-  TdFilePtr pFile = taosOpenFile(file, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
-  if (!fp) {
-    fprintf(stdout, "failed to open %s, reason:%s", file, strerror(errno));
-    return NULL;
-  }
-
-  char sql[SHELL_SQL_LEN];
-  for (int32_t t = start; t < end; ++t) {
-    char *tbname = tbNames[t];
-    if (tbname == NULL) break;
-
-    snprintf(sql, SHELL_SQL_LEN, "select * from %s limit 1", tbname);
-
-    TAOS_RES *pSql = taos_query(pThread->taos, sql);
-    int32_t   code = taos_errno(pSql);
-    if (code != 0) {
-      int32_t len = snprintf(sql, SHELL_SQL_LEN, "drop table %s.%s;\n", pThread->db, tbname);
-      taosWriteFile(pFile, sql, len);
-      atomic_add_fetch_32(&errorNum, 1);
-    }
-
-    int32_t cnum = atomic_add_fetch_32(&checkedNum, 1);
-    if (cnum % 5000 == 0 && cnum != 0) {
-      fprintf(stdout, "%d tables checked\n", cnum);
-    }
-
-    taos_free_result(pSql);
-  }
-
-  taosFsync(pFile);
-  taosCloseFile(&pFile);
-
-  return NULL;
-}
-
-static void shellRunCheckThreads(TAOS *con, SShellArguments *_args) {
-  TdThreadAttr  thattr;
-  ShellThreadObj *threadObj = (ShellThreadObj *)taosMemoryCalloc(_args->threadNum, sizeof(ShellThreadObj));
-  for (int t = 0; t < _args->threadNum; ++t) {
-    ShellThreadObj *pThread = threadObj + t;
-    pThread->threadIndex = t;
-    pThread->totalThreads = _args->threadNum;
-    pThread->taos = con;
-    pThread->db = _args->database;
-
-    taosThreadAttrInit(&thattr);
-    taosThreadAttrSetDetachState(&thattr, PTHREAD_CREATE_JOINABLE);
-
-    if (taosThreadCreate(&(pThread->threadID), &thattr, shellCheckThreadFp, (void *)pThread) != 0) {
-      fprintf(stderr, "ERROR: thread:%d failed to start\n", pThread->threadIndex);
-      exit(0);
-    }
-  }
-
-  for (int t = 0; t < _args->threadNum; ++t) {
-    taosThreadJoin(threadObj[t].threadID, NULL);
-  }
-
-  for (int t = 0; t < _args->threadNum; ++t) {
-    taos_close(threadObj[t].taos);
-  }
-  taosMemoryFree(threadObj);
-}
-
-void shellCheck(TAOS *con, SShellArguments *_args) {
-  int64_t start = taosGetTimestampMs();
-
-  if (shellUseDb(con, _args->database) != 0) {
-    shellFreeTbnames();
-    return;
-  }
-
-  if (shellShowTables(con, _args->database) != 0) {
-    shellFreeTbnames();
-    return;
-  }
-
-  fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, _args->threadNum);
-  shellRunCheckThreads(con, _args);
-
-  int64_t end = taosGetTimestampMs();
-  fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,
-          (end - start) / 1000.0);
-}

tools/shell/src/backup/shellDarwin.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define __USE_XOPEN
-
-#include "os.h"
-
-#include "shell.h"
-#include "shellCommand.h"
-#include "tbase64.h"
-
-#include "tscLog.h"
-
-#define OPT_ABORT 1 /* �Cabort */
-
-int indicator = 1;
-struct termios oldtio;
-
-void insertChar(Command *cmd, char *c, int size);
-
-
-void printHelp() {
-  char indent[10] = "        ";
-  printf("taos shell is used to test the TDengine database\n");
-
-  printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDengine server IP address to connect. The default host is localhost.");
-  printf("%s%s\n", indent, "-p");
-  printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
-  printf("%s%s\n", indent, "-P");
-  printf("%s%s%s\n", indent, indent, "The TCP/IP port number to use for the connection");
-  printf("%s%s\n", indent, "-u");
-  printf("%s%s%s\n", indent, indent, "The user name to use when connecting to the server.");
-  printf("%s%s\n", indent, "-c");
-  printf("%s%s%s\n", indent, indent, "Configuration directory.");
-  printf("%s%s\n", indent, "-s");
-  printf("%s%s%s\n", indent, indent, "Commands to run without enter the shell.");
-  printf("%s%s\n", indent, "-r");
-  printf("%s%s%s\n", indent, indent, "Output time as unsigned long..");
-  printf("%s%s\n", indent, "-f");
-  printf("%s%s%s\n", indent, indent, "Script to run without enter the shell.");
-  printf("%s%s\n", indent, "-d");
-  printf("%s%s%s\n", indent, indent, "Database to use when connecting to the server.");
-  printf("%s%s\n", indent, "-t");
-  printf("%s%s%s\n", indent, indent, "Time zone of the shell, default is local.");
-  printf("%s%s\n", indent, "-D");
-  printf("%s%s%s\n", indent, indent, "Use multi-thread to import all SQL files in the directory separately.");
-  printf("%s%s\n", indent, "-T");
-  printf("%s%s%s\n", indent, indent, "Number of threads when using multi-thread to import data.");
-
-  exit(EXIT_SUCCESS);
-}
-
-char      DARWINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
-char g_password[SHELL_MAX_PASSWORD_LEN];
-
-void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
-  wordexp_t full_path;
-  for (int i = 1; i < argc; i++) {
-    // for host
-    if (strcmp(argv[i], "-h") == 0) {
-      if (i < argc - 1) {
-        arguments->host = argv[++i];
-      } else {
-        fprintf(stderr, "option -h requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // for password
-    else if ((strncmp(argv[i], "-p", 2) == 0)
-            || (strncmp(argv[i], "--password", 10) == 0)) {
-        strcpy(tsOsName, "Darwin");
-        printf(DARWINCLIENT_VERSION, tsOsName, taos_get_client_info());
-        if ((strlen(argv[i]) == 2)
-                  || (strncmp(argv[i], "--password", 10) == 0)) {
-            printf("Enter password: ");
-            taosSetConsoleEcho(false);
-            if (scanf("%s", g_password) > 1) {
-                fprintf(stderr, "password read error\n");
-            }
-            taosSetConsoleEcho(true);
-            getchar();
-        } else {
-            tstrncpy(g_password, (char *)(argv[i] + 2), SHELL_MAX_PASSWORD_LEN);
-        }
-        arguments->password = g_password;
-        arguments->is_use_passwd = true;
-        strcpy(argv[i], "");
-        argc -= 1;
-    }
-    // for management port
-    else if (strcmp(argv[i], "-P") == 0) {
-      if (i < argc - 1) {
-        arguments->port = atoi(argv[++i]);
-      } else {
-        fprintf(stderr, "option -P requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // for user
-    else if (strcmp(argv[i], "-u") == 0) {
-      if (i < argc - 1) {
-        arguments->user = argv[++i];
-      } else {
-        fprintf(stderr, "option -u requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {
-        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
-          fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
-          exit(EXIT_FAILURE);
-        }
-        strcpy(configDir, argv[i]);
-      } else {
-        fprintf(stderr, "Option -c requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-s") == 0) {
-      if (i < argc - 1) {
-        arguments->commands = argv[++i];
-      } else {
-        fprintf(stderr, "option -s requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-r") == 0) {
-      arguments->is_raw_time = true;
-    }
-      // For temperory batch commands to run TODO
-    else if (strcmp(argv[i], "-f") == 0) {
-      if (i < argc - 1) {
-        strcpy(arguments->file, argv[++i]);
-      } else {
-        fprintf(stderr, "option -f requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // for default database
-    else if (strcmp(argv[i], "-d") == 0) {
-      if (i < argc - 1) {
-        arguments->database = argv[++i];
-      } else {
-        fprintf(stderr, "option -d requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // For time zone
-    else if (strcmp(argv[i], "-t") == 0) {
-      if (i < argc - 1) {
-        arguments->timezone = argv[++i];
-      } else {
-        fprintf(stderr, "option -t requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // For import directory
-    else if (strcmp(argv[i], "-D") == 0) {
-      if (i < argc - 1) {
-        if (wordexp(argv[++i], &full_path, 0) != 0) {
-          fprintf(stderr, "Invalid path %s\n", argv[i]);
-          exit(EXIT_FAILURE);
-        }
-        strcpy(arguments->dir, full_path.we_wordv[0]);
-        wordfree(&full_path);
-      } else {
-        fprintf(stderr, "option -D requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // For time zone
-    else if (strcmp(argv[i], "-T") == 0) {
-      if (i < argc - 1) {
-        arguments->threadNum = atoi(argv[++i]);
-      } else {
-        fprintf(stderr, "option -T requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-      // For temperory command TODO
-    else if (strcmp(argv[i], "--help") == 0) {
-      printHelp();
-      exit(EXIT_FAILURE);
-    } else {
-      fprintf(stderr, "wrong options\n");
-      printHelp();
-      exit(EXIT_FAILURE);
-    }
-  }
-}
-
-int32_t shellReadCommand(TAOS *con, char *command) {
-  unsigned hist_counter = history.hend;
-  char utf8_array[10] = "\0";
-  Command cmd;
-  memset(&cmd, 0, sizeof(cmd));
-  cmd.buffer = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  cmd.command = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  showOnScreen(&cmd);
-
-  // Read input.
-  char c;
-  while (1) {
-    c = getchar();
-
-    if (c < 0) {  // For UTF-8
-      int count = countPrefixOnes(c);
-      utf8_array[0] = c;
-      for (int k = 1; k < count; k++) {
-        c = getchar();
-        utf8_array[k] = c;
-      }
-      insertChar(&cmd, utf8_array, count);
-    } else if (c < '\033') {
-      // Ctrl keys.  TODO: Implement ctrl combinations
-      switch (c) {
-        case 1:  // ctrl A
-          positionCursorHome(&cmd);
-          break;
-        case 3:
-          printf("\n");
-          resetCommand(&cmd, "");
-          kill(0, SIGINT);
-          break;
-        case 4:  // EOF or Ctrl+D
-          printf("\n");
-          taos_close(con);
-          // write the history
-          write_history();
-          exitShell();
-          break;
-        case 5:  // ctrl E
-          positionCursorEnd(&cmd);
-          break;
-        case 8:
-          backspaceChar(&cmd);
-          break;
-        case '\n':
-        case '\r':
-          printf("\n");
-          if (isReadyGo(&cmd)) {
-            sprintf(command, "%s%s", cmd.buffer, cmd.command);
-            taosMemoryFreeClear(cmd.buffer);
-            taosMemoryFreeClear(cmd.command);
-            return 0;
-          } else {
-            updateBuffer(&cmd);
-          }
-          break;
-        case 11:  // Ctrl + K;
-          clearLineAfter(&cmd);
-          break;
-        case 12:  // Ctrl + L;
-          system("clear");
-          showOnScreen(&cmd);
-          break;
-        case 21:  // Ctrl + U
-          clearLineBefore(&cmd);
-          break;
-      }
-    } else if (c == '\033') {
-      c = getchar();
-      switch (c) {
-        case '[':
-          c = getchar();
-          switch (c) {
-            case 'A':  // Up arrow
-              if (hist_counter != history.hstart) {
-                hist_counter = (hist_counter + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE;
-                resetCommand(&cmd, (history.hist[hist_counter] == NULL) ? "" : history.hist[hist_counter]);
-              }
-              break;
-            case 'B':  // Down arrow
-              if (hist_counter != history.hend) {
-                int next_hist = (hist_counter + 1) % MAX_HISTORY_SIZE;
-
-                if (next_hist != history.hend) {
-                  resetCommand(&cmd, (history.hist[next_hist] == NULL) ? "" : history.hist[next_hist]);
-                } else {
-                  resetCommand(&cmd, "");
-                }
-                hist_counter = next_hist;
-              }
-              break;
-            case 'C':  // Right arrow
-              moveCursorRight(&cmd);
-              break;
-            case 'D':  // Left arrow
-              moveCursorLeft(&cmd);
-              break;
-            case '1':
-              if ((c = getchar()) == '~') {
-                // Home key
-                positionCursorHome(&cmd);
-              }
-              break;
-            case '2':
-              if ((c = getchar()) == '~') {
-                // Insert key
-              }
-              break;
-            case '3':
-              if ((c = getchar()) == '~') {
-                // Delete key
-                deleteChar(&cmd);
-              }
-              break;
-            case '4':
-              if ((c = getchar()) == '~') {
-                // End key
-                positionCursorEnd(&cmd);
-              }
-              break;
-            case '5':
-              if ((c = getchar()) == '~') {
-                // Page up key
-              }
-              break;
-            case '6':
-              if ((c = getchar()) == '~') {
-                // Page down key
-              }
-              break;
-            case 72:
-              // Home key
-              positionCursorHome(&cmd);
-              break;
-            case 70:
-              // End key
-              positionCursorEnd(&cmd);
-              break;
-          }
-          break;
-      }
-    } else if (c == 0x7f) {
-      // press delete key
-      backspaceChar(&cmd);
-    } else {
-      insertChar(&cmd, &c, 1);
-    }
-  }
-
-  return 0;
-}
-
-void *shellLoopQuery(void *arg) {
-  if (indicator) {
-    getOldTerminalMode();
-    indicator = 0;
-  }
-
-  TAOS *con = (TAOS *)arg;
-
-  setThreadName("shellLoopQuery");
-
-  taosThreadCleanupPush(cleanup_handler, NULL);
-
-    char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
-    if (command == NULL){
-      tscError("failed to malloc command");
-      return NULL;
-    }
-
-    int32_t err = 0;
-
-    do {
-      // Read command from shell.
-      memset(command, 0, MAX_COMMAND_SIZE);
-      setTerminalMode();
-      err = shellReadCommand(con, command);
-      if (err) {
-        break;
-      }
-      resetTerminalMode();
-    } while (shellRunCommand(con, command) == 0);
-
-  taosMemoryFreeClear(command);
-  exitShell();
-
-  taosThreadCleanupPop(1);
-
-  return NULL;
-}
-
-void get_history_path(char *history) { sprintf(history, "%s/%s", getpwuid(getuid())->pw_dir, HISTORY_FILE); }
-
-void clearScreen(int ecmd_pos, int cursor_pos) {
-  struct winsize w;
-  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
-    //fprintf(stderr, "No stream device, and use default value(col 120, row 30)\n");
-    w.ws_col = 120;
-    w.ws_row = 30;
-  }
-
-  int cursor_x = cursor_pos / w.ws_col;
-  int cursor_y = cursor_pos % w.ws_col;
-  int command_x = ecmd_pos / w.ws_col;
-  positionCursor(cursor_y, LEFT);
-  positionCursor(command_x - cursor_x, DOWN);
-  fprintf(stdout, "\033[2K");
-  for (int i = 0; i < command_x; i++) {
-    positionCursor(1, UP);
-    fprintf(stdout, "\033[2K");
-  }
-  fflush(stdout);
-}
-
-void showOnScreen(Command *cmd) {
-  struct winsize w;
-  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
-    //fprintf(stderr, "No stream device\n");
-    w.ws_col = 120;
-    w.ws_row = 30;
-  }
-
-  TdWchar wc;
-  int size = 0;
-
-  // Print out the command.
-  char *total_string = taosMemoryMalloc(MAX_COMMAND_SIZE);
-  memset(total_string, '\0', MAX_COMMAND_SIZE);
-  if (strcmp(cmd->buffer, "") == 0) {
-    sprintf(total_string, "%s%s", PROMPT_HEADER, cmd->command);
-  } else {
-    sprintf(total_string, "%s%s", CONTINUE_PROMPT, cmd->command);
-  }
-
-  int remain_column = w.ws_col;
-  /* size = cmd->commandSize + prompt_size; */
-  for (char *str = total_string; size < cmd->commandSize + prompt_size;) {
-    int ret = taosMbToWchar(&wc, str, MB_CUR_MAX);
-    if (ret < 0) break;
-    size += ret;
-    /* assert(size >= 0); */
-    int width = taosWcharWidth(wc);
-    if (remain_column > width) {
-      printf("%lc", wc);
-      remain_column -= width;
-    } else {
-      if (remain_column == width) {
-        printf("%lc\n\r", wc);
-        remain_column = w.ws_col;
-      } else {
-        printf("\n\r%lc", wc);
-        remain_column = w.ws_col - width;
-      }
-    }
-
-    str = total_string + size;
-  }
-
-  taosMemoryFree(total_string);
-  /* for (int i = 0; i < size; i++){ */
-  /*     char c = total_string[i]; */
-  /*     if (k % w.ws_col == 0) { */
-  /*         printf("%c\n\r", c); */
-  /*     } */
-  /*     else { */
-  /*         printf("%c", c); */
-  /*     } */
-  /*     k += 1; */
-  /* } */
-
-  // Position the cursor
-  int cursor_pos = cmd->screenOffset + prompt_size;
-  int ecmd_pos = cmd->endOffset + prompt_size;
-
-  int cursor_x = cursor_pos / w.ws_col;
-  int cursor_y = cursor_pos % w.ws_col;
-  // int cursor_y = cursor % w.ws_col;
-  int command_x = ecmd_pos / w.ws_col;
-  int command_y = ecmd_pos % w.ws_col;
-  // int command_y = (command.size() + prompt_size) % w.ws_col;
-  positionCursor(command_y, LEFT);
-  positionCursor(command_x, UP);
-  positionCursor(cursor_x, DOWN);
-  positionCursor(cursor_y, RIGHT);
-  fflush(stdout);
-}
-
-void cleanup_handler(void *arg) { resetTerminalMode(); }
-
-void exitShell() {
-  resetTerminalMode();
-  exit(EXIT_SUCCESS);
-}

tools/shell/src/backup/shellImport.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-#include "shell.h"
-#include "shellCommand.h"
-#include "tglobal.h"
-#include "tutil.h"
-
-static char **shellSQLFiles = NULL;
-static int32_t shellSQLFileNum = 0;
-static char shellTablesSQLFile[TSDB_FILENAME_LEN] = {0};
-
-typedef struct {
-  TdThread threadID;
-  int       threadIndex;
-  int       totalThreads;
-  void     *taos;
-} ShellThreadObj;
-
-static int shellGetFilesNum(const char *directoryName, const char *prefix)
-{
-  char cmd[1024] = { 0 };
-  sprintf(cmd, "ls %s/*.%s | wc -l ", directoryName, prefix);
-
-  char buf[1024] = { 0 };
-  if (taosSystem(cmd, buf, sizeof(buf)) < 0) {
-    fprintf(stderr, "ERROR: failed to execute:%s, error:%s\n", cmd, strerror(errno));
-    exit(0);
-  }
-
-  int fileNum = 0;
-  if (sscanf(buf, "%d", &fileNum) != 1) {
-    fprintf(stderr, "ERROR: failed to execute:%s, parse result error\n", cmd);
-    exit(0);
-  }
-
-  if (fileNum <= 0) {
-    fprintf(stderr, "ERROR: directory:%s is empry\n", directoryName);
-    exit(0);
-  }
-
-  return fileNum;
-}
-
-static void shellParseDirectory(const char *directoryName, const char *prefix, char **fileArray, int totalFiles)
-{
-  char cmd[1024] = { 0 };
-  sprintf(cmd, "ls %s/*.%s | sort", directoryName, prefix);
-
-  char buf[1024] = { 0 };
-  if (taosSystem(cmd, buf, sizeof(buf)) < 0) {
-    fprintf(stderr, "ERROR: failed to execute:%s, error:%s\n", cmd, strerror(errno));
-    exit(0);
-  }
-
-  int fileNum = 0;
-  while (sscanf(buf, "%128s", fileArray[fileNum++])) {
-    if (strcmp(fileArray[fileNum-1], shellTablesSQLFile) == 0) {
-      fileNum--;
-    }
-    if (fileNum >= totalFiles) {
-      break;
-    }
-  }
-
-  if (fileNum != totalFiles) {
-    fprintf(stderr, "ERROR: directory:%s changed while read\n", directoryName);
-    exit(0);
-  }
-}
-
-static void shellCheckTablesSQLFile(const char *directoryName)
-{
-  sprintf(shellTablesSQLFile, "%s/tables.sql", directoryName);
-
-  if (taosFStatFile(shellTablesSQLFile, NULL, NULL) < 0) {
-    shellTablesSQLFile[0] = 0;
-  }
-}
-
-static void shellMallocSQLFiles()
-{
-  shellSQLFiles = (char**)taosMemoryCalloc(shellSQLFileNum, sizeof(char*));
-  for (int i = 0; i < shellSQLFileNum; i++) {
-    shellSQLFiles[i] = taosMemoryCalloc(1, TSDB_FILENAME_LEN);
-  }
-}
-
-static void shellGetDirectoryFileList(char *inputDir)
-{
-  if (!taosDirExist(inputDir)) {
-    fprintf(stderr, "ERROR: %s not exist\n", inputDir);
-    exit(0);
-  }
-
-  if (taosIsDir(inputDir)) {
-    shellCheckTablesSQLFile(inputDir);
-    shellSQLFileNum = shellGetFilesNum(inputDir, "sql");
-    int totalSQLFileNum = shellSQLFileNum;
-    if (shellTablesSQLFile[0] != 0) {
-      shellSQLFileNum--;
-    }
-    shellMallocSQLFiles();
-    shellParseDirectory(inputDir, "sql", shellSQLFiles, shellSQLFileNum);
-    fprintf(stdout, "\nstart to dispose %d files in %s\n", totalSQLFileNum, inputDir);
-  }
-  else {
-    fprintf(stderr, "ERROR: %s is not a directory\n", inputDir);
-    exit(0);
-  }
-}
-
-static void shellSourceFile(TAOS *con, char *fptr) {
-  wordexp_t full_path;
-  int       read_len = 0;
-  char *    cmd = taosMemoryMalloc(tsMaxSQLStringLen);
-  size_t    cmd_len = 0;
-  char *    line = NULL;
-
-  if (wordexp(fptr, &full_path, 0) != 0) {
-    fprintf(stderr, "ERROR: illegal file name\n");
-    taosMemoryFree(cmd);
-    return;
-  }
-
-  char *fname = full_path.we_wordv[0];
-  if (fname == NULL) {
-    fprintf(stderr, "ERROR: invalid filename\n");
-    taosMemoryFree(cmd);
-    return;
-  }
-
-  /*
-  if (access(fname, F_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
-    
-    wordfree(&full_path);
-    taosMemoryFree(cmd);
-    return;
-  }
-  
-  if (access(fname, R_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not readable\n", fptr);
-    
-    wordfree(&full_path);
-    taosMemoryFree(cmd);
-    return;
-  }
-  */
-
-  // FILE *f = fopen(fname, "r");
-  TdFilePtr pFile = taosOpenFile(fname, TD_FILE_READ | TD_FILE_STREAM);
-  if (pFile == NULL) {
-    fprintf(stderr, "ERROR: failed to open file %s\n", fname);
-    wordfree(&full_path);
-    taosMemoryFree(cmd);
-    return;
-  }
-
-  fprintf(stdout, "begin import file:%s\n", fname);
-
-  int lineNo = 0;
-  while ((read_len = taosGetLineFile(pFile, &line)) != -1) {
-    ++lineNo;
-    if (read_len >= tsMaxSQLStringLen) continue;
-    line[--read_len] = '\0';
-
-    if (read_len == 0 || isCommentLine(line)) {  // line starts with #
-      continue;
-    }
-
-    if (line[read_len - 1] == '\\') {
-      line[read_len - 1] = ' ';
-      memcpy(cmd + cmd_len, line, read_len);
-      cmd_len += read_len;
-      continue;
-    }
-
-    memcpy(cmd + cmd_len, line, read_len);
-    
-    TAOS_RES* pSql = taos_query(con, cmd);
-    int32_t code = taos_errno(pSql);
-    
-    if (code != 0) {
-      fprintf(stderr, "DB error: %s: %s (%d)\n", taos_errstr(pSql), fname, lineNo);
-    }
-    
-    /* free local resouce: allocated memory/metric-meta refcnt */
-    taos_free_result(pSql);
-
-    memset(cmd, 0, MAX_COMMAND_SIZE);
-    cmd_len = 0;
-  }
-
-  taosMemoryFree(cmd);
-  if(line != NULL) taosMemoryFree(line);
-  wordfree(&full_path);
-  taosCloseFile(&pFile);
-}
-
-void* shellImportThreadFp(void *arg)
-{
-  ShellThreadObj *pThread = (ShellThreadObj*)arg;
-  setThreadName("shellImportThrd");
-
-  for (int f = 0; f < shellSQLFileNum; ++f) {
-    if (f % pThread->totalThreads == pThread->threadIndex) {
-      char *SQLFileName = shellSQLFiles[f];
-      shellSourceFile(pThread->taos, SQLFileName);
-    }
-  }
-
-  return NULL;
-}
-
-static void shellRunImportThreads(SShellArguments* _args)
-{
-  TdThreadAttr thattr;
-  ShellThreadObj *threadObj = (ShellThreadObj *)taosMemoryCalloc(_args->threadNum, sizeof(ShellThreadObj));
-  for (int t = 0; t < _args->threadNum; ++t) {
-    ShellThreadObj *pThread = threadObj + t;
-    pThread->threadIndex = t;
-    pThread->totalThreads = _args->threadNum;
-    pThread->taos = taos_connect(_args->host, _args->user, _args->password, _args->database, tsDnodeShellPort);
-    if (pThread->taos == NULL) {
-      fprintf(stderr, "ERROR: thread:%d failed connect to TDengine, error:%s\n", pThread->threadIndex, "null taos"/*taos_errstr(pThread->taos)*/);
-      exit(0);
-    }
-
-    taosThreadAttrInit(&thattr);
-    taosThreadAttrSetDetachState(&thattr, PTHREAD_CREATE_JOINABLE);
-
-    if (taosThreadCreate(&(pThread->threadID), &thattr, shellImportThreadFp, (void*)pThread) != 0) {
-      fprintf(stderr, "ERROR: thread:%d failed to start\n", pThread->threadIndex);
-      exit(0);
-    }
-  }
-
-  for (int t = 0; t < _args->threadNum; ++t) {
-    taosThreadJoin(threadObj[t].threadID, NULL);
-  }
-
-  for (int t = 0; t < _args->threadNum; ++t) {
-    taos_close(threadObj[t].taos);
-  }
-  taosMemoryFree(threadObj);
-}
-
-void source_dir(TAOS* con, SShellArguments* _args) {
-  shellGetDirectoryFileList(_args->dir);
-  int64_t start = taosGetTimestampMs();
-
-  if (shellTablesSQLFile[0] != 0) {
-    shellSourceFile(con, shellTablesSQLFile);
-    int64_t end = taosGetTimestampMs();
-    fprintf(stdout, "import %s finished, time spent %.2f seconds\n", shellTablesSQLFile, (end - start) / 1000.0);
-  }
-
-  shellRunImportThreads(_args);
-  int64_t end = taosGetTimestampMs();
-  fprintf(stdout, "import %s finished, time spent %.2f seconds\n", _args->dir, (end - start) / 1000.0);
-}

tools/shell/src/backup/shellWindows.c

-/*******************************************************************
-*           Copyright (c) 2017 by TAOS Technologies, Inc.
-*                     All rights reserved.
-*
-*  This file is proprietary and confidential to TAOS Technologies.
-*  No part of this file may be reproduced, stored, transmitted,
-*  disclosed or used in any form or by any means other than as
-*  expressly provided by the written permission from Jianhui Tao
-*
-* ****************************************************************/
-
-#include <assert.h>
-#include <regex.h>
-#include <stdio.h>
-#include "../../../../include/client/taos.h"
-#include "os.h"
-#include "shell.h"
-#include "shellCommand.h"
-
-extern char configDir[];
-
-char      WINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
-                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
-
-void printVersion() {
-  printf("version: %s\n", version);
-}
-
-void printHelp() {
-  char indent[10] = "        ";
-  printf("taos shell is used to test the TDengine database\n");
-
-  printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDengine server FQDN to connect. The default host is localhost.");
-  printf("%s%s\n", indent, "-p");
-  printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
-  printf("%s%s\n", indent, "-P");
-  printf("%s%s%s\n", indent, indent, "The TCP/IP port number to use for the connection");
-  printf("%s%s\n", indent, "-u");
-  printf("%s%s%s\n", indent, indent, "The user name to use when connecting to the server.");
-  printf("%s%s\n", indent, "-A");
-  printf("%s%s%s\n", indent, indent, "The user auth to use when connecting to the server.");
-  printf("%s%s\n", indent, "-c");
-  printf("%s%s%s\n", indent, indent, "Configuration directory.");
-  printf("%s%s\n", indent, "-C");
-  printf("%s%s%s\n", indent, indent, "Dump configuration.");
-  printf("%s%s\n", indent, "-s");
-  printf("%s%s%s\n", indent, indent, "Commands to run without enter the shell.");
-  printf("%s%s\n", indent, "-r");
-  printf("%s%s%s\n", indent, indent, "Output time as unsigned long..");
-  printf("%s%s\n", indent, "-f");
-  printf("%s%s%s\n", indent, indent, "Script to run without enter the shell.");
-  printf("%s%s\n", indent, "-d");
-  printf("%s%s%s\n", indent, indent, "Database to use when connecting to the server.");
-  printf("%s%s\n", indent, "-t");
-  printf("%s%s%s\n", indent, indent, "Time zone of the shell, default is local.");
-  printf("%s%s\n", indent, "-n");
-  printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync|speed|fqdn.");
-  printf("%s%s\n", indent, "-l");
-  printf("%s%s%s\n", indent, indent, "Packet length used for net test, default is 1000 bytes.");
-  printf("%s%s\n", indent, "-N");
-  printf("%s%s%s\n", indent, indent, "Packet numbers used for net test, default is 100.");
-  printf("%s%s\n", indent, "-S");
-  printf("%s%s%s\n", indent, indent, "Packet type used for net test, default is TCP.");
-  printf("%s%s\n", indent, "-V");
-  printf("%s%s%s\n", indent, indent, "Print program version.");
-
-  exit(EXIT_SUCCESS);
-}
-
-char g_password[SHELL_MAX_PASSWORD_LEN];
-
-void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
-  for (int i = 1; i < argc; i++) {
-    // for host
-    if (strcmp(argv[i], "-h") == 0) {
-      if (i < argc - 1) {
-        arguments->host = argv[++i];
-      } else {
-        fprintf(stderr, "option -h requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    // for password
-    else if ((strncmp(argv[i], "-p", 2) == 0)
-            || (strncmp(argv[i], "--password", 10) == 0)) {
-        arguments->is_use_passwd = true;
-        strcpy(tsOsName, "Windows");
-        printf(WINCLIENT_VERSION, tsOsName, taos_get_client_info());
-        if ((strlen(argv[i]) == 2)
-                  || (strncmp(argv[i], "--password", 10) == 0)) {
-            printf("Enter password: ");
-            taosSetConsoleEcho(false);
-            if (scanf("%s", g_password) > 1) {
-                fprintf(stderr, "password read error!\n");
-            }
-            taosSetConsoleEcho(true);
-            getchar();
-        } else {
-            tstrncpy(g_password, (char *)(argv[i] + 2), SHELL_MAX_PASSWORD_LEN);
-        }
-        arguments->password = g_password;
-        strcpy(argv[i], "");
-        argc -= 1;
-    }
-    // for management port
-    else if (strcmp(argv[i], "-P") == 0) {
-      if (i < argc - 1) {
-        arguments->port = atoi(argv[++i]);
-      } else {
-        fprintf(stderr, "option -P requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    // for user
-    else if (strcmp(argv[i], "-u") == 0) {
-      if (i < argc - 1) {
-        arguments->user = argv[++i];
-      } else {
-        fprintf(stderr, "option -u requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-A") == 0) {
-      if (i < argc - 1) {
-        arguments->auth = argv[++i];
-      } else {
-        fprintf(stderr, "option -A requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {
-        char *tmp = argv[++i];
-        if (strlen(tmp) >= TSDB_FILENAME_LEN) {
-          fprintf(stderr, "config file path: %s overflow max len %d\n", tmp, TSDB_FILENAME_LEN - 1);
-          exit(EXIT_FAILURE);
-        }
-        strcpy(configDir, tmp);
-      } else {
-        fprintf(stderr, "Option -c requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-C") == 0) {
-      arguments->dump_config = true;
-    } else if (strcmp(argv[i], "-s") == 0) {
-      if (i < argc - 1) {
-        arguments->commands = argv[++i];
-      } else {
-        fprintf(stderr, "option -s requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-r") == 0) {
-      arguments->is_raw_time = true;
-    }
-    // For temperory batch commands to run TODO
-    else if (strcmp(argv[i], "-f") == 0) {
-      if (i < argc - 1) {
-        strcpy(arguments->file, argv[++i]);
-      } else {
-        fprintf(stderr, "option -f requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    // for default database
-    else if (strcmp(argv[i], "-d") == 0) {
-      if (i < argc - 1) {
-        arguments->database = argv[++i];
-      } else {
-        fprintf(stderr, "option -d requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    // For time zone
-    else if (strcmp(argv[i], "-t") == 0) {
-      if (i < argc - 1) {
-        arguments->timezone = argv[++i];
-      } else {
-        fprintf(stderr, "option -t requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    else if (strcmp(argv[i], "-n") == 0) {
-      if (i < argc - 1) {
-        arguments->netTestRole = argv[++i];
-      } else {
-        fprintf(stderr, "option -n requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    else if (strcmp(argv[i], "-l") == 0) {
-      if (i < argc - 1) {
-        arguments->pktLen = atoi(argv[++i]);
-      } else {
-        fprintf(stderr, "option -l requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    else if (strcmp(argv[i], "-N") == 0) {
-      if (i < argc - 1) {
-        arguments->pktNum = atoi(argv[++i]);
-      } else {
-        fprintf(stderr, "option -N requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    else if (strcmp(argv[i], "-S") == 0) {
-      if (i < argc - 1) {
-        arguments->pktType = argv[++i];
-      } else {
-        fprintf(stderr, "option -S requires an argument\n");
-        exit(EXIT_FAILURE);
-      }
-    }
-    else if (strcmp(argv[i], "-V") == 0) {
-      printVersion();
-      exit(EXIT_SUCCESS);
-    }
-    // For temperory command TODO
-    else if (strcmp(argv[i], "--help") == 0) {
-      printHelp();
-      exit(EXIT_SUCCESS);
-    } else {
-      fprintf(stderr, "wrong options\n");
-      printHelp();
-      exit(EXIT_FAILURE);
-    }
-  }
-}
-
-void shellPrintContinuePrompt() { printf("%s", CONTINUE_PROMPT); }
-
-void shellPrintPrompt() { printf("%s", PROMPT_HEADER); }
-
-void updateBuffer(Command *cmd) {
-  if (regex_match(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
-  strcat(cmd->buffer, cmd->command);
-
-  memset(cmd->command, 0, MAX_COMMAND_SIZE);
-  cmd->cursorOffset = 0;
-}
-
-int isReadyGo(Command *cmd) {
-  char *total = taosMemoryMalloc(MAX_COMMAND_SIZE);
-  memset(total, 0, MAX_COMMAND_SIZE);
-  sprintf(total, "%s%s", cmd->buffer, cmd->command);
-
-  char *reg_str =
-      "(^.*;\\s*$)|(^\\s*$)|(^\\s*exit\\s*$)|(^\\s*q\\s*$)|(^\\s*quit\\s*$)|(^"
-      "\\s*clear\\s*$)";
-  if (regex_match(total, reg_str, REG_EXTENDED | REG_ICASE)) {
-    taosMemoryFree(total);
-    return 1;
-  }
-
-  taosMemoryFree(total);
-  return 0;
-}
-
-void insertChar(Command *cmd, char c) {
-  // TODO: Check if the length enough.
-  if (cmd->cursorOffset >= MAX_COMMAND_SIZE) {
-    fprintf(stdout, "sql is larger than %d bytes", MAX_COMMAND_SIZE);
-    return;
-  }
-
-  cmd->command[cmd->cursorOffset++] = c;
-}
-
-int32_t shellReadCommand(TAOS *con, char command[]) {
-  Command cmd;
-  memset(&cmd, 0, sizeof(cmd));
-  cmd.buffer = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  cmd.command = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-
-  // Read input.
-  char c;
-  while (1) {
-    c = getchar();
-
-    switch (c) {
-      case '\n':
-      case '\r':
-        if (isReadyGo(&cmd)) {
-          sprintf(command, "%s%s", cmd.buffer, cmd.command);
-          taosMemoryFree(cmd.buffer);
-          cmd.buffer = NULL;
-          taosMemoryFree(cmd.command);
-          cmd.command = NULL;
-          return 0;
-        } else {
-          shellPrintContinuePrompt();
-          updateBuffer(&cmd);
-        }
-        break;
-      default:
-        insertChar(&cmd, c);
-    }
-  }
-
-  return 0;
-}
-
-void *shellLoopQuery(void *arg) {
-  TAOS *con = (TAOS *)arg;
-  char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
-  if (command == NULL) return NULL;
-
-  int32_t err = 0;
-
-  do {
-    memset(command, 0, MAX_COMMAND_SIZE);
-    shellPrintPrompt();
-
-    // Read command from shell.
-    err = shellReadCommand(con, command);
-    if (err) {
-      break;
-    }
-  } while (shellRunCommand(con, command) == 0);
-
-  return NULL;
-}
-
-void get_history_path(char *history) { sprintf(history, "C:/TDengine/%s", HISTORY_FILE); }
-
-void exitShell() { exit(EXIT_SUCCESS); }

tools/shell/src/shellArguments.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "shellInt.h"
+
+#define SHELL_HOST     "The auth string to use when connecting to the server."
+#define SHELL_PORT     "The TCP/IP port number to use for the connection."
+#define SHELL_USER     "The user name to use when connecting to the server."
+#define SHELL_PASSWORD "The password to use when connecting to the server."
+#define SHELL_AUTH     "The auth string to use when connecting to the server."
+#define SHELL_GEN_AUTH "Generate auth string from password."
+#define SHELL_CFG_DIR  "Configuration directory."
+#define SHELL_DMP_CFG  "Dump configuration."
+#define SHELL_CMD      "Commands to run without enter the shell."
+#define SHELL_RAW_TIME "Output time as uint64_t."
+#define SHELL_FILE     "Script to run without enter the shell."
+#define SHELL_DB       "Database to use when connecting to the server."
+#define SHELL_CHECK    "Check the service status."
+#define SHELL_STARTUP  "Check the details of the service status."
+#define SHELL_WIDTH    "Set the default binary display width, default is 30."
+#define SHELL_NET_ROLE "Net role when network connectivity test, options: client|server."
+#define SHELL_PKG_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_VERSION  "Print program version."
+#define SHELL_EMAIL    "<support@taosdata.com>"
+
+void shellPrintHelp() {
+  char indent[] = "  ";
+  printf("Usage: taos [OPTION...] \n\n");
+  printf("%s%s%s%s\n", indent, "-a,", indent, SHELL_AUTH);
+  printf("%s%s%s%s\n", indent, "-A,", indent, SHELL_GEN_AUTH);
+  printf("%s%s%s%s\n", indent, "-c,", indent, SHELL_CFG_DIR);
+  printf("%s%s%s%s\n", indent, "-C,", indent, SHELL_DMP_CFG);
+  printf("%s%s%s%s\n", indent, "-d,", indent, SHELL_DB);
+  printf("%s%s%s%s\n", indent, "-f,", indent, SHELL_FILE);
+  printf("%s%s%s%s\n", indent, "-h,", indent, SHELL_HOST);
+  printf("%s%s%s%s\n", indent, "-k,", indent, SHELL_CHECK);
+  printf("%s%s%s%s\n", indent, "-l,", indent, SHELL_PKG_LEN);
+  printf("%s%s%s%s\n", indent, "-n,", indent, SHELL_NET_ROLE);
+  printf("%s%s%s%s\n", indent, "-N,", indent, SHELL_PKT_NUM);
+  printf("%s%s%s%s\n", indent, "-p,", indent, SHELL_PASSWORD);
+  printf("%s%s%s%s\n", indent, "-P,", indent, SHELL_PORT);
+  printf("%s%s%s%s\n", indent, "-r,", indent, SHELL_RAW_TIME);
+  printf("%s%s%s%s\n", indent, "-s,", indent, SHELL_CMD);
+  printf("%s%s%s%s\n", indent, "-t,", indent, SHELL_STARTUP);
+  printf("%s%s%s%s\n", indent, "-u,", indent, SHELL_USER);
+  printf("%s%s%s%s\n", indent, "-w,", indent, SHELL_WIDTH);
+  printf("%s%s%s%s\n", indent, "-V,", indent, SHELL_VERSION);
+  printf("\n\nReport bugs to %s.\n", SHELL_EMAIL);
+}
+
+static int32_t shellParseSingleOpt(int32_t key, char *arg) {
+  SShellArgs *pArgs = &shell.args;
+
+  switch (key) {
+    case 'h':
+      pArgs->host = arg;
+      break;
+    case 'P':
+      pArgs->port = atoi(arg);
+      break;
+    case 'u':
+      pArgs->user = arg;
+      break;
+    case 'p':
+      break;
+    case 'a':
+      pArgs->auth = arg;
+      break;
+    case 'A':
+      pArgs->is_gen_auth = true;
+      break;
+    case 'c':
+      pArgs->cfgdir = arg;
+      break;
+    case 'C':
+      pArgs->is_dump_config = true;
+      break;
+    case 's':
+      pArgs->commands = arg;
+      break;
+    case 'r':
+      pArgs->is_raw_time = true;
+      break;
+    case 'f':
+      tstrncpy(pArgs->file, arg, sizeof(pArgs->file));
+      break;
+    case 'd':
+      pArgs->database = arg;
+      break;
+    case 'k':
+      pArgs->is_check = true;
+      break;
+    case 't':
+      pArgs->is_startup = true;
+      break;
+    case 'w':
+      pArgs->displayWidth = atoi(arg);
+      break;
+    case 'n':
+      pArgs->netrole = arg;
+      break;
+    case 'l':
+      pArgs->pktLen = atoi(arg);
+      break;
+    case 'N':
+      pArgs->pktNum = atoi(arg);
+      break;
+    case 'V':
+      pArgs->is_version = true;
+      break;
+    case '?':
+      pArgs->is_help = true;
+      break;
+    case 1:
+      pArgs->abort = 1;
+      break;
+    default:
+      return ARGP_ERR_UNKNOWN;
+  }
+  return 0;
+}
+
+int32_t shellParseArgsWithoutArgp(int argc, char *argv[]) {
+  SShellArgs *pArgs = &shell.args;
+
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--usage") == 0 || strcmp(argv[i], "-?") == 0) {
+      shellParseSingleOpt('?', NULL);
+      return 0;
+    }
+
+    char   *key = argv[i];
+    int32_t keyLen = strlen(key);
+    if (keyLen != 2) {
+      fprintf(stderr, "invalid option %s\n", key);
+      return -1;
+    }
+    if (key[0] != '-') {
+      fprintf(stderr, "invalid option %s\n", key);
+      return -1;
+    }
+
+    if (key[1] == 'h' || key[1] == 'P' || key[1] == 'u' || key[1] == 'a' || key[1] == 'c' || key[1] == 's' ||
+        key[1] == 'f' || key[1] == 'd' || key[1] == 'w' || key[1] == 'n' || key[1] == 'l' || key[1] == 'N') {
+      if (i + 1 >= argc) {
+        fprintf(stderr, "option %s requires an argument\n", key);
+        return -1;
+      }
+      char *val = argv[i + 1];
+      if (val[0] == '-') {
+        fprintf(stderr, "option %s requires an argument\n", key);
+        return -1;
+      }
+      shellParseSingleOpt(key[1], val);
+      i++;
+    } else if (key[1] == 'p' || key[1] == 'A' || key[1] == 'c' || key[1] == 'r' || key[1] == 'k' || key[1] == 't' ||
+               key[1] == 'V') {
+      shellParseSingleOpt(key[1], NULL);
+    } else {
+      fprintf(stderr, "invalid option %s\n", key);
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+#ifdef LINUX
+#include <argp.h>
+#include <termio.h>
+
+const char *argp_program_version = version;
+const char *argp_program_bug_address = SHELL_EMAIL;
+
+static struct argp_option shellOptions[] = {
+    {"host", 'h', "HOST", 0, SHELL_HOST},
+    {"port", 'P', "PORT", 0, SHELL_PORT},
+    {"user", 'u', "USER", 0, SHELL_USER},
+    {0, 'p', 0, 0, SHELL_PASSWORD},
+    {"auth", 'a', "AUTH", 0, SHELL_AUTH},
+    {"generate-auth", 'A', 0, 0, SHELL_GEN_AUTH},
+    {"config-dir", 'c', "DIR", 0, SHELL_CFG_DIR},
+    {"dump-config", 'C', 0, 0, SHELL_DMP_CFG},
+    {"commands", 's', "COMMANDS", 0, SHELL_CMD},
+    {"raw-time", 'r', 0, 0, SHELL_RAW_TIME},
+    {"file", 'f', "FILE", 0, SHELL_FILE},
+    {"database", 'd', "DATABASE", 0, SHELL_DB},
+    {"check", 'k', 0, 0, SHELL_CHECK},
+    {"startup", 't', 0, 0, SHELL_STARTUP},
+    {"display-width", 'w', "WIDTH", 0, SHELL_WIDTH},
+    {"netrole", 'n', "NETROLE", 0, SHELL_NET_ROLE},
+    {"pktlen", 'l', "PKTLEN", 0, SHELL_PKG_LEN},
+    {"pktnum", 'N', "PKTNUM", 0, SHELL_PKT_NUM},
+    {0},
+};
+
+static error_t shellParseOpt(int32_t key, char *arg, struct argp_state *state) { return shellParseSingleOpt(key, arg); }
+
+static struct argp shellArgp = {shellOptions, shellParseOpt, "", ""};
+
+static void shellParseArgsUseArgp(int argc, char *argv[]) {
+  argp_program_version = shell.info.programVersion;
+  argp_parse(&shellArgp, argc, argv, 0, 0, &shell.args);
+}
+
+#endif
+
+static void shellInitArgs(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strncmp(argv[i], "-p", 2) == 0) {
+      printf(shell.info.clientVersion, tsOsName, taos_get_client_info());
+      if (strlen(argv[i]) == 2) {
+        printf("Enter password: ");
+        taosSetConsoleEcho(false);
+        if (scanf("%20s", shell.args.password) > 1) {
+          fprintf(stderr, "password reading error\n");
+        }
+        taosSetConsoleEcho(true);
+        if (EOF == getchar()) {
+          fprintf(stderr, "getchar() return EOF\n");
+        }
+      } else {
+        tstrncpy(shell.args.password, (char *)(argv[i] + 2), sizeof(shell.args.password));
+        strcpy(argv[i], "-p");
+      }
+    }
+  }
+  if (strlen(shell.args.password) == 0) {
+    tstrncpy(shell.args.password, TSDB_DEFAULT_PASS, sizeof(shell.args.password));
+  }
+
+  SShellArgs *pArgs = &shell.args;
+  pArgs->user = TSDB_DEFAULT_USER;
+  pArgs->pktLen = SHELL_DEF_PKG_LEN;
+  pArgs->pktNum = SHELL_DEF_PKG_NUM;
+  pArgs->displayWidth = SHELL_DEFAULT_MAX_BINARY_DISPLAY_WIDTH;
+}
+
+static int32_t shellCheckArgs() {
+  SShellArgs *pArgs = &shell.args;
+  if (pArgs->host != NULL && (strlen(pArgs->host) <= 0 || strlen(pArgs->host) > TSDB_FQDN_LEN)) {
+    printf("Invalid host:%s\n", pArgs->host);
+    return -1;
+  }
+
+  if (pArgs->user != NULL && (strlen(pArgs->user) <= 0 || strlen(pArgs->user) > TSDB_USER_LEN)) {
+    printf("Invalid user:%s\n", pArgs->user);
+    return -1;
+  }
+
+  if (pArgs->auth != NULL && (strlen(pArgs->auth) <= 0 || strlen(pArgs->auth) > TSDB_PASSWORD_LEN)) {
+    printf("Invalid auth:%s\n", pArgs->auth);
+    return -1;
+  }
+
+  if (pArgs->database != NULL && (strlen(pArgs->database) <= 0 || strlen(pArgs->database) > TSDB_DB_NAME_LEN)) {
+    printf("Invalid database:%s\n", pArgs->database);
+    return -1;
+  }
+
+  if (pArgs->file[0] != 0) {
+    char fullname[PATH_MAX] = {0};
+    if (taosExpandDir(pArgs->file, fullname, PATH_MAX) == 0) {
+      tstrncpy(pArgs->file, fullname, PATH_MAX);
+    }
+  }
+
+  if (pArgs->cfgdir != NULL) {
+    if (strlen(pArgs->cfgdir) <= 0 || strlen(pArgs->cfgdir) >= PATH_MAX) {
+      printf("Invalid cfgdir:%s\n", pArgs->cfgdir);
+      return -1;
+    } else {
+      if (taosExpandDir(pArgs->cfgdir, configDir, PATH_MAX) != 0) {
+        tstrncpy(configDir, pArgs->cfgdir, PATH_MAX);
+      }
+    }
+  }
+
+  if (pArgs->commands != NULL && (strlen(pArgs->commands) <= 0)) {
+    printf("Invalid commands:%s\n", pArgs->commands);
+    return -1;
+  }
+
+  if (pArgs->netrole != NULL && !(strcmp(pArgs->netrole, "client") == 0 || strcmp(pArgs->netrole, "server") == 0)) {
+    printf("Invalid netrole:%s\n", pArgs->netrole);
+    return -1;
+  }
+
+  if (pArgs->password != NULL && (strlen(pArgs->password) <= 0)) {
+    printf("Invalid password\n");
+    return -1;
+  }
+
+  if (pArgs->pktLen < SHELL_MIN_PKG_LEN || pArgs->pktLen > SHELL_MAX_PKG_LEN) {
+    printf("Invalid pktLen:%d, range:[%d, %d]\n", pArgs->pktLen, SHELL_MIN_PKG_LEN, SHELL_MAX_PKG_LEN);
+    return -1;
+  }
+
+  if (pArgs->pktNum < SHELL_MIN_PKG_NUM || pArgs->pktNum > SHELL_MAX_PKG_NUM) {
+    printf("Invalid pktNum:%d, range:[%d, %d]\n", pArgs->pktNum, SHELL_MIN_PKG_NUM, SHELL_MAX_PKG_NUM);
+    return -1;
+  }
+
+  if (pArgs->displayWidth <= 0 || pArgs->displayWidth > 10 * 1024) {
+    printf("Invalid displayWidth:%d, range:[1, 10 * 1024]\n", pArgs->displayWidth);
+    return -1;
+  }
+
+  return 0;
+}
+
+int32_t shellParseArgs(int32_t argc, char *argv[]) {
+  shellInitArgs(argc, argv);
+  shell.info.clientVersion =
+      "Welcome to the TDengine shell from %s, Client Version:%s\n"
+      "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+  shell.info.promptHeader = "taos> ";
+  shell.info.promptContinue = "   -> ";
+  shell.info.promptSize = 6;
+  snprintf(shell.info.programVersion, sizeof(shell.info.programVersion), "version: %s", version);
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  shell.info.osname = "Windows";
+  snprintf(shell.history.file, TSDB_FILENAME_LEN, "C:/TDengine/%s", SHELL_HISTORY_FILE);
+  if (shellParseArgsWithoutArgp(argc, argv) != 0) return -1;
+#elif defined(_TD_DARWIN_64)
+  shell.info.osname = "Darwin";
+  snprintf(shell.history.file, TSDB_FILENAME_LEN, "%s/%s", getpwuid(getuid())->pw_dir, SHELL_HISTORY_FILE);
+  if (shellParseArgsWithoutArgp(argc, argv) != 0) return -1;
+#else
+  shell.info.osname = "Linux";
+  snprintf(shell.history.file, TSDB_FILENAME_LEN, "%s/%s", getenv("HOME"), SHELL_HISTORY_FILE);
+  shellParseArgsUseArgp(argc, argv);
+  // if (shellParseArgsWithoutArgp(argc, argv) != 0) return -1;
+  if (shell.args.abort) {
+    return -1;
+  }
+#endif
+
+  return shellCheckArgs();
+}

tools/shell/src/shellCommand.c

@@ -14,22 +14,122 @@
  */
 
 #define __USE_XOPEN
+#include "shellInt.h"
 
-#include "shellCommand.h"
-#include "os.h"
-#include "shell.h"
-
-#include <regex.h>
+#define LEFT  1
+#define RIGHT 2
+#define UP    3
+#define DOWN  4
+#define PSIZE shell.info.promptSize
 
 typedef struct {
-  char widthInString;
-  char widthOnScreen;
-} UTFCodeInfo;
+  char    *buffer;
+  char    *command;
+  uint32_t commandSize;
+  uint32_t bufferSize;
+  uint32_t cursorOffset;
+  uint32_t screenOffset;
+  uint32_t endOffset;
+} SShellCmd;
+
+static int32_t shellCountPrefixOnes(uint8_t c);
+static void    shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width);
+static void    shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width);
+static void    shellInsertChar(SShellCmd *cmd, char *c, int size);
+static void    shellBackspaceChar(SShellCmd *cmd);
+static void    shellClearLineBefore(SShellCmd *cmd);
+static void    shellClearLineAfter(SShellCmd *cmd);
+static void    shellDeleteChar(SShellCmd *cmd);
+static void    shellMoveCursorLeft(SShellCmd *cmd);
+static void    shellMoveCursorRight(SShellCmd *cmd);
+static void    shellPositionCursorHome(SShellCmd *cmd);
+static void    shellPositionCursorEnd(SShellCmd *cmd);
+static void    shellPrintChar(char c, int32_t times);
+static void    shellPositionCursor(int32_t step, int32_t direction);
+static void    shellUpdateBuffer(SShellCmd *cmd);
+static int32_t shellIsReadyGo(SShellCmd *cmd);
+static void    shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width);
+static void    shellResetCommand(SShellCmd *cmd, const char s[]);
+static void    shellClearScreen(int32_t ecmd_pos, int32_t cursor_pos);
+static void    shellShowOnScreen(SShellCmd *cmd);
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+static void shellPrintContinuePrompt() { printf("%s", shell.args.promptContinue); }
+static void shellPrintPrompt() { printf("%s", shell.args.promptHeader); }
+
+void shellUpdateBuffer(SShellCmd *cmd) {
+  if (shellRegexMatch(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
+  strcat(cmd->buffer, cmd->command);
+
+  memset(cmd->command, 0, SHELL_MAX_COMMAND_SIZE);
+  cmd->cursorOffset = 0;
+}
+
+int shellIsReadyGo(SShellCmd *cmd) {
+  char *total = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
+  memset(total, 0, SHELL_MAX_COMMAND_SIZE);
+  sprintf(total, "%s%s", cmd->buffer, cmd->command);
 
-int countPrefixOnes(unsigned char c) {
-  unsigned char mask = 127;
+  char *reg_str =
+      "(^.*;\\s*$)|(^\\s*$)|(^\\s*exit\\s*$)|(^\\s*q\\s*$)|(^\\s*quit\\s*$)|(^"
+      "\\s*clear\\s*$)";
+  if (shellRegexMatch(total, reg_str, REG_EXTENDED | REG_ICASE)) {
+    taosMemoryFree(total);
+    return 1;
+  }
+
+  taosMemoryFree(total);
+  return 0;
+}
+
+void shellInsertChar(SShellCmd *cmd, char c) {
+  if (cmd->cursorOffset >= SHELL_MAX_COMMAND_SIZE) {
+    fprintf(stdout, "sql is larger than %d bytes", SHELL_MAX_COMMAND_SIZE);
+    return;
+  }
+  cmd->command[cmd->cursorOffset++] = c;
+}
+
+int32_t shellReadCommand(char command[]) {
+  SShellCmd cmd;
+  memset(&cmd, 0, sizeof(cmd));
+  cmd.buffer = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
+  cmd.command = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
+
+  // Read input.
+  char c;
+  while (1) {
+    c = getchar();
+
+    switch (c) {
+      case '\n':
+      case '\r':
+        if (shellIsReadyGo(&cmd)) {
+          sprintf(command, "%s%s", cmd.buffer, cmd.command);
+          taosMemoryFree(cmd.buffer);
+          cmd.buffer = NULL;
+          taosMemoryFree(cmd.command);
+          cmd.command = NULL;
+          return 0;
+        } else {
+          shellPrintContinuePrompt();
+          shellUpdateBuffer(&cmd);
+        }
+        break;
+      default:
+        shellInsertChar(&cmd, c);
+    }
+  }
+
+  return 0;
+}
+
+#else
+
+int32_t shellCountPrefixOnes(uint8_t c) {
+  uint8_t mask = 127;
   mask = ~mask;
-  int ret = 0;
+  int32_t ret = 0;
   while ((c & mask) != 0) {
     ret++;
     c <<= 1;
@@ -38,7 +138,7 @@ int countPrefixOnes(unsigned char c) {
   return ret;
 }
 
-void getPrevCharSize(const char *str, int pos, int *size, int *width) {
+void shellGetPrevCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
   assert(pos > 0);
 
   TdWchar wc;
@@ -48,16 +148,16 @@ void getPrevCharSize(const char *str, int pos, int *size, int *width) {
   while (--pos >= 0) {
     *size += 1;
 
-    if (str[pos] > 0 || countPrefixOnes((unsigned char)str[pos]) > 1) break;
+    if (str[pos] > 0 || shellCountPrefixOnes((uint8_t)str[pos]) > 1) break;
   }
 
-  int rc = taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
+  int32_t rc = taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
   assert(rc == *size);
 
   *width = taosWcharWidth(wc);
 }
 
-void getNextCharSize(const char *str, int pos, int *size, int *width) {
+void shellGetNextCharSize(const char *str, int32_t pos, int32_t *size, int32_t *width) {
   assert(pos >= 0);
 
   TdWchar wc;
@@ -65,13 +165,13 @@ void getNextCharSize(const char *str, int pos, int *size, int *width) {
   *width = taosWcharWidth(wc);
 }
 
-void insertChar(Command *cmd, char *c, int size) {
+void shellInsertChar(SShellCmd *cmd, char *c, int32_t size) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   TdWchar wc;
   if (taosMbToWchar(&wc, c, size) < 0) return;
 
-  clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
+  shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
   /* update the buffer */
   memmove(cmd->command + cmd->cursorOffset + size, cmd->command + cmd->cursorOffset,
           cmd->commandSize - cmd->cursorOffset);
@@ -81,122 +181,122 @@ void insertChar(Command *cmd, char *c, int size) {
   cmd->cursorOffset += size;
   cmd->screenOffset += taosWcharWidth(wc);
   cmd->endOffset += taosWcharWidth(wc);
-  showOnScreen(cmd);
+  shellShowOnScreen(cmd);
 }
 
-void backspaceChar(Command *cmd) {
+void shellBackspaceChar(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset > 0) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
-    int size = 0;
-    int width = 0;
-    getPrevCharSize(cmd->command, cmd->cursorOffset, &size, &width);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
+    int32_t size = 0;
+    int32_t width = 0;
+    shellGetPrevCharSize(cmd->command, cmd->cursorOffset, &size, &width);
     memmove(cmd->command + cmd->cursorOffset - size, cmd->command + cmd->cursorOffset,
             cmd->commandSize - cmd->cursorOffset);
     cmd->commandSize -= size;
     cmd->cursorOffset -= size;
     cmd->screenOffset -= width;
     cmd->endOffset -= width;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void clearLineBefore(Command *cmd) {
+void shellClearLineBefore(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
-  clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
+  shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
   memmove(cmd->command, cmd->command + cmd->cursorOffset, cmd->commandSize - cmd->cursorOffset);
   cmd->commandSize -= cmd->cursorOffset;
   cmd->cursorOffset = 0;
   cmd->screenOffset = 0;
   cmd->endOffset = cmd->commandSize;
-  showOnScreen(cmd);
+  shellShowOnScreen(cmd);
 }
 
-void clearLineAfter(Command *cmd) {
+void shellClearLineAfter(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
-  clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
+  shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
   cmd->commandSize -= cmd->endOffset - cmd->cursorOffset;
   cmd->endOffset = cmd->cursorOffset;
-  showOnScreen(cmd);
+  shellShowOnScreen(cmd);
 }
 
-void deleteChar(Command *cmd) {
+void shellDeleteChar(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset < cmd->commandSize) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
-    int size = 0;
-    int width = 0;
-    getNextCharSize(cmd->command, cmd->cursorOffset, &size, &width);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
+    int32_t size = 0;
+    int32_t width = 0;
+    shellGetNextCharSize(cmd->command, cmd->cursorOffset, &size, &width);
     memmove(cmd->command + cmd->cursorOffset, cmd->command + cmd->cursorOffset + size,
             cmd->commandSize - cmd->cursorOffset - size);
     cmd->commandSize -= size;
     cmd->endOffset -= width;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void moveCursorLeft(Command *cmd) {
+void shellMoveCursorLeft(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset > 0) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
-    int size = 0;
-    int width = 0;
-    getPrevCharSize(cmd->command, cmd->cursorOffset, &size, &width);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
+    int32_t size = 0;
+    int32_t width = 0;
+    shellGetPrevCharSize(cmd->command, cmd->cursorOffset, &size, &width);
     cmd->cursorOffset -= size;
     cmd->screenOffset -= width;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void moveCursorRight(Command *cmd) {
+void shellMoveCursorRight(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset < cmd->commandSize) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
-    int size = 0;
-    int width = 0;
-    getNextCharSize(cmd->command, cmd->cursorOffset, &size, &width);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
+    int32_t size = 0;
+    int32_t width = 0;
+    shellGetNextCharSize(cmd->command, cmd->cursorOffset, &size, &width);
     cmd->cursorOffset += size;
     cmd->screenOffset += width;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void positionCursorHome(Command *cmd) {
+void shellPositionCursorHome(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset > 0) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
     cmd->cursorOffset = 0;
     cmd->screenOffset = 0;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void positionCursorEnd(Command *cmd) {
+void shellPositionCursorEnd(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
   if (cmd->cursorOffset < cmd->commandSize) {
-    clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
+    shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
     cmd->cursorOffset = cmd->commandSize;
     cmd->screenOffset = cmd->endOffset;
-    showOnScreen(cmd);
+    shellShowOnScreen(cmd);
   }
 }
 
-void printChar(char c, int times) {
-  for (int i = 0; i < times; i++) {
+void shellPrintChar(char c, int32_t times) {
+  for (int32_t i = 0; i < times; i++) {
     fprintf(stdout, "%c", c);
   }
   fflush(stdout);
 }
 
-void positionCursor(int step, int direction) {
+void shellPositionCursor(int32_t step, int32_t direction) {
   if (step > 0) {
     if (direction == LEFT) {
       fprintf(stdout, "\033[%dD", step);
@@ -211,32 +311,32 @@ void positionCursor(int step, int direction) {
   }
 }
 
-void updateBuffer(Command *cmd) {
+void shellUpdateBuffer(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
-  if (regex_match(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
+  if (shellRegexMatch(cmd->buffer, "(\\s+$)|(^$)", REG_EXTENDED)) strcat(cmd->command, " ");
   strcat(cmd->buffer, cmd->command);
   cmd->bufferSize += cmd->commandSize;
 
-  memset(cmd->command, 0, MAX_COMMAND_SIZE);
+  memset(cmd->command, 0, SHELL_MAX_COMMAND_SIZE);
   cmd->cursorOffset = 0;
   cmd->screenOffset = 0;
   cmd->commandSize = 0;
   cmd->endOffset = 0;
-  showOnScreen(cmd);
+  shellShowOnScreen(cmd);
 }
 
-int isReadyGo(Command *cmd) {
+int32_t shellIsReadyGo(SShellCmd *cmd) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
-  char *total = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  memset(cmd->command + cmd->commandSize, 0, MAX_COMMAND_SIZE - cmd->commandSize);
+  char *total = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
+  memset(cmd->command + cmd->commandSize, 0, SHELL_MAX_COMMAND_SIZE - cmd->commandSize);
   sprintf(total, "%s%s", cmd->buffer, cmd->command);
 
   char *reg_str =
       "(^.*;\\s*$)|(^\\s*$)|(^\\s*exit\\s*$)|(^\\s*q\\s*$)|(^\\s*quit\\s*$)|(^"
       "\\s*clear\\s*$)";
-  if (regex_match(total, reg_str, REG_EXTENDED | REG_ICASE)) {
+  if (shellRegexMatch(total, reg_str, REG_EXTENDED | REG_ICASE)) {
     taosMemoryFree(total);
     return 1;
   }
@@ -245,28 +345,268 @@ int isReadyGo(Command *cmd) {
   return 0;
 }
 
-void getMbSizeInfo(const char *str, int *size, int *width) {
-  TdWchar *wc = (TdWchar *)taosMemoryCalloc(sizeof(TdWchar), MAX_COMMAND_SIZE);
+void shellGetMbSizeInfo(const char *str, int32_t *size, int32_t *width) {
+  TdWchar *wc = (TdWchar *)taosMemoryCalloc(sizeof(TdWchar), SHELL_MAX_COMMAND_SIZE);
   *size = strlen(str);
-  taosMbsToWchars(wc, str, MAX_COMMAND_SIZE);
-  *width = taosWcharsWidth(wc, MAX_COMMAND_SIZE);
+  taosMbsToWchars(wc, str, SHELL_MAX_COMMAND_SIZE);
+  *width = taosWcharsWidth(wc, SHELL_MAX_COMMAND_SIZE);
   taosMemoryFree(wc);
 }
 
-void resetCommand(Command *cmd, const char s[]) {
+void shellResetCommand(SShellCmd *cmd, const char s[]) {
   assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
 
-  clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
-  memset(cmd->buffer, 0, MAX_COMMAND_SIZE);
-  memset(cmd->command, 0, MAX_COMMAND_SIZE);
-  strncpy(cmd->command, s, MAX_COMMAND_SIZE);
-  int size = 0;
-  int width = 0;
-  getMbSizeInfo(s, &size, &width);
+  shellClearScreen(cmd->endOffset + PSIZE, cmd->screenOffset + PSIZE);
+  memset(cmd->buffer, 0, SHELL_MAX_COMMAND_SIZE);
+  memset(cmd->command, 0, SHELL_MAX_COMMAND_SIZE);
+  strncpy(cmd->command, s, SHELL_MAX_COMMAND_SIZE);
+  int32_t size = 0;
+  int32_t width = 0;
+  shellGetMbSizeInfo(s, &size, &width);
   cmd->bufferSize = 0;
   cmd->commandSize = size;
   cmd->cursorOffset = size;
   cmd->screenOffset = width;
   cmd->endOffset = width;
-  showOnScreen(cmd);
+  shellShowOnScreen(cmd);
+}
+
+void shellClearScreen(int32_t ecmd_pos, int32_t cursor_pos) {
+  struct winsize w;
+  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
+    // fprintf(stderr, "No stream device, and use default value(col 120, row 30)\n");
+    w.ws_col = 120;
+    w.ws_row = 30;
+  }
+
+  int32_t cursor_x = cursor_pos / w.ws_col;
+  int32_t cursor_y = cursor_pos % w.ws_col;
+  int32_t command_x = ecmd_pos / w.ws_col;
+  shellPositionCursor(cursor_y, LEFT);
+  shellPositionCursor(command_x - cursor_x, DOWN);
+  fprintf(stdout, "\033[2K");
+  for (int32_t i = 0; i < command_x; i++) {
+    shellPositionCursor(1, UP);
+    fprintf(stdout, "\033[2K");
+  }
+  fflush(stdout);
 }
+
+void shellShowOnScreen(SShellCmd *cmd) {
+  struct winsize w;
+  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
+    fprintf(stderr, "No stream device\n");
+    w.ws_col = 120;
+    w.ws_row = 30;
+  }
+
+  TdWchar wc;
+  int32_t size = 0;
+
+  // Print out the command.
+  char *total_string = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
+  memset(total_string, '\0', SHELL_MAX_COMMAND_SIZE);
+  if (strcmp(cmd->buffer, "") == 0) {
+    sprintf(total_string, "%s%s", shell.info.promptHeader, cmd->command);
+  } else {
+    sprintf(total_string, "%s%s", shell.info.promptContinue, cmd->command);
+  }
+
+  int32_t remain_column = w.ws_col;
+  for (char *str = total_string; size < cmd->commandSize + PSIZE;) {
+    int32_t ret = taosMbToWchar(&wc, str, MB_CUR_MAX);
+    if (ret < 0) break;
+    size += ret;
+    /* assert(size >= 0); */
+    int32_t width = taosWcharWidth(wc);
+    if (remain_column > width) {
+      printf("%lc", wc);
+      remain_column -= width;
+    } else {
+      if (remain_column == width) {
+        printf("%lc\n\r", wc);
+        remain_column = w.ws_col;
+      } else {
+        printf("\n\r%lc", wc);
+        remain_column = w.ws_col - width;
+      }
+    }
+
+    str = total_string + size;
+  }
+
+  taosMemoryFree(total_string);
+
+  // Position the cursor
+  int32_t cursor_pos = cmd->screenOffset + PSIZE;
+  int32_t ecmd_pos = cmd->endOffset + PSIZE;
+
+  int32_t cursor_x = cursor_pos / w.ws_col;
+  int32_t cursor_y = cursor_pos % w.ws_col;
+  // int32_t cursor_y = cursor % w.ws_col;
+  int32_t command_x = ecmd_pos / w.ws_col;
+  int32_t command_y = ecmd_pos % w.ws_col;
+  // int32_t command_y = (command.size() + PSIZE) % w.ws_col;
+  shellPositionCursor(command_y, LEFT);
+  shellPositionCursor(command_x, UP);
+  shellPositionCursor(cursor_x, DOWN);
+  shellPositionCursor(cursor_y, RIGHT);
+  fflush(stdout);
+}
+
+int32_t shellReadCommand(char *command) {
+  SShellHistory *pHistory = &shell.history;
+  SShellCmd      cmd = {0};
+  uint32_t       hist_counter = pHistory->hend;
+  char           utf8_array[10] = "\0";
+
+  cmd.buffer = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
+  cmd.command = (char *)taosMemoryCalloc(1, SHELL_MAX_COMMAND_SIZE);
+  shellShowOnScreen(&cmd);
+
+  // Read input.
+  char c;
+  while (1) {
+    c = (char)getchar();  // getchar() return an 'int32_t' value
+
+    if (c == EOF) {
+      return c;
+    }
+
+    if (c < 0) {  // For UTF-8
+      int32_t count = shellCountPrefixOnes(c);
+      utf8_array[0] = c;
+      for (int32_t k = 1; k < count; k++) {
+        c = (char)getchar();
+        utf8_array[k] = c;
+      }
+      shellInsertChar(&cmd, utf8_array, count);
+    } else if (c < '\033') {
+      // Ctrl keys.  TODO: Implement ctrl combinations
+      switch (c) {
+        case 1:  // ctrl A
+          shellPositionCursorHome(&cmd);
+          break;
+        case 3:
+          printf("\n");
+          shellResetCommand(&cmd, "");
+          kill(0, SIGINT);
+          break;
+        case 4:  // EOF or Ctrl+D
+          printf("\n");
+          return -1;
+        case 5:  // ctrl E
+          shellPositionCursorEnd(&cmd);
+          break;
+        case 8:
+          shellBackspaceChar(&cmd);
+          break;
+        case '\n':
+        case '\r':
+          printf("\n");
+          if (shellIsReadyGo(&cmd)) {
+            sprintf(command, "%s%s", cmd.buffer, cmd.command);
+            taosMemoryFreeClear(cmd.buffer);
+            taosMemoryFreeClear(cmd.command);
+            return 0;
+          } else {
+            shellUpdateBuffer(&cmd);
+          }
+          break;
+        case 11:  // Ctrl + K;
+          shellClearLineAfter(&cmd);
+          break;
+        case 12:  // Ctrl + L;
+          system("clear");
+          shellShowOnScreen(&cmd);
+          break;
+        case 21:  // Ctrl + U;
+          shellClearLineBefore(&cmd);
+          break;
+      }
+    } else if (c == '\033') {
+      c = (char)getchar();
+      switch (c) {
+        case '[':
+          c = (char)getchar();
+          switch (c) {
+            case 'A':  // Up arrow
+              if (hist_counter != pHistory->hstart) {
+                hist_counter = (hist_counter + SHELL_MAX_HISTORY_SIZE - 1) % SHELL_MAX_HISTORY_SIZE;
+                shellResetCommand(&cmd, (pHistory->hist[hist_counter] == NULL) ? "" : pHistory->hist[hist_counter]);
+              }
+              break;
+            case 'B':  // Down arrow
+              if (hist_counter != pHistory->hend) {
+                int32_t next_hist = (hist_counter + 1) % SHELL_MAX_HISTORY_SIZE;
+
+                if (next_hist != pHistory->hend) {
+                  shellResetCommand(&cmd, (pHistory->hist[next_hist] == NULL) ? "" : pHistory->hist[next_hist]);
+                } else {
+                  shellResetCommand(&cmd, "");
+                }
+                hist_counter = next_hist;
+              }
+              break;
+            case 'C':  // Right arrow
+              shellMoveCursorRight(&cmd);
+              break;
+            case 'D':  // Left arrow
+              shellMoveCursorLeft(&cmd);
+              break;
+            case '1':
+              if ((c = (char)getchar()) == '~') {
+                // Home key
+                shellPositionCursorHome(&cmd);
+              }
+              break;
+            case '2':
+              if ((c = (char)getchar()) == '~') {
+                // Insert key
+              }
+              break;
+            case '3':
+              if ((c = (char)getchar()) == '~') {
+                // Delete key
+                shellDeleteChar(&cmd);
+              }
+              break;
+            case '4':
+              if ((c = (char)getchar()) == '~') {
+                // End key
+                shellPositionCursorEnd(&cmd);
+              }
+              break;
+            case '5':
+              if ((c = (char)getchar()) == '~') {
+                // Page up key
+              }
+              break;
+            case '6':
+              if ((c = (char)getchar()) == '~') {
+                // Page down key
+              }
+              break;
+            case 72:
+              // Home key
+              shellPositionCursorHome(&cmd);
+              break;
+            case 70:
+              // End key
+              shellPositionCursorEnd(&cmd);
+              break;
+          }
+          break;
+      }
+    } else if (c == 0x7f) {
+      // press delete key
+      shellBackspaceChar(&cmd);
+    } else {
+      shellInsertChar(&cmd, &c, 1);
+    }
+  }
+
+  return 0;
+}
+
+#endif
\ No newline at end of file

tools/shell/src/shellEngine.c

@@ -17,135 +17,35 @@
 #define _GNU_SOURCE
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
-
-#include "os.h"
-#include "shell.h"
-#include "shellCommand.h"
-#include "taosdef.h"
-#include "taoserror.h"
-#include "tconfig.h"
-#include "tglobal.h"
-#include "ttypes.h"
-#include "tutil.h"
-
-#include <regex.h>
-#include <wordexp.h>
-
-/**************** Global variables ****************/
-#ifdef _TD_POWER_
-char CLIENT_VERSION[] =
-    "Welcome to the PowerDB shell from %s, Client Version:%s\n"
-    "Copyright (c) 2020 by PowerDB, Inc. All rights reserved.\n\n";
-char PROMPT_HEADER[] = "power> ";
-
-char CONTINUE_PROMPT[] = "    -> ";
-int  prompt_size = 7;
-#elif (_TD_TQ_ == true)
-char CLIENT_VERSION[] =
-    "Welcome to the TQ shell from %s, Client Version:%s\n"
-    "Copyright (c) 2020 by TQ, Inc. All rights reserved.\n\n";
-char PROMPT_HEADER[] = "tq> ";
-
-char CONTINUE_PROMPT[] = "    -> ";
-int  prompt_size = 4;
-#else
-char CLIENT_VERSION[] =
-    "Welcome to the TDengine shell from %s, Client Version:%s\n"
-    "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
-char PROMPT_HEADER[] = "taos> ";
-
-char CONTINUE_PROMPT[] = "   -> ";
-int  prompt_size = 6;
-#endif
-
-int64_t       result = 0;
-SShellHistory history;
-
-#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
-extern int32_t tsMaxBinaryDisplayWidth;
-extern TAOS   *taos_connect_auth(const char *ip, const char *user, const char *auth, const char *db, uint16_t port);
-
-/*
- * FUNCTION: Initialize the shell.
- */
-TAOS *shellInit(SShellArguments *_args) {
-  printf("\n");
-  if (!_args->is_use_passwd) {
-#ifdef TD_WINDOWS
-    strcpy(tsOsName, "Windows");
-#elif defined(TD_DARWIN)
-    strcpy(tsOsName, "Darwin");
-#endif
-    printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
-  }
-
-  fflush(stdout);
-
-  // set options before initializing
-  if (_args->timezone != NULL) {
-    taos_options(TSDB_OPTION_TIMEZONE, _args->timezone);
-  }
-
-  if (!_args->is_use_passwd) {
-    _args->password = TSDB_DEFAULT_PASS;
-  }
-
-  if (_args->user == NULL) {
-    _args->user = TSDB_DEFAULT_USER;
-  }
-
-  // Connect to the database.
-  TAOS *con = NULL;
-  if (_args->auth == NULL) {
-    con = taos_connect(_args->host, _args->user, _args->password, _args->database, _args->port);
-  } else {
-    con = taos_connect_auth(_args->host, _args->user, _args->auth, _args->database, _args->port);
-  }
-
-  if (con == NULL) {
-    fflush(stdout);
-    return con;
-  }
-
-  /* Read history TODO : release resources here*/
-  read_history();
-
-  // Check if it is temperory run
-  if (_args->commands != NULL || _args->file[0] != 0) {
-    if (_args->commands != NULL) {
-      printf("%s%s\n", PROMPT_HEADER, _args->commands);
-      shellRunCommand(con, _args->commands);
-    }
-
-    if (_args->file[0] != 0) {
-      source_file(con, _args->file);
-    }
-
-    taos_close(con);
-    write_history();
-    exit(EXIT_SUCCESS);
-  }
-
-#if 0
-#ifndef WINDOWS
-  if (_args->dir[0] != 0) {
-    source_dir(con, _args);
-    taos_close(con);
-    exit(EXIT_SUCCESS);
-  }
-
-  if (_args->check != 0) {
-    shellCheck(con, _args);
-    taos_close(con);
-    exit(EXIT_SUCCESS);
-  }
-#endif
-#endif
-
-  return con;
-}
-
-static bool isEmptyCommand(const char *cmd) {
+#include "shellInt.h"
+
+static bool    shellIsEmptyCommand(const char *cmd);
+static int32_t shellRunSingleCommand(char *command);
+static int32_t shellRunCommand(char *command);
+static void    shellRunSingleCommandImp(char *command);
+static char   *shellFormatTimestamp(char *buf, int64_t val, int32_t precision);
+static void    shellDumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, int32_t length,
+                                    int32_t precision);
+static int32_t shellDumpResultToFile(const char *fname, TAOS_RES *tres);
+static void    shellPrintNChar(const char *str, int32_t length, int32_t width);
+static void    shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t length, int32_t precision);
+static int32_t shellVerticalPrintResult(TAOS_RES *tres);
+static int32_t shellCalcColWidth(TAOS_FIELD *field, int32_t precision);
+static void    shellPrintHeader(TAOS_FIELD *fields, int32_t *width, int32_t num_fields);
+static int32_t shellHorizontalPrintResult(TAOS_RES *tres);
+static int32_t shellDumpResult(TAOS_RES *tres, char *fname, int32_t *error_no, bool vertical);
+static void    shellReadHistory();
+static void    shellWriteHistory();
+static void    shellPrintError(TAOS_RES *tres, int64_t st);
+static bool    shellIsCommentLine(char *line);
+static void    shellSourceFile(const char *file);
+static void    shellGetGrantInfo();
+static void    shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context);
+static void    shellCleanup(void *arg);
+static void   *shellCancelHandler(void *arg);
+static void   *shellThreadLoop(void *arg);
+
+bool shellIsEmptyCommand(const char *cmd) {
   for (char c = *cmd++; c != 0; c = *cmd++) {
     if (c != ' ' && c != '\t' && c != ';') {
       return false;
@@ -154,73 +54,67 @@ static bool isEmptyCommand(const char *cmd) {
   return true;
 }
 
-static int32_t shellRunSingleCommand(TAOS *con, char *command) {
-  /* If command is empty just return */
-  if (isEmptyCommand(command)) {
+int32_t shellRunSingleCommand(char *command) {
+  if (shellIsEmptyCommand(command)) {
     return 0;
   }
 
-  // Analyse the command.
-  if (regex_match(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
-    taos_close(con);
-    write_history();
-#ifdef WINDOWS
-    exit(EXIT_SUCCESS);
-#endif
+  if (shellRegexMatch(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+    shellWriteHistory();
     return -1;
   }
 
-  if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
-    // If clear the screen.
+  if (shellRegexMatch(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     system("clear");
     return 0;
   }
 
-  if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$",
-                  REG_EXTENDED | REG_ICASE)) {
+  if (shellRegexMatch(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$",
+                      REG_EXTENDED | REG_ICASE)) {
     strtok(command, " \t");
     strtok(NULL, " \t");
     char *p = strtok(NULL, " \t");
-    if (strcasecmp(p, "default") == 0) {
-      tsMaxBinaryDisplayWidth = DEFAULT_MAX_BINARY_DISPLAY_WIDTH;
+    if (strncasecmp(p, "default", 7) == 0) {
+      shell.args.displayWidth = SHELL_DEFAULT_MAX_BINARY_DISPLAY_WIDTH;
     } else {
-      tsMaxBinaryDisplayWidth = atoi(p);
+      int32_t displayWidth = atoi(p);
+      displayWidth = TRANGE(displayWidth, 1, 10 * 1024);
+      shell.args.displayWidth = displayWidth;
     }
     return 0;
   }
 
-  if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+  if (shellRegexMatch(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     /* If source file. */
     char *c_ptr = strtok(command, " ;");
     assert(c_ptr != NULL);
     c_ptr = strtok(NULL, " ;");
     assert(c_ptr != NULL);
-    source_file(con, c_ptr);
+    shellSourceFile(c_ptr);
     return 0;
   }
 
-  shellRunCommandOnServer(con, command);
+  shellRunSingleCommandImp(command);
   return 0;
 }
 
-int32_t shellRunCommand(TAOS *con, char *command) {
-  /* If command is empty just return */
-  if (isEmptyCommand(command)) {
+int32_t shellRunCommand(char *command) {
+  if (shellIsEmptyCommand(command)) {
     return 0;
   }
 
-  /* Update the history vector. */
-  if (history.hstart == history.hend ||
-      history.hist[(history.hend + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE] == NULL ||
-      strcmp(command, history.hist[(history.hend + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE]) != 0) {
-    if (history.hist[history.hend] != NULL) {
-      taosMemoryFreeClear(history.hist[history.hend]);
+  SShellHistory *pHistory = &shell.history;
+  if (pHistory->hstart == pHistory->hend ||
+      pHistory->hist[(pHistory->hend + SHELL_MAX_HISTORY_SIZE - 1) % SHELL_MAX_HISTORY_SIZE] == NULL ||
+      strcmp(command, pHistory->hist[(pHistory->hend + SHELL_MAX_HISTORY_SIZE - 1) % SHELL_MAX_HISTORY_SIZE]) != 0) {
+    if (pHistory->hist[pHistory->hend] != NULL) {
+      taosMemoryFreeClear(pHistory->hist[pHistory->hend]);
     }
-    history.hist[history.hend] = strdup(command);
+    pHistory->hist[pHistory->hend] = strdup(command);
 
-    history.hend = (history.hend + 1) % MAX_HISTORY_SIZE;
-    if (history.hend == history.hstart) {
-      history.hstart = (history.hstart + 1) % MAX_HISTORY_SIZE;
+    pHistory->hend = (pHistory->hend + 1) % SHELL_MAX_HISTORY_SIZE;
+    if (pHistory->hend == pHistory->hstart) {
+      pHistory->hstart = (pHistory->hstart + 1) % SHELL_MAX_HISTORY_SIZE;
     }
   }
 
@@ -272,7 +166,7 @@ int32_t shellRunCommand(TAOS *con, char *command) {
     if (c == ';' && quote == 0) {
       c = *p;
       *p = 0;
-      if (shellRunSingleCommand(con, cmd) < 0) {
+      if (shellRunSingleCommand(cmd) < 0) {
         return -1;
       }
       *p = c;
@@ -281,26 +175,15 @@ int32_t shellRunCommand(TAOS *con, char *command) {
   }
 
   *p = 0;
-  return shellRunSingleCommand(con, cmd);
-}
-
-void freeResultWithRid(int64_t rid) {
-#if 0
-  SSqlObj* pSql = taosAcquireRef(tscObjRef, rid);
-  if(pSql){
-    taos_free_result(pSql);
-    taosReleaseRef(tscObjRef, rid);
-  }
-#endif
+  return shellRunSingleCommand(cmd);
 }
 
-void shellRunCommandOnServer(TAOS *con, char command[]) {
-  int64_t   st, et;
-  wordexp_t full_path;
-  char     *sptr = NULL;
-  char     *cptr = NULL;
-  char     *fname = NULL;
-  bool      printMode = false;
+void shellRunSingleCommandImp(char *command) {
+  int64_t st, et;
+  char   *sptr = NULL;
+  char   *cptr = NULL;
+  char   *fname = NULL;
+  bool    printMode = false;
 
   if ((sptr = strstr(command, ">>")) != NULL) {
     cptr = strstr(command, ";");
@@ -308,12 +191,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
       *cptr = '\0';
     }
 
-    if (wordexp(sptr + 2, &full_path, 0) != 0) {
-      fprintf(stderr, "ERROR: invalid filename: %s\n", sptr + 2);
-      return;
-    }
+    fname = sptr + 2;
     *sptr = '\0';
-    fname = full_path.we_wordv[0];
   }
 
   if ((sptr = strstr(command, "\\G")) != NULL) {
@@ -328,20 +207,19 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
   st = taosGetTimestampUs();
 
-  TAOS_RES *pSql = taos_query(con, command);
+  TAOS_RES *pSql = taos_query(shell.conn, command);
   if (taos_errno(pSql)) {
-    taos_error(pSql, st);
+    shellPrintError(pSql, st);
     return;
   }
 
-  int64_t oresult = atomic_load_64(&result);
+  int64_t oresult = atomic_load_64(&shell.result);
 
-  if (regex_match(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
+  if (shellRegexMatch(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
     fprintf(stdout, "Database changed.\n\n");
     fflush(stdout);
 
-    atomic_store_64(&result, 0);
-    freeResultWithRid(oresult);
+    atomic_store_64(&shell.result, 0);
     taos_free_result(pSql);
 
     return;
@@ -349,12 +227,11 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
   TAOS_FIELD *pFields = taos_fetch_fields(pSql);
   if (pFields != NULL) {  // select and show kinds of commands
-    int error_no = 0;
+    int32_t error_no = 0;
 
-    int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
+    int32_t numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
     if (numOfRows < 0) {
-      atomic_store_64(&result, 0);
-      freeResultWithRid(oresult);
+      atomic_store_64(&shell.result, 0);
       return;
     }
 
@@ -366,7 +243,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
     }
     taos_free_result(pSql);
   } else {
-    int num_rows_affacted = taos_affected_rows(pSql);
+    int32_t num_rows_affacted = taos_affected_rows(pSql);
     taos_free_result(pSql);
     et = taosGetTimestampUs();
     printf("Query OK, %d of %d row(s) in database (%.6fs)\n", num_rows_affacted, num_rows_affacted, (et - st) / 1E6);
@@ -374,45 +251,11 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
   printf("\n");
 
-  if (fname != NULL) {
-    wordfree(&full_path);
-  }
-
-  atomic_store_64(&result, 0);
-  freeResultWithRid(oresult);
+  atomic_store_64(&shell.result, 0);
 }
 
-/* Function to do regular expression check */
-int regex_match(const char *s, const char *reg, int cflags) {
-  regex_t regex;
-  char    msgbuf[100] = {0};
-
-  /* Compile regular expression */
-  if (regcomp(&regex, reg, cflags) != 0) {
-    fprintf(stderr, "Fail to compile regex");
-    exitShell();
-  }
-
-  /* Execute regular expression */
-  int reti = regexec(&regex, s, 0, NULL, 0);
-  if (!reti) {
-    regfree(&regex);
-    return 1;
-  } else if (reti == REG_NOMATCH) {
-    regfree(&regex);
-    return 0;
-  } else {
-    regerror(reti, &regex, msgbuf, sizeof(msgbuf));
-    fprintf(stderr, "Regex match failed: %s\n", msgbuf);
-    regfree(&regex);
-    exitShell();
-  }
-
-  return 0;
-}
-
-static char *formatTimestamp(char *buf, int64_t val, int precision) {
-  if (args.is_raw_time) {
+char *shellFormatTimestamp(char *buf, int64_t val, int32_t precision) {
+  if (shell.args.is_raw_time) {
     sprintf(buf, "%" PRId64, val);
     return buf;
   }
@@ -430,13 +273,14 @@ static char *formatTimestamp(char *buf, int64_t val, int precision) {
     ms = val % 1000;
   }
 
-  /* comment out as it make testcases like select_with_tags.sim fail.
+  /*
+    comment out as it make testcases like select_with_tags.sim fail.
     but in windows, this may cause the call to localtime crash if tt < 0,
     need to find a better solution.
     if (tt < 0) {
       tt = 0;
     }
-    */
+  */
 
 #ifdef WINDOWS
   if (tt < 0) tt = 0;
@@ -466,7 +310,7 @@ static char *formatTimestamp(char *buf, int64_t val, int precision) {
   return buf;
 }
 
-static void dumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, int32_t length, int precision) {
+void shellDumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, int32_t length, int32_t precision) {
   if (val == NULL) {
     taosFprintfFile(pFile, "%s", TSDB_DATA_NULL_STR);
     return;
@@ -502,7 +346,7 @@ static void dumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field,
       taosFprintfFile(pFile, "\'%s\'", buf);
       break;
     case TSDB_DATA_TYPE_TIMESTAMP:
-      formatTimestamp(buf, *(int64_t *)val, precision);
+      shellFormatTimestamp(buf, *(int64_t *)val, precision);
       taosFprintfFile(pFile, "'%s'", buf);
       break;
     default:
@@ -510,35 +354,28 @@ static void dumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field,
   }
 }
 
-static int dumpResultToFile(const char *fname, TAOS_RES *tres) {
+int32_t shellDumpResultToFile(const char *fname, TAOS_RES *tres) {
+  char fullname[PATH_MAX] = {0};
+  if (taosExpandDir(fname, fullname, PATH_MAX) != 0) {
+    tstrncpy(fullname, fname, PATH_MAX);
+  }
+
   TAOS_ROW row = taos_fetch_row(tres);
   if (row == NULL) {
     return 0;
   }
 
-  wordexp_t full_path;
-
-  if (wordexp((char *)fname, &full_path, 0) != 0) {
-    fprintf(stderr, "ERROR: invalid file name: %s\n", fname);
-    return -1;
-  }
-
-  // FILE *fp = fopen(full_path.we_wordv[0], "w");
-  TdFilePtr pFile =
-      taosOpenFile(full_path.we_wordv[0], TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_STREAM);
+  TdFilePtr pFile = taosOpenFile(fullname, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_STREAM);
   if (pFile == NULL) {
-    fprintf(stderr, "ERROR: failed to open file: %s\n", full_path.we_wordv[0]);
-    wordfree(&full_path);
+    fprintf(stderr, "failed to open file: %s\n", fullname);
     return -1;
   }
 
-  wordfree(&full_path);
-
-  int         num_fields = taos_num_fields(tres);
   TAOS_FIELD *fields = taos_fetch_fields(tres);
-  int         precision = taos_result_precision(tres);
+  int32_t     num_fields = taos_num_fields(tres);
+  int32_t     precision = taos_result_precision(tres);
 
-  for (int col = 0; col < num_fields; col++) {
+  for (int32_t col = 0; col < num_fields; col++) {
     if (col > 0) {
       taosFprintfFile(pFile, ",");
     }
@@ -546,14 +383,14 @@ static int dumpResultToFile(const char *fname, TAOS_RES *tres) {
   }
   taosFprintfFile(pFile, "\n");
 
-  int numOfRows = 0;
+  int32_t numOfRows = 0;
   do {
     int32_t *length = taos_fetch_lengths(tres);
-    for (int i = 0; i < num_fields; i++) {
+    for (int32_t i = 0; i < num_fields; i++) {
       if (i > 0) {
         taosFprintfFile(pFile, "\n");
       }
-      dumpFieldToFile(pFile, (const char *)row[i], fields + i, length[i], precision);
+      shellDumpFieldToFile(pFile, (const char *)row[i], fields + i, length[i], precision);
     }
     taosFprintfFile(pFile, "\n");
 
@@ -561,19 +398,19 @@ static int dumpResultToFile(const char *fname, TAOS_RES *tres) {
     row = taos_fetch_row(tres);
   } while (row != NULL);
 
-  result = 0;
+  atomic_store_64(&shell.result, 0);
   taosCloseFile(&pFile);
 
   return numOfRows;
 }
 
-static void shellPrintNChar(const char *str, int length, int width) {
+void shellPrintNChar(const char *str, int32_t length, int32_t width) {
   TdWchar tail[3];
-  int     pos = 0, cols = 0, totalCols = 0, tailLen = 0;
+  int32_t pos = 0, cols = 0, totalCols = 0, tailLen = 0;
 
   while (pos < length) {
     TdWchar wc;
-    int     bytes = taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
+    int32_t bytes = taosMbToWchar(&wc, str + pos, MB_CUR_MAX);
     if (bytes == 0) {
       break;
     }
@@ -583,9 +420,9 @@ static void shellPrintNChar(const char *str, int length, int width) {
     }
 
 #ifdef WINDOWS
-    int w = bytes;
+    int32_t w = bytes;
 #else
-    int w = taosWcharWidth(wc);
+    int32_t w = taosWcharWidth(wc);
 #endif
     if (w <= 0) {
       continue;
@@ -611,7 +448,7 @@ static void shellPrintNChar(const char *str, int length, int width) {
 
   if (totalCols > width) {
     // width could be 1 or 2, so printf("...") cannot be used
-    for (int i = 0; i < 3; i++) {
+    for (int32_t i = 0; i < 3; i++) {
       if (cols >= width) {
         break;
       }
@@ -619,7 +456,7 @@ static void shellPrintNChar(const char *str, int length, int width) {
       ++cols;
     }
   } else {
-    for (int i = 0; i < tailLen; i++) {
+    for (int32_t i = 0; i < tailLen; i++) {
       printf("%lc", tail[i]);
     }
     cols = totalCols;
@@ -630,9 +467,9 @@ static void shellPrintNChar(const char *str, int length, int width) {
   }
 }
 
-static void printField(const char *val, TAOS_FIELD *field, int width, int32_t length, int precision) {
+void shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t length, int32_t precision) {
   if (val == NULL) {
-    int w = width;
+    int32_t w = width;
     if (field->type < TSDB_DATA_TYPE_TINYINT || field->type > TSDB_DATA_TYPE_DOUBLE) {
       w = 0;
     }
@@ -683,7 +520,7 @@ static void printField(const char *val, TAOS_FIELD *field, int width, int32_t le
       shellPrintNChar(val, length, width);
       break;
     case TSDB_DATA_TYPE_TIMESTAMP:
-      formatTimestamp(buf, *(int64_t *)val, precision);
+      shellFormatTimestamp(buf, *(int64_t *)val, precision);
       printf("%s", buf);
       break;
     default:
@@ -691,30 +528,19 @@ static void printField(const char *val, TAOS_FIELD *field, int width, int32_t le
   }
 }
 
-bool isSelectQuery(TAOS_RES *tres) {
-#if 0
-  char *sql = tscGetSqlStr(tres);
-
-  if (regex_match(sql, "^[\t ]*select[ \t]*", REG_EXTENDED | REG_ICASE)) {
-    return true;
-  }
-#endif
-  return false;
-}
-
-static int verticalPrintResult(TAOS_RES *tres) {
+int32_t shellVerticalPrintResult(TAOS_RES *tres) {
   TAOS_ROW row = taos_fetch_row(tres);
   if (row == NULL) {
     return 0;
   }
 
-  int         num_fields = taos_num_fields(tres);
+  int32_t     num_fields = taos_num_fields(tres);
   TAOS_FIELD *fields = taos_fetch_fields(tres);
-  int         precision = taos_result_precision(tres);
+  int32_t     precision = taos_result_precision(tres);
 
-  int maxColNameLen = 0;
-  for (int col = 0; col < num_fields; col++) {
-    int len = (int)strlen(fields[col].name);
+  int32_t maxColNameLen = 0;
+  for (int32_t col = 0; col < num_fields; col++) {
+    int32_t len = (int32_t)strlen(fields[col].name);
     if (len > maxColNameLen) {
       maxColNameLen = len;
     }
@@ -722,25 +548,25 @@ static int verticalPrintResult(TAOS_RES *tres) {
 
   uint64_t resShowMaxNum = UINT64_MAX;
 
-  if (args.commands == NULL && args.file[0] == 0 && isSelectQuery(tres) /*&& !tscIsQueryWithLimit(tres)*/) {
-    resShowMaxNum = DEFAULT_RES_SHOW_NUM;
+  if (shell.args.commands == NULL && shell.args.file[0] == 0) {
+    resShowMaxNum = SHELL_DEFAULT_RES_SHOW_NUM;
   }
 
-  int numOfRows = 0;
-  int showMore = 1;
+  int32_t numOfRows = 0;
+  int32_t showMore = 1;
   do {
     if (numOfRows < resShowMaxNum) {
       printf("*************************** %d.row ***************************\n", numOfRows + 1);
 
       int32_t *length = taos_fetch_lengths(tres);
 
-      for (int i = 0; i < num_fields; i++) {
+      for (int32_t i = 0; i < num_fields; i++) {
         TAOS_FIELD *field = fields + i;
 
-        int padding = (int)(maxColNameLen - strlen(field->name));
+        int32_t padding = (int32_t)(maxColNameLen - strlen(field->name));
         printf("%*.s%s: ", padding, " ", field->name);
 
-        printField((const char *)row[i], field, 0, length[i], precision);
+        shellPrintField((const char *)row[i], field, 0, length[i], precision);
         putchar('\n');
       }
     } else if (showMore) {
@@ -756,8 +582,8 @@ static int verticalPrintResult(TAOS_RES *tres) {
   return numOfRows;
 }
 
-static int calcColWidth(TAOS_FIELD *field, int precision) {
-  int width = (int)strlen(field->name);
+int32_t shellCalcColWidth(TAOS_FIELD *field, int32_t precision) {
+  int32_t width = (int32_t)strlen(field->name);
 
   switch (field->type) {
     case TSDB_DATA_TYPE_BOOL:
@@ -786,23 +612,23 @@ static int calcColWidth(TAOS_FIELD *field, int precision) {
       return TMAX(25, width);
 
     case TSDB_DATA_TYPE_BINARY:
-      if (field->bytes > tsMaxBinaryDisplayWidth) {
-        return TMAX(tsMaxBinaryDisplayWidth, width);
+      if (field->bytes > shell.args.displayWidth) {
+        return TMAX(shell.args.displayWidth, width);
       } else {
         return TMAX(field->bytes, width);
       }
 
     case TSDB_DATA_TYPE_NCHAR: {
       int16_t bytes = field->bytes * TSDB_NCHAR_SIZE;
-      if (bytes > tsMaxBinaryDisplayWidth) {
-        return TMAX(tsMaxBinaryDisplayWidth, width);
+      if (bytes > shell.args.displayWidth) {
+        return TMAX(shell.args.displayWidth, width);
       } else {
         return TMAX(bytes, width);
       }
     }
 
     case TSDB_DATA_TYPE_TIMESTAMP:
-      if (args.is_raw_time) {
+      if (shell.args.is_raw_time) {
         return TMAX(14, width);
       }
       if (precision == TSDB_TIME_PRECISION_NANO) {
@@ -820,55 +646,55 @@ static int calcColWidth(TAOS_FIELD *field, int precision) {
   return 0;
 }
 
-static void printHeader(TAOS_FIELD *fields, int *width, int num_fields) {
-  int rowWidth = 0;
-  for (int col = 0; col < num_fields; col++) {
+void shellPrintHeader(TAOS_FIELD *fields, int32_t *width, int32_t num_fields) {
+  int32_t rowWidth = 0;
+  for (int32_t col = 0; col < num_fields; col++) {
     TAOS_FIELD *field = fields + col;
-    int         padding = (int)(width[col] - strlen(field->name));
-    int         left = padding / 2;
+    int32_t     padding = (int32_t)(width[col] - strlen(field->name));
+    int32_t     left = padding / 2;
     printf(" %*.s%s%*.s |", left, " ", field->name, padding - left, " ");
     rowWidth += width[col] + 3;
   }
 
   putchar('\n');
-  for (int i = 0; i < rowWidth; i++) {
+  for (int32_t i = 0; i < rowWidth; i++) {
     putchar('=');
   }
   putchar('\n');
 }
 
-static int horizontalPrintResult(TAOS_RES *tres) {
+int32_t shellHorizontalPrintResult(TAOS_RES *tres) {
   TAOS_ROW row = taos_fetch_row(tres);
   if (row == NULL) {
     return 0;
   }
 
-  int         num_fields = taos_num_fields(tres);
+  int32_t     num_fields = taos_num_fields(tres);
   TAOS_FIELD *fields = taos_fetch_fields(tres);
-  int         precision = taos_result_precision(tres);
+  int32_t     precision = taos_result_precision(tres);
 
-  int width[TSDB_MAX_COLUMNS];
-  for (int col = 0; col < num_fields; col++) {
-    width[col] = calcColWidth(fields + col, precision);
+  int32_t width[TSDB_MAX_COLUMNS];
+  for (int32_t col = 0; col < num_fields; col++) {
+    width[col] = shellCalcColWidth(fields + col, precision);
   }
 
-  printHeader(fields, width, num_fields);
+  shellPrintHeader(fields, width, num_fields);
 
   uint64_t resShowMaxNum = UINT64_MAX;
 
-  if (args.commands == NULL && args.file[0] == 0 && isSelectQuery(tres) /* && !tscIsQueryWithLimit(tres)*/) {
-    resShowMaxNum = DEFAULT_RES_SHOW_NUM;
+  if (shell.args.commands == NULL && shell.args.file[0] == 0) {
+    resShowMaxNum = SHELL_DEFAULT_RES_SHOW_NUM;
   }
 
-  int numOfRows = 0;
-  int showMore = 1;
+  int32_t numOfRows = 0;
+  int32_t showMore = 1;
 
   do {
     int32_t *length = taos_fetch_lengths(tres);
     if (numOfRows < resShowMaxNum) {
-      for (int i = 0; i < num_fields; i++) {
+      for (int32_t i = 0; i < num_fields; i++) {
         putchar(' ');
-        printField((const char *)row[i], fields + i, width[i], length[i], precision);
+        shellPrintField((const char *)row[i], fields + i, width[i], length[i], precision);
         putchar(' ');
         putchar('|');
       }
@@ -886,50 +712,35 @@ static int horizontalPrintResult(TAOS_RES *tres) {
   return numOfRows;
 }
 
-int shellDumpResult(TAOS_RES *tres, char *fname, int *error_no, bool vertical) {
-  int numOfRows = 0;
+int32_t shellDumpResult(TAOS_RES *tres, char *fname, int32_t *error_no, bool vertical) {
+  int32_t numOfRows = 0;
   if (fname != NULL) {
-    numOfRows = dumpResultToFile(fname, tres);
+    numOfRows = shellDumpResultToFile(fname, tres);
   } else if (vertical) {
-    numOfRows = verticalPrintResult(tres);
+    numOfRows = shellVerticalPrintResult(tres);
   } else {
-    numOfRows = horizontalPrintResult(tres);
+    numOfRows = shellHorizontalPrintResult(tres);
   }
 
   *error_no = taos_errno(tres);
   return numOfRows;
 }
 
-void read_history() {
-  // Initialize history
-  memset(history.hist, 0, sizeof(char *) * MAX_HISTORY_SIZE);
-  history.hstart = 0;
-  history.hend = 0;
-  char *line = NULL;
-  int   read_size = 0;
-
-  char f_history[TSDB_FILENAME_LEN];
-  get_history_path(f_history);
-
-  // FILE *f = fopen(f_history, "r");
-  TdFilePtr pFile = taosOpenFile(f_history, TD_FILE_READ | TD_FILE_STREAM);
-  if (pFile == NULL) {
-#ifndef WINDOWS
-    if (errno != ENOENT) {
-      fprintf(stderr, "Failed to open file %s, reason:%s\n", f_history, strerror(errno));
-    }
-#endif
-    return;
-  }
+void shellReadHistory() {
+  SShellHistory *pHistory = &shell.history;
+  TdFilePtr      pFile = taosOpenFile(pHistory->file, TD_FILE_READ | TD_FILE_STREAM);
+  if (pFile == NULL) return;
 
+  char   *line = NULL;
+  int32_t read_size = 0;
   while ((read_size = taosGetLineFile(pFile, &line)) != -1) {
     line[read_size - 1] = '\0';
-    history.hist[history.hend] = strdup(line);
+    pHistory->hist[pHistory->hend] = strdup(line);
 
-    history.hend = (history.hend + 1) % MAX_HISTORY_SIZE;
+    pHistory->hend = (pHistory->hend + 1) % SHELL_MAX_HISTORY_SIZE;
 
-    if (history.hend == history.hstart) {
-      history.hstart = (history.hstart + 1) % MAX_HISTORY_SIZE;
+    if (pHistory->hend == pHistory->hstart) {
+      pHistory->hstart = (pHistory->hstart + 1) % SHELL_MAX_HISTORY_SIZE;
     }
   }
 
@@ -937,72 +748,48 @@ void read_history() {
   taosCloseFile(&pFile);
 }
 
-void write_history() {
-  char f_history[TSDB_FILENAME_LEN];
-  get_history_path(f_history);
-
-  // FILE *f = fopen(f_history, "w");
-  TdFilePtr pFile = taosOpenFile(f_history, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC | TD_FILE_STREAM);
-  if (pFile == NULL) {
-#ifndef WINDOWS
-    fprintf(stderr, "Failed to open file %s for write, reason:%s\n", f_history, strerror(errno));
-#endif
-    return;
-  }
+void shellWriteHistory() {
+  SShellHistory *pHistory = &shell.history;
+  TdFilePtr      pFile = taosOpenFile(pHistory->file, TD_FILE_WRITE | TD_FILE_STREAM);
+  if (pFile == NULL) return;
 
-  for (int i = history.hstart; i != history.hend;) {
-    if (history.hist[i] != NULL) {
-      taosFprintfFile(pFile, "%s\n", history.hist[i]);
-      taosMemoryFreeClear(history.hist[i]);
+  for (int32_t i = pHistory->hstart; i != pHistory->hend;) {
+    if (pHistory->hist[i] != NULL) {
+      taosFprintfFile(pFile, "%s\n", pHistory->hist[i]);
+      taosMemoryFreeClear(pHistory->hist[i]);
     }
-    i = (i + 1) % MAX_HISTORY_SIZE;
+    i = (i + 1) % SHELL_MAX_HISTORY_SIZE;
   }
+  taosFsyncFile(pFile);
   taosCloseFile(&pFile);
 }
 
-void taos_error(TAOS_RES *tres, int64_t st) {
+void shellPrintError(TAOS_RES *tres, int64_t st) {
   int64_t et = taosGetTimestampUs();
-  atomic_store_ptr(&result, 0);
+  atomic_store_ptr(&shell.result, 0);
   fprintf(stderr, "\nDB error: %s (%.6fs)\n", taos_errstr(tres), (et - st) / 1E6);
   taos_free_result(tres);
 }
 
-int isCommentLine(char *line) {
-  if (line == NULL) return 1;
-
-  return regex_match(line, "^\\s*#.*", REG_EXTENDED);
+bool shellIsCommentLine(char *line) {
+  if (line == NULL) return true;
+  return shellRegexMatch(line, "^\\s*#.*", REG_EXTENDED);
 }
 
-void source_file(TAOS *con, char *fptr) {
-  wordexp_t full_path;
-  int       read_len = 0;
-  char     *cmd = taosMemoryCalloc(1, TSDB_MAX_ALLOWED_SQL_LEN + 1);
-  size_t    cmd_len = 0;
-  char     *line = NULL;
+void shellSourceFile(const char *file) {
+  int32_t read_len = 0;
+  char   *cmd = taosMemoryCalloc(1, TSDB_MAX_ALLOWED_SQL_LEN + 1);
+  size_t  cmd_len = 0;
+  char   *line = NULL;
+  char    fullname[PATH_MAX] = {0};
 
-  if (wordexp(fptr, &full_path, 0) != 0) {
-    fprintf(stderr, "ERROR: illegal file name\n");
-    taosMemoryFree(cmd);
-    return;
+  if (taosExpandDir(file, fullname, PATH_MAX) != 0) {
+    tstrncpy(fullname, file, PATH_MAX);
   }
 
-  char *fname = full_path.we_wordv[0];
-
-  /*
-  if (access(fname, F_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
-
-    wordfree(&full_path);
-    taosMemoryFree(cmd);
-    return;
-  }
-  */
-
-  // FILE *f = fopen(fname, "r");
-  TdFilePtr pFile = taosOpenFile(fname, TD_FILE_READ | TD_FILE_STREAM);
+  TdFilePtr pFile = taosOpenFile(fullname, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
-    fprintf(stderr, "ERROR: failed to open file %s\n", fname);
-    wordfree(&full_path);
+    fprintf(stderr, "failed to open file %s\n", fullname);
     taosMemoryFree(cmd);
     return;
   }
@@ -1011,7 +798,7 @@ void source_file(TAOS *con, char *fptr) {
     if (read_len >= TSDB_MAX_ALLOWED_SQL_LEN) continue;
     line[--read_len] = '\0';
 
-    if (read_len == 0 || isCommentLine(line)) {  // line starts with #
+    if (read_len == 0 || shellIsCommentLine(line)) {  // line starts with #
       continue;
     }
 
@@ -1023,36 +810,38 @@ void source_file(TAOS *con, char *fptr) {
     }
 
     memcpy(cmd + cmd_len, line, read_len);
-    printf("%s%s\n", PROMPT_HEADER, cmd);
-    shellRunCommand(con, cmd);
+    printf("%s%s\n", shell.info.promptHeader, cmd);
+    shellRunCommand(cmd);
     memset(cmd, 0, TSDB_MAX_ALLOWED_SQL_LEN);
     cmd_len = 0;
   }
 
   taosMemoryFree(cmd);
   if (line != NULL) taosMemoryFree(line);
-  wordfree(&full_path);
   taosCloseFile(&pFile);
 }
 
-void shellGetGrantInfo(void *con) {
-  return;
-#if 0
+void shellGetGrantInfo() {
+  char sinfo[1024] = {0};
+  tstrncpy(sinfo, taos_get_server_info(shell.conn), sizeof(sinfo));
+  strtok(sinfo, "\n");
+
   char sql[] = "show grants";
 
-  TAOS_RES* tres = taos_query(con, sql);
+  TAOS_RES *tres = taos_query(shell.conn, sql);
 
-  int code = taos_errno(tres);
+  int32_t code = taos_errno(tres);
   if (code != TSDB_CODE_SUCCESS) {
-    if (code == TSDB_CODE_COM_OPS_NOT_SUPPORT) {
-      fprintf(stdout, "Server is Community Edition, version is %s\n\n", taos_get_server_info(con));
+    if (code == TSDB_CODE_OPS_NOT_SUPPORT) {
+      fprintf(stdout, "Server is Community Edition, %s\n\n", sinfo);
     } else {
-      fprintf(stderr, "Failed to check Server Edition, Reason:%d:%s\n\n", taos_errno(con), taos_errstr(con));
+      fprintf(stderr, "Failed to check Server Edition, Reason:0x%04x:%s\n\n", taos_errno(shell.conn),
+              taos_errstr(shell.conn));
     }
     return;
   }
 
-  int num_fields = taos_field_count(tres);
+  int32_t num_fields = taos_field_count(tres);
   if (num_fields == 0) {
     fprintf(stderr, "\nInvalid grant information.\n");
     exit(0);
@@ -1063,7 +852,7 @@ void shellGetGrantInfo(void *con) {
     }
 
     TAOS_FIELD *fields = taos_fetch_fields(tres);
-    TAOS_ROW row = taos_fetch_row(tres);
+    TAOS_ROW    row = taos_fetch_row(tres);
     if (row == NULL) {
       fprintf(stderr, "\nFailed to get grant information from server. Abort.\n");
       exit(0);
@@ -1078,15 +867,128 @@ void shellGetGrantInfo(void *con) {
     memcpy(expired, row[2], fields[2].bytes);
 
     if (strcmp(expiretime, "unlimited") == 0) {
-      fprintf(stdout, "Server is Enterprise %s Edition, version is %s and will never expire.\n", serverVersion, taos_get_server_info(con));
+      fprintf(stdout, "Server is Enterprise %s Edition, %s and will never expire.\n", serverVersion, sinfo);
     } else {
-      fprintf(stdout, "Server is Enterprise %s Edition, version is %s and will expire at %s.\n", serverVersion, taos_get_server_info(con), expiretime);
+      fprintf(stdout, "Server is Enterprise %s Edition, %s and will expire at %s.\n", serverVersion, sinfo, expiretime);
     }
 
-    result = NULL;
+    atomic_store_64(&shell.result, 0);
     taos_free_result(tres);
   }
 
   fprintf(stdout, "\n");
-#endif
+}
+
+void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&shell.cancelSem); }
+
+void shellSigintHandler(int32_t signum, void *sigInfo, void *context) {
+  // do nothing
+}
+
+void shellCleanup(void *arg) { taosResetTerminalMode(); }
+
+void *shellCancelHandler(void *arg) {
+  setThreadName("shellCancelHandler");
+  while (1) {
+    if (tsem_wait(&shell.cancelSem) != 0) {
+      taosMsleep(10);
+      continue;
+    }
+
+    taosResetTerminalMode();
+    printf("\nReceive SIGTERM or other signal, quit shell.\n");
+    shellWriteHistory();
+    shellExit();
+  }
+
+  return NULL;
+}
+
+void *shellThreadLoop(void *arg) {
+  setThreadName("shellThreadLoop");
+  taosGetOldTerminalMode();
+  taosThreadCleanupPush(shellCleanup, NULL);
+
+  char *command = taosMemoryMalloc(SHELL_MAX_COMMAND_SIZE);
+  if (command == NULL) {
+    printf("failed to malloc command\n");
+    return NULL;
+  }
+
+  do {
+    memset(command, 0, SHELL_MAX_COMMAND_SIZE);
+    taosSetTerminalMode();
+
+    if (shellReadCommand(command) != 0) {
+      break;
+    }
+
+    taosResetTerminalMode();
+  } while (shellRunCommand(command) == 0);
+
+  taosMemoryFreeClear(command);
+  shellWriteHistory();
+  shellExit();
+
+  taosThreadCleanupPop(1);
+  return NULL;
+}
+
+int32_t shellExecute() {
+  printf(shell.info.clientVersion, shell.info.osname, taos_get_client_info());
+  fflush(stdout);
+
+  SShellArgs *pArgs = &shell.args;
+  if (shell.args.auth == NULL) {
+    shell.conn = taos_connect(pArgs->host, pArgs->user, pArgs->password, pArgs->database, pArgs->port);
+  } else {
+    shell.conn = taos_connect_auth(pArgs->host, pArgs->user, pArgs->auth, pArgs->database, pArgs->port);
+  }
+
+  if (shell.conn == NULL) {
+    fflush(stdout);
+    return -1;
+  }
+
+  shellReadHistory();
+
+  if (pArgs->commands != NULL || pArgs->file[0] != 0) {
+    if (pArgs->commands != NULL) {
+      printf("%s%s\n", shell.info.promptHeader, pArgs->commands);
+      char *cmd = strdup(pArgs->commands);
+      shellRunCommand(cmd);
+      taosMemoryFree(cmd);
+    }
+
+    if (pArgs->file[0] != 0) {
+      shellSourceFile(pArgs->file);
+    }
+
+    taos_close(shell.conn);
+    shellWriteHistory();
+    return 0;
+  }
+
+  if (tsem_init(&shell.cancelSem, 0, 0) != 0) {
+    printf("failed to create cancel semphore\n");
+    return -1;
+  }
+
+  TdThread spid = {0};
+  taosThreadCreate(&spid, NULL, shellCancelHandler, NULL);
+
+  taosSetSignal(SIGTERM, shellQueryInterruptHandler);
+  taosSetSignal(SIGHUP, shellQueryInterruptHandler);
+  taosSetSignal(SIGABRT, shellQueryInterruptHandler);
+
+  taosSetSignal(SIGINT, shellSigintHandler);
+
+  shellGetGrantInfo(shell.conn);
+
+  while (1) {
+    taosThreadCreate(&shell.pid, NULL, shellThreadLoop, shell.conn);
+    taosThreadJoin(shell.pid, NULL);
+  }
+
+  return 0;
 }

tools/shell/src/shellMain.c

@@ -14,681 +14,53 @@
  */
 
 #define __USE_XOPEN
-#include "shellCommand.h"
-#include "tglobal.h"
-#include "tlog.h"
+#include "shellInt.h"
 
-#include <argp.h>
-#include <termio.h>
-#include <wordexp.h>
+SShellObj shell = {0};
 
-#define OPT_ABORT 1 /* abort */
-
-int indicator = 1;
-
-void        insertChar(Command *cmd, char *c, int size);
-void        taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen, int32_t pkgNum, char *pkgType);
-const char *argp_program_version = version;
-const char *argp_program_bug_address = "<support@taosdata.com>";
-static char doc[] = "";
-static char args_doc[] = "";
-
-TdThread      pid;
-static tsem_t cancelSem;
-extern void   taos_init();
-
-static struct argp_option options[] = {
-  {"host",       'h', "HOST",       0,                   "TDengine server FQDN to connect. The default host is localhost."},
-  {"password",   'p', NULL,         0,                   "The password to use when connecting to the server."},
-  {"port",       'P', "PORT",       0,                   "The TCP/IP port number to use for the connection."},
-  {"user",       'u', "USER",       0,                   "The user name to use when connecting to the server."},
-  {"auth",       'A', "Auth",       0,                   "The auth string to use when connecting to the server."},
-  {"config-dir", 'c', "CONFIG_DIR", 0,                   "Configuration directory."},
-  {"dump-config",'C', NULL,         0,                   "Dump configuration."},
-  {"commands",   's', "COMMANDS",   0,                   "Commands to run without enter the shell."},
-  {"raw-time",   'r', NULL,         0,                   "Output time as uint64_t."},
-  {"file",       'f', "FILE",       0,                   "Script to run without enter the shell."},
-  {"directory",  'D', "DIRECTORY",  0,                   "Use multi-thread to import all SQL files in the directory separately."},
-  {"thread",     'T', "THREADNUM",  0,                   "Number of threads when using multi-thread to import data."},
-  {"check",      'k', "CHECK",      0,                   "Check tables."},
-  {"database",   'd', "DATABASE",   0,                   "Database to use when connecting to the server."},
-  {"timezone",   'z', "TIMEZONE",   0,                   "Time zone of the shell, default is local."},
-  {"status",     't', NULL,         0,                   "Check the service status."},
-  {"verbose",    'v', NULL,         0,                   "Check the details of the service status."},
-  {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync|speed|fqdn."},
-  {"pktlen",     'l', "PKTLEN",     0,                   "Packet length used for net test, default is 1000 bytes."},
-  {"pktnum",     'N', "PKTNUM",     0,                   "Packet numbers used for net test, default is 100."},
-// Shuduo: 3.0 does not support UDP any more
-//  {"pkttype",    'S', "PKTTYPE",    0,                   "Packet type used for net test, default is TCP."},
-  {0}};
-
-static error_t parse_opt(int key, char *arg, struct argp_state *state) {
-  /* Get the input argument from argp_parse, which we
-  know is a pointer to our arguments structure. */
-  SShellArguments *arguments = state->input;
-  wordexp_t        full_path;
-
-  switch (key) {
-    case 'h':
-      arguments->host = arg;
-      break;
-    case 'p':
-      break;
-    case 'P':
-      if (arg) {
-        arguments->port = atoi(arg);
-      } else {
-        fprintf(stderr, "Invalid port\n");
-        return -1;
-      }
-
-      break;
-    case 'z':
-      arguments->timezone = arg;
-      break;
-    case 'u':
-      arguments->user = arg;
-      break;
-    case 'A':
-      arguments->auth = arg;
-      break;
-    case 'c':
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
-        fprintf(stderr, "config file path: %s overflow max len %d\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
-        wordfree(&full_path);
-        return -1;
-      }
-      tstrncpy(configDir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
-      wordfree(&full_path);
-      break;
-    case 'C':
-      arguments->dump_config = true;
-      break;
-    case 's':
-      arguments->commands = arg;
-      break;
-    case 'r':
-      arguments->is_raw_time = true;
-      break;
-    case 'f':
-      if ((0 == strlen(arg)) || (wordexp(arg, &full_path, 0) != 0)) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      tstrncpy(arguments->file, full_path.we_wordv[0], TSDB_FILENAME_LEN);
-      wordfree(&full_path);
-      break;
-    case 'D':
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      tstrncpy(arguments->dir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
-      wordfree(&full_path);
-      break;
-    case 'T':
-      if (arg) {
-        arguments->threadNum = atoi(arg);
-      } else {
-        fprintf(stderr, "Invalid number of threads\n");
-        return -1;
-      }
-      break;
-    case 'k':
-      arguments->check = atoi(arg);
-      break;
-    case 't':
-      arguments->status = true;
-      break;
-    case 'v':
-      arguments->verbose = true;
-      break;
-    case 'd':
-      arguments->database = arg;
-      break;
-    case 'n':
-      arguments->netTestRole = arg;
-      break;
-    case 'l':
-      if (arg) {
-        arguments->pktLen = atoi(arg);
-      } else {
-        fprintf(stderr, "Invalid packet length\n");
-        return -1;
-      }
-      break;
-    case 'N':
-      if (arg) {
-        arguments->pktNum = atoi(arg);
-      } else {
-        fprintf(stderr, "Invalid packet number\n");
-        return -1;
-      }
-      break;
-    case 'S':
-      arguments->pktType = arg;
-      break;
-    case OPT_ABORT:
-      arguments->abort = 1;
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-  }
-  return 0;
-}
-
-/* Our argp parser. */
-static struct argp argp = {options, parse_opt, args_doc, doc};
-
-char LINUXCLIENT_VERSION[] =
-    "Welcome to the TDengine shell from %s, Client Version:%s\n"
-    "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
-char g_password[SHELL_MAX_PASSWORD_LEN];
-
-static void parse_args(int argc, char *argv[], SShellArguments *arguments) {
-  for (int i = 1; i < argc; i++) {
-    if ((strncmp(argv[i], "-p", 2) == 0) || (strncmp(argv[i], "--password", 10) == 0)) {
-      printf(LINUXCLIENT_VERSION, tsOsName, taos_get_client_info());
-      if ((strlen(argv[i]) == 2) || (strncmp(argv[i], "--password", 10) == 0)) {
-        printf("Enter password: ");
-        taosSetConsoleEcho(false);
-        if (scanf("%20s", g_password) > 1) {
-          fprintf(stderr, "password reading error\n");
-        }
-        taosSetConsoleEcho(true);
-        if (EOF == getchar()) {
-          fprintf(stderr, "getchar() return EOF\n");
-        }
-      } else {
-        tstrncpy(g_password, (char *)(argv[i] + 2), SHELL_MAX_PASSWORD_LEN);
-        strcpy(argv[i], "-p");
-      }
-      arguments->password = g_password;
-      arguments->is_use_passwd = true;
-    }
-  }
-}
-
-void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
-  static char verType[32] = {0};
-  sprintf(verType, "version: %s\n", version);
-
-  argp_program_version = verType;
-
-  if (argc > 1) {
-    parse_args(argc, argv, arguments);
-  }
-
-  argp_parse(&argp, argc, argv, 0, 0, arguments);
-  if (arguments->abort) {
-#ifndef _ALPINE
-#if 0
-      error(10, 0, "ABORTED");
-#endif
-#else
-    abort();
-#endif
-  }
-}
-
-int32_t shellReadCommand(TAOS *con, char *command) {
-  unsigned hist_counter = history.hend;
-  char     utf8_array[10] = "\0";
-  Command  cmd;
-  memset(&cmd, 0, sizeof(cmd));
-  cmd.buffer = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  cmd.command = (char *)taosMemoryCalloc(1, MAX_COMMAND_SIZE);
-  showOnScreen(&cmd);
-
-  // Read input.
-  char c;
-  while (1) {
-    c = (char)getchar();  // getchar() return an 'int' value
-
-    if (c == EOF) {
-      return c;
-    }
-
-    if (c < 0) {  // For UTF-8
-      int count = countPrefixOnes(c);
-      utf8_array[0] = c;
-      for (int k = 1; k < count; k++) {
-        c = (char)getchar();
-        utf8_array[k] = c;
-      }
-      insertChar(&cmd, utf8_array, count);
-    } else if (c < '\033') {
-      // Ctrl keys.  TODO: Implement ctrl combinations
-      switch (c) {
-        case 1:  // ctrl A
-          positionCursorHome(&cmd);
-          break;
-        case 3:
-          printf("\n");
-          resetCommand(&cmd, "");
-          kill(0, SIGINT);
-          break;
-        case 4:  // EOF or Ctrl+D
-          printf("\n");
-          taos_close(con);
-          // write the history
-          write_history();
-          exitShell();
-          break;
-        case 5:  // ctrl E
-          positionCursorEnd(&cmd);
-          break;
-        case 8:
-          backspaceChar(&cmd);
-          break;
-        case '\n':
-        case '\r':
-          printf("\n");
-          if (isReadyGo(&cmd)) {
-            sprintf(command, "%s%s", cmd.buffer, cmd.command);
-            taosMemoryFreeClear(cmd.buffer);
-            taosMemoryFreeClear(cmd.command);
-            return 0;
-          } else {
-            updateBuffer(&cmd);
-          }
-          break;
-        case 11:  // Ctrl + K;
-          clearLineAfter(&cmd);
-          break;
-        case 12:  // Ctrl + L;
-          system("clear");
-          showOnScreen(&cmd);
-          break;
-        case 21:  // Ctrl + U;
-          clearLineBefore(&cmd);
-          break;
-      }
-    } else if (c == '\033') {
-      c = (char)getchar();
-      switch (c) {
-        case '[':
-          c = (char)getchar();
-          switch (c) {
-            case 'A':  // Up arrow
-              if (hist_counter != history.hstart) {
-                hist_counter = (hist_counter + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE;
-                resetCommand(&cmd, (history.hist[hist_counter] == NULL) ? "" : history.hist[hist_counter]);
-              }
-              break;
-            case 'B':  // Down arrow
-              if (hist_counter != history.hend) {
-                int next_hist = (hist_counter + 1) % MAX_HISTORY_SIZE;
-
-                if (next_hist != history.hend) {
-                  resetCommand(&cmd, (history.hist[next_hist] == NULL) ? "" : history.hist[next_hist]);
-                } else {
-                  resetCommand(&cmd, "");
-                }
-                hist_counter = next_hist;
-              }
-              break;
-            case 'C':  // Right arrow
-              moveCursorRight(&cmd);
-              break;
-            case 'D':  // Left arrow
-              moveCursorLeft(&cmd);
-              break;
-            case '1':
-              if ((c = (char)getchar()) == '~') {
-                // Home key
-                positionCursorHome(&cmd);
-              }
-              break;
-            case '2':
-              if ((c = (char)getchar()) == '~') {
-                // Insert key
-              }
-              break;
-            case '3':
-              if ((c = (char)getchar()) == '~') {
-                // Delete key
-                deleteChar(&cmd);
-              }
-              break;
-            case '4':
-              if ((c = (char)getchar()) == '~') {
-                // End key
-                positionCursorEnd(&cmd);
-              }
-              break;
-            case '5':
-              if ((c = (char)getchar()) == '~') {
-                // Page up key
-              }
-              break;
-            case '6':
-              if ((c = (char)getchar()) == '~') {
-                // Page down key
-              }
-              break;
-            case 72:
-              // Home key
-              positionCursorHome(&cmd);
-              break;
-            case 70:
-              // End key
-              positionCursorEnd(&cmd);
-              break;
-          }
-          break;
-      }
-    } else if (c == 0x7f) {
-      // press delete key
-      backspaceChar(&cmd);
-    } else {
-      insertChar(&cmd, &c, 1);
-    }
-  }
-
-  return 0;
-}
-
-void *shellLoopQuery(void *arg) {
-  if (indicator) {
-    getOldTerminalMode();
-    indicator = 0;
-  }
-
-  TAOS *con = (TAOS *)arg;
-
-  setThreadName("shellLoopQuery");
-
-  taosThreadCleanupPush(cleanup_handler, NULL);
-
-  char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
-  if (command == NULL) {
-    uError("failed to malloc command");
-    return NULL;
-  }
-
-  int32_t err = 0;
-
-  do {
-    // Read command from shell.
-    memset(command, 0, MAX_COMMAND_SIZE);
-    setTerminalMode();
-    err = shellReadCommand(con, command);
-    if (err) {
-      break;
-    }
-    resetTerminalMode();
-  } while (shellRunCommand(con, command) == 0);
-
-  taosMemoryFreeClear(command);
-  exitShell();
-
-  taosThreadCleanupPop(1);
-
-  return NULL;
-}
-
-void get_history_path(char *_history) { snprintf(_history, TSDB_FILENAME_LEN, "%s/%s", getenv("HOME"), HISTORY_FILE); }
-
-void clearScreen(int ecmd_pos, int cursor_pos) {
-  struct winsize w;
-  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
-    // fprintf(stderr, "No stream device, and use default value(col 120, row 30)\n");
-    w.ws_col = 120;
-    w.ws_row = 30;
-  }
-
-  int cursor_x = cursor_pos / w.ws_col;
-  int cursor_y = cursor_pos % w.ws_col;
-  int command_x = ecmd_pos / w.ws_col;
-  positionCursor(cursor_y, LEFT);
-  positionCursor(command_x - cursor_x, DOWN);
-  fprintf(stdout, "\033[2K");
-  for (int i = 0; i < command_x; i++) {
-    positionCursor(1, UP);
-    fprintf(stdout, "\033[2K");
-  }
-  fflush(stdout);
-}
-
-void showOnScreen(Command *cmd) {
-  struct winsize w;
-  if (ioctl(0, TIOCGWINSZ, &w) < 0 || w.ws_col == 0 || w.ws_row == 0) {
-    // fprintf(stderr, "No stream device\n");
-    w.ws_col = 120;
-    w.ws_row = 30;
-  }
-
-  TdWchar wc;
-  int     size = 0;
-
-  // Print out the command.
-  char *total_string = taosMemoryMalloc(MAX_COMMAND_SIZE);
-  memset(total_string, '\0', MAX_COMMAND_SIZE);
-  if (strcmp(cmd->buffer, "") == 0) {
-    sprintf(total_string, "%s%s", PROMPT_HEADER, cmd->command);
-  } else {
-    sprintf(total_string, "%s%s", CONTINUE_PROMPT, cmd->command);
-  }
-
-  int remain_column = w.ws_col;
-  /* size = cmd->commandSize + prompt_size; */
-  for (char *str = total_string; size < cmd->commandSize + prompt_size;) {
-    int ret = taosMbToWchar(&wc, str, MB_CUR_MAX);
-    if (ret < 0) break;
-    size += ret;
-    /* assert(size >= 0); */
-    int width = taosWcharWidth(wc);
-    if (remain_column > width) {
-      printf("%lc", wc);
-      remain_column -= width;
-    } else {
-      if (remain_column == width) {
-        printf("%lc\n\r", wc);
-        remain_column = w.ws_col;
-      } else {
-        printf("\n\r%lc", wc);
-        remain_column = w.ws_col - width;
-      }
-    }
-
-    str = total_string + size;
+int main(int argc, char *argv[]) {
+  if (shellCheckIntSize() != 0) {
+    return -1;
   }
 
-  taosMemoryFree(total_string);
-  /* for (int i = 0; i < size; i++){ */
-  /*     char c = total_string[i]; */
-  /*     if (k % w.ws_col == 0) { */
-  /*         printf("%c\n\r", c); */
-  /*     } */
-  /*     else { */
-  /*         printf("%c", c); */
-  /*     } */
-  /*     k += 1; */
-  /* } */
-
-  // Position the cursor
-  int cursor_pos = cmd->screenOffset + prompt_size;
-  int ecmd_pos = cmd->endOffset + prompt_size;
-
-  int cursor_x = cursor_pos / w.ws_col;
-  int cursor_y = cursor_pos % w.ws_col;
-  // int cursor_y = cursor % w.ws_col;
-  int command_x = ecmd_pos / w.ws_col;
-  int command_y = ecmd_pos % w.ws_col;
-  // int command_y = (command.size() + prompt_size) % w.ws_col;
-  positionCursor(command_y, LEFT);
-  positionCursor(command_x, UP);
-  positionCursor(cursor_x, DOWN);
-  positionCursor(cursor_y, RIGHT);
-  fflush(stdout);
-}
-
-void cleanup_handler(void *arg) { resetTerminalMode(); }
-
-void exitShell() {
-  taos_cleanup();
-  exit(EXIT_SUCCESS);
-}
-
-void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&cancelSem); }
-
-void *cancelHandler(void *arg) {
-  setThreadName("cancelHandler");
-
-  while (1) {
-    if (tsem_wait(&cancelSem) != 0) {
-      taosMsleep(10);
-      continue;
-    }
-
-    resetTerminalMode();
-    printf("\nReceive ctrl+c or other signal, quit shell.\n");
-    exitShell();
+  if (shellParseArgs(argc, argv) != 0) {
+    return -1;
   }
 
-  return NULL;
-}
-
-int checkVersion() {
-  if (sizeof(int8_t) != 1) {
-    printf("taos int8 size is %d(!= 1)", (int)sizeof(int8_t));
-    return 0;
-  }
-  if (sizeof(int16_t) != 2) {
-    printf("taos int16 size is %d(!= 2)", (int)sizeof(int16_t));
-    return 0;
-  }
-  if (sizeof(int32_t) != 4) {
-    printf("taos int32 size is %d(!= 4)", (int)sizeof(int32_t));
-    return 0;
-  }
-  if (sizeof(int64_t) != 8) {
-    printf("taos int64 size is %d(!= 8)", (int)sizeof(int64_t));
+  if (shell.args.is_version) {
+    shellPrintVersion();
     return 0;
   }
-  return 1;
-}
-
-// Global configurations
-SShellArguments args = {
-    .host = NULL,
-    .user = NULL,
-    .database = NULL,
-    .timezone = NULL,
-    .is_raw_time = false,
-    .is_use_passwd = false,
-    .dump_config = false,
-    .file = "\0",
-    .dir = "\0",
-    .threadNum = 5,
-    .commands = NULL,
-    .pktLen = 1000,
-    .pktNum = 100,
-    .pktType = "TCP",
-    .netTestRole = NULL,
-#ifndef TD_WINDOWS
-    .password = NULL,
-#endif
-};
 
-void shellDumpConfig() {
-  if (!args.dump_config) return;
-
-  SConfig *pCfg = taosGetCfg();
-  if (NULL == pCfg) {
-    printf("TDengine read global config failed!\n");
-    exit(EXIT_FAILURE);
+  if (shell.args.is_gen_auth) {
+    shellGenerateAuth();
+    return 0;
   }
-  cfgDumpCfg(pCfg, 0, 1);
-  exitShell();
-}
 
-void shellTestNetWork() {
-  if (args.netTestRole && args.netTestRole[0] != 0) {
-    taosNetTest(args.netTestRole, args.host, args.port, args.pktLen, args.pktNum, args.pktType);
-    exitShell();
+  if (shell.args.is_help) {
+    shellPrintHelp();
+    return 0;
   }
-}
-
-void shellCheckServerStatus() {
-  if (!args.status && !args.verbose) return;
 
-  TSDB_SERVER_STATUS code;
-  do {
-    char details[1024] = {0};
-    code = taos_check_server_status(args.host, args.port, details, args.verbose ? 1024 : 0);
-    switch (code) {
-      case TSDB_SRV_STATUS_UNAVAILABLE:
-        printf("0: unavailable\n");
-        break;
-      case TSDB_SRV_STATUS_NETWORK_OK:
-        printf("1: network ok\n");
-        break;
-      case TSDB_SRV_STATUS_SERVICE_OK:
-        printf("2: service ok\n");
-        break;
-      case TSDB_SRV_STATUS_SERVICE_DEGRADED:
-        printf("3: service degraded\n");
-        break;
-      case TSDB_SRV_STATUS_EXTING:
-        printf("4: exiting\n");
-        break;
-    }
-    if (strlen(details) != 0) {
-      printf("%s\n\n", details);
-    }
-    if (code == TSDB_SRV_STATUS_NETWORK_OK && args.verbose) {
-      taosMsleep(1000);
-    } else {
-      break;
-    }
-  } while (1);
-
-  exitShell();
-}
+  taos_init();
 
-void shellExecute() {
-  TAOS *con = shellInit(&args);
-  if (con == NULL) {
-    exitShell();
+  if (shell.args.is_dump_config) {
+    shellDumpConfig();
+    taos_cleanup();
+    return 0;
   }
 
-  if (tsem_init(&cancelSem, 0, 0) != 0) {
-    printf("failed to create cancel semphore\n");
-    exitShell();
+  if (shell.args.is_startup || shell.args.is_check) {
+    shellCheckServerStatus();
+    taos_cleanup();
+    return 0;
   }
 
-  TdThread spid;
-  taosThreadCreate(&spid, NULL, cancelHandler, NULL);
-
-  taosSetSignal(SIGTERM, shellQueryInterruptHandler);
-  taosSetSignal(SIGINT, shellQueryInterruptHandler);
-  taosSetSignal(SIGHUP, shellQueryInterruptHandler);
-  taosSetSignal(SIGABRT, shellQueryInterruptHandler);
-
-  shellGetGrantInfo(con);
-
-  while (1) {
-    taosThreadCreate(&pid, NULL, shellLoopQuery, con);
-    taosThreadJoin(pid, NULL);
+  if (shell.args.netrole != NULL) {
+    shellTestNetWork();
+    taos_cleanup();
+    return 0;
   }
-}
-
-int main(int argc, char *argv[]) {
-  if (!checkVersion()) exitShell();
-
-  shellParseArgument(argc, argv, &args);
-
-  taos_init();
-  shellDumpConfig();
-  shellCheckServerStatus();
-  shellTestNetWork();
-  shellExecute();
 
-  return 0;
+  return shellExecute();
 }

tools/shell/src/shellNettest.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _GNU_SOURCE
+#include "shellInt.h"
+
+static void shellWorkAsClient() {
+  SShellArgs *pArgs = &shell.args;
+  SRpcInit    rpcInit = {0};
+  SEpSet      epSet = {.inUse = 0, .numOfEps = 1};
+  SRpcMsg     rpcRsp = {0};
+  void       *clientRpc = NULL;
+  char        pass[TSDB_PASSWORD_LEN + 1] = {0};
+
+  taosEncryptPass_c((uint8_t *)("_pwd"), strlen("_pwd"), pass);
+  rpcInit.label = "CHK";
+  rpcInit.numOfThreads = 1;
+  rpcInit.sessions = 16;
+  rpcInit.connType = TAOS_CONN_CLIENT;
+  rpcInit.idleTime = tsShellActivityTimer * 1000;
+  rpcInit.user = "_dnd";
+  rpcInit.ckey = "_key";
+  rpcInit.spi = 1;
+  rpcInit.secret = pass;
+
+  clientRpc = rpcOpen(&rpcInit);
+  if (clientRpc == NULL) {
+    printf("failed to init net test client since %s\n", terrstr());
+    goto _OVER;
+  }
+
+  if (pArgs->host == NULL) {
+    pArgs->host = tsFirst;
+  }
+  char fqdn[TSDB_FQDN_LEN] = {0};
+  tstrncpy(fqdn, pArgs->host, TSDB_FQDN_LEN);
+  strtok(fqdn, ":");
+
+  if (pArgs->port == 0) {
+    pArgs->port = tsServerPort;
+  }
+
+  printf("network test client is initialized, the server is %s:%u\n", fqdn, pArgs->port);
+
+  tstrncpy(epSet.eps[0].fqdn, fqdn, TSDB_FQDN_LEN);
+  epSet.eps[0].port = (uint16_t)pArgs->port;
+
+  int32_t  totalSucc = 0;
+  uint64_t startTime = taosGetTimestampUs();
+
+  for (int32_t i = 0; i < pArgs->pktNum; ++i) {
+    SRpcMsg rpcMsg = {.ahandle = (void *)0x9525, .msgType = TDMT_DND_NET_TEST};
+    rpcMsg.pCont = rpcMallocCont(pArgs->pktLen);
+    rpcMsg.contLen = pArgs->pktLen;
+
+    printf("request is sent, size:%d\n", rpcMsg.contLen);
+    rpcSendRecv(clientRpc, &epSet, &rpcMsg, &rpcRsp);
+    if (rpcRsp.code == 0 && rpcRsp.contLen == rpcMsg.contLen) {
+      printf("response is received, size:%d\n", rpcMsg.contLen);
+      if (rpcRsp.code == 0) totalSucc++;
+    } else {
+      printf("response not received since %s\n", tstrerror(rpcRsp.code));
+    }
+
+    rpcFreeCont(rpcRsp.pCont);
+    rpcRsp.pCont = NULL;
+  }
+
+  uint64_t endTime = taosGetTimestampUs();
+  uint64_t elT = endTime - startTime;
+
+  printf("\ntotal succ:%5d/%d\tcost:%8.2lf ms\tspeed:%8.2lf MB/s\n", totalSucc, pArgs->pktNum, elT / 1000.0,
+         pArgs->pktLen / (elT / 1000000.0) / 1024.0 / 1024.0 * totalSucc);
+
+_OVER:
+  if (clientRpc != NULL) {
+    rpcClose(clientRpc);
+  }
+  if (rpcRsp.pCont != NULL) {
+    rpcFreeCont(rpcRsp.pCont);
+  }
+}
+
+static void shellProcessMsg(void *p, SRpcMsg *pRpc, SEpSet *pEpSet) {
+  printf("request is received, size:%d\n", pRpc->contLen);
+  fflush(stdout);
+  SRpcMsg rsp = {.handle = pRpc->handle, .refId = pRpc->refId, .ahandle = pRpc->ahandle, .code = 0};
+  rsp.pCont = rpcMallocCont(pRpc->contLen);
+  if (rsp.pCont == NULL) {
+    rsp.code = TSDB_CODE_OUT_OF_MEMORY;
+  } else {
+    rsp.contLen = pRpc->contLen;
+  }
+  rpcSendResponse(&rsp);
+}
+
+void shellNettestHandler(int32_t signum, void *sigInfo, void *context) { shellExit(); }
+
+static void shellWorkAsServer() {
+  SShellArgs *pArgs = &shell.args;
+
+  if (pArgs->port == 0) {
+    pArgs->port = tsServerPort;
+  }
+
+  SRpcInit rpcInit = {0};
+  rpcInit.localPort = pArgs->port;
+  rpcInit.label = "CHK";
+  rpcInit.numOfThreads = tsNumOfRpcThreads;
+  rpcInit.cfp = (RpcCfp)shellProcessMsg;
+  rpcInit.sessions = 10;
+  rpcInit.connType = TAOS_CONN_SERVER;
+  rpcInit.idleTime = tsShellActivityTimer * 1000;
+
+  void *serverRpc = rpcOpen(&rpcInit);
+  if (serverRpc == NULL) {
+    printf("failed to init net test server since %s", terrstr());
+  } else {
+    printf("network test server is initialized, port:%u\n", pArgs->port);
+    taosSetSignal(SIGTERM, shellNettestHandler);
+    while (1) taosMsleep(10);
+  }
+}
+
+void shellTestNetWork() {
+  if (strcmp(shell.args.netrole, "client") == 0) {
+    shellWorkAsClient();
+  }
+
+  if (strcmp(shell.args.netrole, "server") == 0) {
+    shellWorkAsServer();
+  }
+}

tools/shell/src/shellUtil.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _BSD_SOURCE
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE
+#define _DEFAULT_SOURCE
+
+#include "shellInt.h"
+
+bool shellRegexMatch(const char *s, const char *reg, int32_t cflags) {
+  regex_t regex = {0};
+  char    msgbuf[100] = {0};
+
+  /* Compile regular expression */
+  if (regcomp(&regex, reg, cflags) != 0) {
+    fprintf(stderr, "Fail to compile regex");
+    shellExit();
+  }
+
+  /* Execute regular expression */
+  int32_t reti = regexec(&regex, s, 0, NULL, 0);
+  if (!reti) {
+    regfree(&regex);
+    return true;
+  } else if (reti == REG_NOMATCH) {
+    regfree(&regex);
+    return false;
+  } else {
+    regerror(reti, &regex, msgbuf, sizeof(msgbuf));
+    fprintf(stderr, "Regex match failed: %s\n", msgbuf);
+    regfree(&regex);
+    shellExit();
+  }
+
+  return false;
+}
+
+int32_t shellCheckIntSize() {
+  if (sizeof(int8_t) != 1) {
+    printf("taos int8 size is %d(!= 1)", (int)sizeof(int8_t));
+    return -1;
+  }
+  if (sizeof(int16_t) != 2) {
+    printf("taos int16 size is %d(!= 2)", (int)sizeof(int16_t));
+    return -1;
+  }
+  if (sizeof(int32_t) != 4) {
+    printf("taos int32 size is %d(!= 4)", (int)sizeof(int32_t));
+    return -1;
+  }
+  if (sizeof(int64_t) != 8) {
+    printf("taos int64 size is %d(!= 8)", (int)sizeof(int64_t));
+    return -1;
+  }
+  return 0;
+}
+
+void shellPrintVersion() { printf("version: %s\n", version); }
+
+void shellGenerateAuth() {
+  char secretEncrypt[TSDB_PASSWORD_LEN + 1] = {0};
+  taosEncryptPass_c((uint8_t *)shell.args.password, strlen(shell.args.password), secretEncrypt);
+  printf("%s\n", secretEncrypt);
+  fflush(stdout);
+}
+
+void shellDumpConfig() {
+  SConfig *pCfg = taosGetCfg();
+  if (pCfg == NULL) {
+    printf("TDengine read global config failed!\n");
+  } else {
+    cfgDumpCfg(pCfg, 1, true);
+  }
+  fflush(stdout);
+}
+
+void shellCheckServerStatus() {
+  TSDB_SERVER_STATUS code;
+
+  do {
+    char details[1024] = {0};
+    code = taos_check_server_status(shell.args.host, shell.args.port, details, 1024);
+    switch (code) {
+      case TSDB_SRV_STATUS_UNAVAILABLE:
+        printf("0: unavailable\n");
+        break;
+      case TSDB_SRV_STATUS_NETWORK_OK:
+        printf("1: network ok\n");
+        break;
+      case TSDB_SRV_STATUS_SERVICE_OK:
+        printf("2: service ok\n");
+        break;
+      case TSDB_SRV_STATUS_SERVICE_DEGRADED:
+        printf("3: service degraded\n");
+        break;
+      case TSDB_SRV_STATUS_EXTING:
+        printf("4: exiting\n");
+        break;
+    }
+    if (strlen(details) != 0) {
+      printf("%s\n\n", details);
+    }
+    fflush(stdout);
+    if (code == TSDB_SRV_STATUS_NETWORK_OK && shell.args.is_startup) {
+      taosMsleep(1000);
+    } else {
+      break;
+    }
+  } while (1);
+}
+
+void shellExit() {
+  if (shell.conn != NULL) {
+    taos_close(shell.conn);
+    shell.conn = NULL;
+  }
+  taos_cleanup();
+  exit(EXIT_FAILURE);
+}
\ No newline at end of file

tools/shell/src/tnettest.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#define ALLOW_FORBID_FUNC
-#include "os.h"
-#include "taosdef.h"
-#include "tmsg.h"
-#include "taoserror.h"
-#include "tlog.h"
-#include "tglobal.h"
-#include "trpc.h"
-#include "rpcHead.h"
-#include "tchecksum.h"
-#include "syncMsg.h"
-
-#include "osSocket.h"
-
-#define MAX_PKG_LEN (64 * 1000)
-#define MAX_SPEED_PKG_LEN (1024 * 1024 * 1024)
-#define MIN_SPEED_PKG_LEN 1024
-#define MAX_SPEED_PKG_NUM 10000
-#define MIN_SPEED_PKG_NUM 1
-#define BUFFER_SIZE (MAX_PKG_LEN + 1024)
-
-extern int tsRpcMaxUdpSize;
-
-typedef struct {
-  char *   hostFqdn;
-  uint32_t hostIp;
-  int32_t  port;
-  int32_t  pktLen;
-} STestInfo;
-
-static void *taosNetBindUdpPort(void *sarg) {
-  STestInfo *pinfo = (STestInfo *)sarg;
-  int32_t    port = pinfo->port;
-  SOCKET     serverSocket;
-  char       buffer[BUFFER_SIZE];
-  int32_t    iDataNum;
-  socklen_t  sin_size;
-  int32_t bufSize = 1024000;
-
-  struct sockaddr_in server_addr;
-  struct sockaddr_in clientAddr;
-
-  setThreadName("netBindUdpPort");
-
-  if ((serverSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-    uError("failed to create UDP socket since %s", strerror(errno));
-    return NULL;
-  }
-
-  bzero(&server_addr, sizeof(server_addr));
-  server_addr.sin_family = AF_INET;
-  server_addr.sin_port = htons(port);
-  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
-    uError("failed to bind UDP port:%d since %s", port, strerror(errno));
-    return NULL;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(serverSocket);
-    return NULL;
-  }
-  pSocket->fd = serverSocket;
-  pSocket->refId = 0;
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_SNDBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    uError("failed to set the send buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_RCVBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    uError("failed to set the receive buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  uInfo("UDP server at port:%d is listening", port);
-
-  while (1) {
-    memset(buffer, 0, BUFFER_SIZE);
-    sin_size = sizeof(*(struct sockaddr *)&server_addr);
-    iDataNum = recvfrom(serverSocket, buffer, BUFFER_SIZE, 0, (struct sockaddr *)&clientAddr, &sin_size);
-
-    if (iDataNum < 0) {
-      uDebug("failed to perform recvfrom func at %d since %s", port, strerror(errno));
-      continue;
-    }
-
-    uInfo("UDP: recv:%d bytes from %s at %d", iDataNum, taosInetNtoa(clientAddr.sin_addr), port);
-
-    if (iDataNum > 0) {
-      iDataNum = taosSendto(pSocket, buffer, iDataNum, 0, (struct sockaddr *)&clientAddr, (int32_t)sin_size);
-    }
-
-    uInfo("UDP: send:%d bytes to %s at %d", iDataNum, taosInetNtoa(clientAddr.sin_addr), port);
-  }
-
-  taosCloseSocket(&pSocket);
-  return NULL;
-}
-
-static void *taosNetBindTcpPort(void *sarg) {
-  struct sockaddr_in server_addr;
-  struct sockaddr_in clientAddr;
-
-  STestInfo *pinfo = sarg;
-  int32_t    port = pinfo->port;
-  SOCKET     serverSocket;
-  int32_t    addr_len = sizeof(clientAddr);
-  SOCKET     client;
-  char       buffer[BUFFER_SIZE];
-
-  setThreadName("netBindTcpPort");
-
-  if ((serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-    uError("failed to create TCP socket since %s", strerror(errno));
-    return NULL;
-  }
-
-  bzero(&server_addr, sizeof(server_addr));
-  server_addr.sin_family = AF_INET;
-  server_addr.sin_port = htons(port);
-  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-  int32_t reuse = 1;
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(serverSocket);
-    return NULL;
-  }
-  pSocket->fd = serverSocket;
-  pSocket->refId = 0;
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    uError("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
-    uError("failed to bind TCP port:%d since %s", port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (taosKeepTcpAlive(pSocket) < 0) {
-    uError("failed to set tcp server keep-alive option since %s", strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  if (listen(serverSocket, 10) < 0) {
-    uError("failed to listen TCP port:%d since %s", port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return NULL;
-  }
-
-  uInfo("TCP server at port:%d is listening", port);
-
-  while (1) {
-    client = accept(serverSocket, (struct sockaddr *)&clientAddr, (socklen_t *)&addr_len);
-    if (client < 0) {
-      uDebug("TCP: failed to accept at port:%d since %s", port, strerror(errno));
-      continue;
-    }
-
-    int32_t ret = taosReadMsg(pSocket, buffer, pinfo->pktLen);
-    if (ret < 0 || ret != pinfo->pktLen) {
-      uError("TCP: failed to read %d bytes at port:%d since %s", pinfo->pktLen, port, strerror(errno));
-      taosCloseSocket(&pSocket);
-      return NULL;
-    }
-
-    uInfo("TCP: read:%d bytes from %s at %d", pinfo->pktLen, taosInetNtoa(clientAddr.sin_addr), port);
-
-    ret = taosWriteMsg(pSocket, buffer, pinfo->pktLen);
-    if (ret < 0) {
-      uError("TCP: failed to write %d bytes at %d since %s", pinfo->pktLen, port, strerror(errno));
-      taosCloseSocket(&pSocket);
-      return NULL;
-    }
-
-    uInfo("TCP: write:%d bytes to %s at %d", pinfo->pktLen, taosInetNtoa(clientAddr.sin_addr), port);
-  }
-
-  taosCloseSocket(&pSocket);
-  return NULL;
-}
-
-static int32_t taosNetCheckTcpPort(STestInfo *info) {
-  SOCKET  clientSocket;
-  char    buffer[BUFFER_SIZE] = {0};
-
-  if ((clientSocket = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-    uError("failed to create TCP client socket since %s", strerror(errno));
-    return -1;
-  }
-
-  int32_t reuse = 1;
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(clientSocket);
-    return -1;
-  }
-  pSocket->fd = clientSocket;
-  pSocket->refId = 0;
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    uError("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  struct sockaddr_in serverAddr;
-  memset((char *)&serverAddr, 0, sizeof(serverAddr));
-  serverAddr.sin_family = AF_INET;
-  serverAddr.sin_port = (uint16_t)htons((uint16_t)info->port);
-  serverAddr.sin_addr.s_addr = info->hostIp;
-
-  if (connect(clientSocket, (struct sockaddr *)&serverAddr, sizeof(serverAddr)) < 0) {
-    uError("TCP: failed to connect port %s:%d since %s", taosIpStr(info->hostIp), info->port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  taosKeepTcpAlive(pSocket);
-
-  sprintf(buffer, "client send TCP pkg to %s:%d, content: 1122334455", taosIpStr(info->hostIp), info->port);
-  sprintf(buffer + info->pktLen - 16, "1122334455667788");
-
-  int32_t ret = taosWriteMsg(pSocket, buffer, info->pktLen);
-  if (ret < 0) {
-    uError("TCP: failed to write msg to %s:%d since %s", taosIpStr(info->hostIp), info->port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  ret = taosReadMsg(pSocket, buffer, info->pktLen);
-  if (ret < 0) {
-    uError("TCP: failed to read msg from %s:%d since %s", taosIpStr(info->hostIp), info->port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  taosCloseSocket(&pSocket);
-  return 0;
-}
-
-static int32_t taosNetCheckUdpPort(STestInfo *info) {
-  SOCKET  clientSocket;
-  char    buffer[BUFFER_SIZE] = {0};
-  int32_t iDataNum = 0;
-  int32_t bufSize = 1024000;
-
-  struct sockaddr_in serverAddr;
-
-  if ((clientSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-    uError("failed to create udp client socket since %s", strerror(errno));
-    return -1;
-  }
-
-  TdSocketPtr pSocket = (TdSocketPtr)taosMemoryMalloc(sizeof(TdSocket));
-  if (pSocket == NULL) {
-    taosCloseSocketNoCheck1(clientSocket);
-    return -1;
-  }
-  pSocket->fd = clientSocket;
-  pSocket->refId = 0;
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_SNDBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    uError("failed to set the send buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  if (taosSetSockOpt(pSocket, SOL_SOCKET, SO_RCVBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    uError("failed to set the receive buffer size for UDP socket\n");
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  serverAddr.sin_family = AF_INET;
-  serverAddr.sin_port = htons(info->port);
-  serverAddr.sin_addr.s_addr = info->hostIp;
-
-  struct in_addr ipStr;
-  memcpy(&ipStr, &info->hostIp, 4);
-  sprintf(buffer, "client send udp pkg to %s:%d, content: 1122334455", taosInetNtoa(ipStr), info->port);
-  sprintf(buffer + info->pktLen - 16, "1122334455667788");
-
-  socklen_t sin_size = sizeof(*(struct sockaddr *)&serverAddr);
-
-  iDataNum = taosSendto(pSocket, buffer, info->pktLen, 0, (struct sockaddr *)&serverAddr, (int32_t)sin_size);
-  if (iDataNum < 0 || iDataNum != info->pktLen) {
-    uError("UDP: failed to perform sendto func since %s", strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  memset(buffer, 0, BUFFER_SIZE);
-  sin_size = sizeof(*(struct sockaddr *)&serverAddr);
-  iDataNum = recvfrom(clientSocket, buffer, BUFFER_SIZE, 0, (struct sockaddr *)&serverAddr, &sin_size);
-
-  if (iDataNum < 0 || iDataNum != info->pktLen) {
-    uError("UDP: received ack:%d bytes(expect:%d) from port:%d since %s", iDataNum, info->pktLen, info->port, strerror(errno));
-    taosCloseSocket(&pSocket);
-    return -1;
-  }
-
-  taosCloseSocket(&pSocket);
-  return 0;
-}
-
-static void taosNetCheckPort(uint32_t hostIp, int32_t startPort, int32_t endPort, int32_t pktLen) {
-  int32_t   ret;
-  STestInfo info;
-
-  memset(&info, 0, sizeof(STestInfo));
-  info.hostIp = hostIp;
-  info.pktLen = pktLen;
-
-  for (int32_t port = startPort; port <= endPort; port++) {
-    info.port = port;
-    ret = taosNetCheckTcpPort(&info);
-    if (ret != 0) {
-      printf("failed to test TCP port:%d\n", port);
-    } else {
-      printf("successed to test TCP port:%d\n", port);
-    }
-
-    ret = taosNetCheckUdpPort(&info);
-    if (ret != 0) {
-      printf("failed to test UDP port:%d\n", port);
-    } else {
-      printf("successed to test UDP port:%d\n", port);
-    }
-  }
-}
-
-static void taosNetTestClient(char *host, int32_t startPort, int32_t pkgLen) {
-  uInfo("work as client, host:%s Port:%d pkgLen:%d\n", host, startPort, pkgLen);
-
-  uint32_t serverIp = taosGetIpv4FromFqdn(host);
-  if (serverIp == 0xFFFFFFFF) {
-    uError("failed to resolve fqdn:%s", host);
-    exit(-1);
-  }
-
-  uInfo("server ip:%s is resolved from host:%s", taosIpStr(serverIp), host);
-  taosNetCheckPort(serverIp, startPort, startPort, pkgLen);
-}
-
-static void taosNetTestServer(char *host, int32_t startPort, int32_t pkgLen) {
-  uInfo("work as server, host:%s Port:%d pkgLen:%d\n", host, startPort, pkgLen);
-
-  int32_t port = startPort;
-  int32_t num = 1;
-  if (num < 0) num = 1;
-
-  TdThread *pids = taosMemoryMalloc(2 * num * sizeof(TdThread));
-  STestInfo *tinfos = taosMemoryMalloc(num * sizeof(STestInfo));
-  STestInfo *uinfos = taosMemoryMalloc(num * sizeof(STestInfo));
-
-  for (int32_t i = 0; i < num; i++) {
-    STestInfo *tcpInfo = tinfos + i;
-    tcpInfo->port = port + i;
-    tcpInfo->pktLen = pkgLen;
-
-    if (taosThreadCreate(pids + i, NULL, taosNetBindTcpPort, tcpInfo) != 0) {
-      uInfo("failed to create TCP test thread, %s:%d", tcpInfo->hostFqdn, tcpInfo->port);
-      exit(-1);
-    }
-
-    STestInfo *udpInfo = uinfos + i;
-    udpInfo->port = port + i;
-    tcpInfo->pktLen = pkgLen;
-    if (taosThreadCreate(pids + num + i, NULL, taosNetBindUdpPort, udpInfo) != 0) {
-      uInfo("failed to create UDP test thread, %s:%d", tcpInfo->hostFqdn, tcpInfo->port);
-      exit(-1);
-    }
-  }
-
-  for (int32_t i = 0; i < num; i++) {
-    taosThreadJoin(pids[i], NULL);
-    taosThreadJoin(pids[(num + i)], NULL);
-  }
-}
-
-static void taosNetCheckSpeed(char *host, int32_t port, int32_t pkgLen,
-                              int32_t pkgNum, char *pkgType) {
-#if 0
-                              
-  // record config
-  int32_t compressTmp = tsCompressMsgSize;
-  int32_t maxUdpSize  = tsRpcMaxUdpSize;
-  int32_t forceTcp  = tsRpcForceTcp;
-
-  if (0 == strcmp("tcp", pkgType)){
-    tsRpcForceTcp = 1;
-    tsRpcMaxUdpSize = 0;            // force tcp
-  } else {
-    tsRpcForceTcp = 0;
-    tsRpcMaxUdpSize = INT_MAX;
-  }
-  tsCompressMsgSize = -1;
-
-  SEpSet epSet;
-  SRpcMsg   reqMsg;
-  SRpcMsg   rspMsg;
-  void *    pRpcConn;
-  char secretEncrypt[32] = {0};
-  char    spi = 0;
-  pRpcConn = taosNetInitRpc(secretEncrypt, spi);
-  if (NULL == pRpcConn) {
-    uError("failed to init client rpc");
-    return;
-  }
-
-  printf("check net spend, host:%s port:%d pkgLen:%d pkgNum:%d pkgType:%s\n\n", host, port, pkgLen, pkgNum, pkgType);
-  int32_t totalSucc = 0;
-  uint64_t startT = taosGetTimestampUs();
-  for (int32_t i = 1; i <= pkgNum; i++) {
-    uint64_t startTime = taosGetTimestampUs();
-
-    memset(&epSet, 0, sizeof(SEpSet));
-    strcpy(epSet.eps[0].fqdn, host);
-    epSet.eps[0].port = port;
-    epSet.numOfEps = 1;
-
-    reqMsg.msgType = TDMT_DND_NETWORK_TEST;
-    reqMsg.pCont = rpcMallocCont(pkgLen);
-    reqMsg.contLen = pkgLen;
-    reqMsg.code = 0;
-    reqMsg.handle = NULL;   // rpc handle returned to app
-    reqMsg.ahandle = NULL;  // app handle set by client
-    strcpy(reqMsg.pCont, "nettest speed");
-
-    rpcSendRecv(pRpcConn, &epSet, &reqMsg, &rspMsg);
-
-    int code = 0;
-    if ((rspMsg.code != 0) || (rspMsg.msgType != TDMT_DND_NETWORK_TEST + 1)) {
-      uError("ret code 0x%x %s", rspMsg.code, tstrerror(rspMsg.code));
-      code = -1;
-    }else{
-      totalSucc ++;
-    }
-
-    rpcFreeCont(rspMsg.pCont);
-
-    uint64_t endTime = taosGetTimestampUs();
-    uint64_t el = endTime - startTime;
-    printf("progress:%5d/%d\tstatus:%d\tcost:%8.2lf ms\tspeed:%8.2lf MB/s\n", i, pkgNum, code, el/1000.0, pkgLen/(el/1000000.0)/1024.0/1024.0);
-  }
-  int64_t endT = taosGetTimestampUs();
-  uint64_t elT = endT - startT;
-  printf("\ntotal succ:%5d/%d\tcost:%8.2lf ms\tspeed:%8.2lf MB/s\n", totalSucc, pkgNum, elT/1000.0, pkgLen/(elT/1000000.0)/1024.0/1024.0*totalSucc);
-
-  rpcClose(pRpcConn);
-
-  // return config
-  tsCompressMsgSize = compressTmp;
-  tsRpcMaxUdpSize = maxUdpSize;
-  tsRpcForceTcp = forceTcp;
-  return;
-#endif
-}
-
-void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen, int32_t pkgNum, char *pkgType) {
-  tsLogEmbedded = 1;
-  if (host == NULL) host = tsLocalFqdn;
-  if (port == 0) port = tsServerPort;
-  if (0 == strcmp("speed", role)) {
-    if (pkgLen <= MIN_SPEED_PKG_LEN) pkgLen = MIN_SPEED_PKG_LEN;
-    if (pkgLen > MAX_SPEED_PKG_LEN) pkgLen = MAX_SPEED_PKG_LEN;
-    if (pkgNum <= MIN_SPEED_PKG_NUM) pkgNum = MIN_SPEED_PKG_NUM;
-    if (pkgNum > MAX_SPEED_PKG_NUM) pkgNum = MAX_SPEED_PKG_NUM;
-  } else {
-    if (pkgLen <= 10) pkgLen = 1000;
-    if (pkgLen > MAX_PKG_LEN) pkgLen = MAX_PKG_LEN;
-  }
-
-  if (0 == strcmp("client", role)) {
-    taosNetTestClient(host, port, pkgLen);
-  } else if (0 == strcmp("server", role)) {
-    taosNetTestServer(host, port, pkgLen);
-  } else if (0 == strcmp("speed", role)) {
-    tsLogEmbedded = 0;
-    char type[10] = {0};
-    taosNetCheckSpeed(host, port, pkgLen, pkgNum, strtolower(type, pkgType));
-  } else {
-    TASSERT(1);
-  }
-
-  tsLogEmbedded = 0;
-}