From b0792743fcfe7bdea198a88d05ef1a564d2349a4 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Tue, 12 Apr 2022 15:58:41 +0800
Subject: [PATCH] feat(tools): taos shell refactor (#11416)

* [TD-13558]<feature>: taos shell refactor

add taosTools as submodule

* add tools/taos-tools

* add more client interface for taosTools compile

* update taos-tools

* update taos-tools

* refactor shell

* [TD-13558]<feature>: taos shell test speed

* [TD-13558]<feature>: taos -n startup works

* taos -n rpc works

* taos -n server works

* cleanup code since no endPort in 3.0

* update taos-tools

* [TD-13558]<feature>: taos -C works

* improve taos shell -c WIP

* update taos-tools
---
 include/common/tglobal.h      | 2 ++
 source/common/src/tglobal.c   | 2 +-
 tools/shell/src/shellEngine.c | 6 ++++++
 tools/taos-tools              | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index f03943e105..5022cb7be8 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -18,6 +18,7 @@
 
 #include "tarray.h"
 #include "tdef.h"
+#include "tconfig.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -129,6 +130,7 @@ void    taosCfgDynamicOptions(const char *option, const char *value);
 void    taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary);
 
 struct SConfig *taosGetCfg();
+int32_t taosAddClientLogCfg(SConfig *pCfg);
 
 #ifdef __cplusplus
 }
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 0bc1fa09f5..df4433e6e4 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -256,7 +256,7 @@ static int32_t taosLoadCfg(SConfig *pCfg, const char *inputCfgDir, const char *e
   return 0;
 }
 
-static int32_t taosAddClientLogCfg(SConfig *pCfg) {
+int32_t taosAddClientLogCfg(SConfig *pCfg) {
   if (cfgAddDir(pCfg, "configDir", configDir, 1) != 0) return -1;
   if (cfgAddDir(pCfg, "scriptDir", configDir, 1) != 0) return -1;
   if (cfgAddDir(pCfg, "logDir", tsLogDir, 1) != 0) return -1;
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 0e611f3794..b89d517ad3 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -26,6 +26,7 @@
 #include "tglobal.h"
 #include "ttypes.h"
 #include "tutil.h"
+#include "tconfig.h"
 
 #include <regex.h>
 #include <wordexp.h>
@@ -90,6 +91,11 @@ TAOS *shellInit(SShellArguments *_args) {
     _args->user = TSDB_DEFAULT_USER;
   }
 
+  SConfig *pCfg = cfgInit();
+  if (NULL == pCfg) return NULL;
+
+  if (0 != taosAddClientLogCfg(pCfg)) return NULL;
+
   // Connect to the database.
   TAOS *con = NULL;
   if (_args->auth == NULL) {
diff --git a/tools/taos-tools b/tools/taos-tools
index 33cdfe4f90..bf6c766986 160000
--- a/tools/taos-tools
+++ b/tools/taos-tools
@@ -1 +1 @@
-Subproject commit 33cdfe4f90a209f105c1b6091439798a9cde1e93
+Subproject commit bf6c766986c61ff4fc80421fdea682a8fd4b5b32