xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

other: merge 3.0

This commit is contained in:
Haojun Liao 2022-07-22 21:21:55 +08:00
parent 5a4fd268f2
commit 479639d1fc
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/CMakeLists.txt
View File

@ -43,7 +43,7 @@ IF (TD_WEBSOCKET)
ENDIF() ENDIF()
ENDIF () ENDIF ()
IF (TD_TAOS_TOOLS) #IF (TD_TAOS_TOOLS)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/tools/taos_tools/deps/avro/lang/c/src) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/tools/taos_tools/deps/avro/lang/c/src)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/client) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/client)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common)
@ -51,7 +51,7 @@ IF (TD_TAOS_TOOLS)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/os) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/os)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/libs/transport) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/libs/transport)
ADD_SUBDIRECTORY(taos-tools) ADD_SUBDIRECTORY(taos-tools)
ENDIF () #ENDIF ()
add_subdirectory(shell) add_subdirectory(shell)
IF (TD_BUILD_HTTP) IF (TD_BUILD_HTTP)

3
tools/shell/src/shellArguments.c
View File

@ -19,6 +19,9 @@
#include "shellInt.h" #include "shellInt.h"
#define TAOS_CONSOLE_PROMPT_HEADER "taos> "
#define TAOS_CONSOLE_PROMPT_CONTINUE " -> "
#define SHELL_HOST "The auth string to use when connecting to the server." #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_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_USER "The user name to use when connecting to the server."

24
tools/shell/src/shellEngine.c
View File

@ -41,7 +41,7 @@ static void shellPrintError(TAOS_RES *tres, int64_t st);
static bool shellIsCommentLine(char *line); static bool shellIsCommentLine(char *line);
static void shellSourceFile(const char *file); static void shellSourceFile(const char *file);
static void shellGetGrantInfo(); static void shellGetGrantInfo();
static void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context);
static void shellCleanup(void *arg); static void shellCleanup(void *arg);
static void *shellCancelHandler(void *arg); static void *shellCancelHandler(void *arg);
static void *shellThreadLoop(void *arg); static void *shellThreadLoop(void *arg);
@ -919,11 +919,14 @@ void shellGetGrantInfo() {
fprintf(stdout, "\r\n"); fprintf(stdout, "\r\n");
} }
void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&shell.cancelSem); } #ifdef WINDOWS
BOOL shellQueryInterruptHandler(DWORD fdwCtrlType) {
void shellSigintHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&shell.cancelSem);
// do nothing return TRUE;
} }
#else
void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&shell.cancelSem); }
#endif
void shellCleanup(void *arg) { taosResetTerminalMode(); } void shellCleanup(void *arg) { taosResetTerminalMode(); }
@ -934,11 +937,10 @@ void *shellCancelHandler(void *arg) {
taosMsleep(10); taosMsleep(10);
continue; continue;
} }
taos_kill_query(shell.conn);
taosResetTerminalMode(); #ifdef WINDOWS
printf("\r\nReceive SIGTERM or other signal, quit shell.\r\n"); printf("\n%s", shell.info.promptHeader);
shellWriteHistory(); #endif
shellExit();
} }
return NULL; return NULL;
@ -1022,7 +1024,7 @@ int32_t shellExecute() {
taosSetSignal(SIGHUP, shellQueryInterruptHandler); taosSetSignal(SIGHUP, shellQueryInterruptHandler);
taosSetSignal(SIGABRT, shellQueryInterruptHandler); taosSetSignal(SIGABRT, shellQueryInterruptHandler);
taosSetSignal(SIGINT, shellSigintHandler); taosSetSignal(SIGINT, shellQueryInterruptHandler);
shellGetGrantInfo(); shellGetGrantInfo();