refactor: rename shell.h

tools/shell/inc/shellCommand.h

@@ -16,7 +16,7 @@
 #ifndef _TD_SHELL_COMMAND_H_
 #define _TD_SHELL_COMMAND_H_
 
-#include "shell.h"
+#include "shellInt.h"
 
 #define LEFT  1
 #define RIGHT 2

tools/shell/inc/shell.h → tools/shell/inc/shellInt.h

@@ -21,14 +21,10 @@
 #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
+#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];

tools/shell/src/backup/shellCheck.c

@@ -18,7 +18,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tglobal.h"
 #include "tutil.h"

tools/shell/src/backup/shellDarwin.c

@@ -17,7 +17,7 @@
 
 #include "os.h"
 
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tbase64.h"
 

tools/shell/src/backup/shellImport.c

@@ -18,7 +18,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "tglobal.h"
 #include "tutil.h"

tools/shell/src/backup/shellWindows.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include "../../../../include/client/taos.h"
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 
 extern char configDir[];

tools/shell/src/shellCommand.c

@@ -17,7 +17,7 @@
 
 #include "shellCommand.h"
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 
 #include <regex.h>
 

tools/shell/src/shellEngine.c

@@ -19,7 +19,7 @@
 #define _DEFAULT_SOURCE
 
 #include "os.h"
-#include "shell.h"
+#include "shellInt.h"
 #include "shellCommand.h"
 #include "taosdef.h"
 #include "taoserror.h"

tools/shell/src/shellMain.c

@@ -16,7 +16,6 @@
 #define __USE_XOPEN
 #include "shellCommand.h"
 #include "tglobal.h"
-#include "tlog.h"
 
 #include <argp.h>
 #include <termio.h>
@@ -407,7 +406,7 @@ void *shellLoopQuery(void *arg) {
 
   char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
   if (command == NULL) {
-    uError("failed to malloc command");
+    printf("failed to malloc command\n");
     return NULL;
   }