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

Merge pull request #24372 from taosdata/feat/TD-28140-3.0 

feat: websocket support bi with appending &conn_mode=1 string to dsn
This commit is contained in:
Alex Duan 2024-01-08 12:40:09 +08:00 committed by GitHub
parent 95e488c7ce 6b38e5b8fb
commit 2f709fa8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1318,9 +1318,7 @@ int32_t shellExecute() {
if(shell.args.is_bi_mode) { if(shell.args.is_bi_mode) {
// need set bi mode // need set bi mode
printf("Set BI mode is true.\n"); printf("Set BI mode is true.\n");
#ifdef WEBSOCKET #ifndef WEBSOCKET
//ws_taos_set_conn_mode(shell.ws_conn, TAOS_CONN_MODE_BI, 1);
#else
taos_set_conn_mode(shell.conn, TAOS_CONN_MODE_BI, 1); taos_set_conn_mode(shell.conn, TAOS_CONN_MODE_BI, 1);
#endif #endif
} }

11
tools/shell/src/shellWebsocket.c
View File

@ -30,7 +30,16 @@ int shell_conn_ws_server(bool first) {
fprintf(stdout, "trying to connect %s****** ", cuttedDsn); fprintf(stdout, "trying to connect %s****** ", cuttedDsn);
fflush(stdout); fflush(stdout);
for (int i = 0; i < shell.args.timeout; i++) { for (int i = 0; i < shell.args.timeout; i++) {
shell.ws_conn = ws_connect_with_dsn(shell.args.dsn); if(shell.args.is_bi_mode) {
size_t len = strlen(shell.args.dsn);
char * dsn = taosMemoryMalloc(len + 32);
sprintf(dsn, "%s&conn_mode=1", shell.args.dsn);
shell.ws_conn = ws_connect_with_dsn(dsn);
taosMemoryFree(dsn);
} else {
shell.ws_conn = ws_connect_with_dsn(shell.args.dsn);
}
if (NULL == shell.ws_conn) { if (NULL == shell.ws_conn) {
int errNo = ws_errno(NULL); int errNo = ws_errno(NULL);
if (0xE001 == errNo) { if (0xE001 == errNo) {