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

feat: switch connMode to Native

This commit is contained in:
Alex Duan 2025-03-21 10:50:20 +08:00
parent 66da9e6e79
commit 1a41b0a031
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/inc/pub.h
View File

@ -50,6 +50,7 @@
#define CONN_MODE_INVALID -1 #define CONN_MODE_INVALID -1
#define CONN_MODE_NATIVE 0 #define CONN_MODE_NATIVE 0
#define CONN_MODE_WEBSOCKET 1 #define CONN_MODE_WEBSOCKET 1
#define CONN_MODE_DEFAULT CONN_MODE_NATIVE // set default mode
// define error show module // define error show module
#define INIT_PHASE "init" #define INIT_PHASE "init"

5
tools/shell/src/shellMain.c
View File

@ -56,6 +56,11 @@ void initArgument(SShellArgs *pArgs) {
// set conn mode // set conn mode
int32_t setConnMode(int8_t connMode) { int32_t setConnMode(int8_t connMode) {
// default
if (connMode == CONN_MODE_INVALID) {
connMode = CONN_MODE_DEFAULT;
}
// set conn mode // set conn mode
char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET; char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET;
int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode); int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode);

9
tools/taos-tools/src/benchMain.c
View File

@ -98,7 +98,12 @@ int32_t applyConfigDir(char * cfgDir){
return code; return code;
} }
int32_t setConnMode(int8_t connMode, char *dsn) { int32_t setConnMode(int8_t connMode) {
// default
if (connMode == CONN_MODE_INVALID) {
connMode = CONN_MODE_DEFAULT;
}
// set conn mode // set conn mode
char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET; char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET;
int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode); int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode);
@ -181,7 +186,7 @@ int main(int argc, char* argv[]) {
} }
// conn mode // conn mode
if (setConnMode(g_arguments->connMode, g_arguments->dsn) != 0) { if (setConnMode(g_arguments->connMode) != 0) {
exitLog(); exitLog();
return -1; return -1;
} }

5
tools/taos-tools/src/taosdump.c
View File

@ -10857,6 +10857,11 @@ static int inspectAvroFiles(int argc, char *argv[]) {
} }
int32_t setConnMode(int8_t connMode) { int32_t setConnMode(int8_t connMode) {
// default
if (connMode == CONN_MODE_INVALID) {
connMode = CONN_MODE_DEFAULT;
}
// set conn mode // set conn mode
char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET; char * strMode = connMode == CONN_MODE_NATIVE ? STR_NATIVE : STR_WEBSOCKET;
int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode); int32_t code = taos_options(TSDB_OPTION_DRIVER, strMode);