From 30b79431d591f5498c86332b7d5ba40cedad30ff Mon Sep 17 00:00:00 2001
From: stephenkgu <stephenk@gmx.us>
Date: Thu, 10 Dec 2020 15:04:08 +0800
Subject: [PATCH] [TD-2405]<feature>: new option -C (--dump-config) for taos to
 dump current configuration

---
 src/kit/shell/inc/shell.h        |  1 +
 src/kit/shell/src/shellLinux.c   |  4 ++++
 src/kit/shell/src/shellMain.c    | 15 +++++++++++++++
 src/kit/shell/src/shellWindows.c |  4 ++++
 4 files changed, 24 insertions(+)

diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h
index 2c6e4a308c..7e5ebb0596 100644
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
@@ -45,6 +45,7 @@ typedef struct SShellArguments {
   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;
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 6f4ee3fc50..15b2b077c9 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -39,6 +39,7 @@ static struct argp_option options[] = {
   {"user",       'u', "USER",       0,                   "The user name to use when connecting to the server."},
   {"user",       'A', "Auth",       0,                   "The user auth to use when connecting to the server."},
   {"config-dir", 'c', "CONFIG_DIR", 0,                   "Configuration directory."},
+  {"dump-config", 'C', 0,           0,                   "Dump configuration."},
   {"commands",   's', "COMMANDS",   0,                   "Commands to run without enter the shell."},
   {"raw-time",   'r', 0,            0,                   "Output time as uint64_t."},
   {"file",       'f', "FILE",       0,                   "Script to run without enter the shell."},
@@ -96,6 +97,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
       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;
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index a2ce78d36f..4f0c5e3f99 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -15,6 +15,7 @@
 
 #include "os.h"
 #include "shell.h"
+#include "tconfig.h"
 #include "tnettest.h"
 
 pthread_t pid;
@@ -58,6 +59,7 @@ SShellArguments args = {
   .timezone = NULL,
   .is_raw_time = false,
   .is_use_passwd = false,
+  .dump_config = false,
   .file = "\0",
   .dir = "\0",
   .threadNum = 5,
@@ -78,6 +80,19 @@ int main(int argc, char* argv[]) {
 
   shellParseArgument(argc, argv, &args);
 
+  if (args.dump_config) {
+    taosInitGlobalCfg();
+    taosReadGlobalLogCfg();
+
+    if (!taosReadGlobalCfg()) {
+      printf("TDengine read global config failed");
+      exit(EXIT_FAILURE);
+    }
+
+    taosDumpGlobalCfg();
+    exit(0);
+  }
+
   if (args.netTestRole && args.netTestRole[0] != 0) {
     taos_init();
     taosNetTest(args.netTestRole, args.host, args.port, args.pktLen);
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index a92831de25..64eed9eace 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -35,6 +35,8 @@ void printHelp() {
   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");
@@ -104,6 +106,8 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         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];