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

Merge pull request #27995 from taosdata/feat/TD-31019-3.0 

feat: taos-shell support new websocket api
This commit is contained in:
Alex Duan 2024-09-24 18:08:29 +08:00 committed by GitHub
parent c824a70b83 67e8c5228a
commit e87ee24c11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/CMakeLists.txt
View File

@ -18,7 +18,7 @@ IF (TD_WEBSOCKET)
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls COMMAND export CFLAGS=-fno-builtin && RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND INSTALL_COMMAND
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
@ -37,7 +37,7 @@ IF (TD_WEBSOCKET)
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND cargo build --release -p taos-ws-sys --features rustls COMMAND export CFLAGS=-fno-builtin && cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND INSTALL_COMMAND
COMMAND cp target/release/taosws.dll ${CMAKE_BINARY_DIR}/build/lib COMMAND cp target/release/taosws.dll ${CMAKE_BINARY_DIR}/build/lib
COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib
@ -57,7 +57,7 @@ IF (TD_WEBSOCKET)
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND cargo build --release -p taos-ws-sys --features rustls COMMAND export CFLAGS=-fno-builtin && cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND INSTALL_COMMAND
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include

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

@ -34,10 +34,10 @@ int shell_conn_ws_server(bool first) {
size_t len = strlen(shell.args.dsn); size_t len = strlen(shell.args.dsn);
char * dsn = taosMemoryMalloc(len + 32); char * dsn = taosMemoryMalloc(len + 32);
sprintf(dsn, "%s&conn_mode=1", shell.args.dsn); sprintf(dsn, "%s&conn_mode=1", shell.args.dsn);
shell.ws_conn = ws_connect_with_dsn(dsn); shell.ws_conn = ws_connect(dsn);
taosMemoryFree(dsn); taosMemoryFree(dsn);
} else { } else {
shell.ws_conn = ws_connect_with_dsn(shell.args.dsn); shell.ws_conn = ws_connect(shell.args.dsn);
} }
if (NULL == shell.ws_conn) { if (NULL == shell.ws_conn) {
@ -95,7 +95,7 @@ int shell_conn_ws_server(bool first) {
static int horizontalPrintWebsocket(WS_RES* wres, double* execute_time) { static int horizontalPrintWebsocket(WS_RES* wres, double* execute_time) {
const void* data = NULL; const void* data = NULL;
int rows; int rows;
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
if (wres) { if (wres) {
*execute_time += (double)(ws_take_timing(wres)/1E6); *execute_time += (double)(ws_take_timing(wres)/1E6);
} }
@ -129,7 +129,7 @@ static int horizontalPrintWebsocket(WS_RES* wres, double* execute_time) {
putchar('\n'); putchar('\n');
} }
numOfRows += rows; numOfRows += rows;
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
} while (rows && !shell.stop_query); } while (rows && !shell.stop_query);
return numOfRows; return numOfRows;
} }
@ -137,7 +137,7 @@ static int horizontalPrintWebsocket(WS_RES* wres, double* execute_time) {
static int verticalPrintWebsocket(WS_RES* wres, double* pexecute_time) { static int verticalPrintWebsocket(WS_RES* wres, double* pexecute_time) {
int rows = 0; int rows = 0;
const void* data = NULL; const void* data = NULL;
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
if (wres) { if (wres) {
*pexecute_time += (double)(ws_take_timing(wres)/1E6); *pexecute_time += (double)(ws_take_timing(wres)/1E6);
} }
@ -172,7 +172,7 @@ static int verticalPrintWebsocket(WS_RES* wres, double* pexecute_time) {
} }
numOfRows++; numOfRows++;
} }
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
} while (rows && !shell.stop_query); } while (rows && !shell.stop_query);
return numOfRows; return numOfRows;
} }
@ -192,7 +192,7 @@ static int dumpWebsocketToFile(const char* fname, WS_RES* wres,
} }
int rows = 0; int rows = 0;
const void* data = NULL; const void* data = NULL;
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
if (wres) { if (wres) {
*pexecute_time += (double)(ws_take_timing(wres)/1E6); *pexecute_time += (double)(ws_take_timing(wres)/1E6);
} }
@ -226,7 +226,7 @@ static int dumpWebsocketToFile(const char* fname, WS_RES* wres,
} }
taosFprintfFile(pFile, "\r\n"); taosFprintfFile(pFile, "\r\n");
} }
ws_fetch_block(wres, &data, &rows); ws_fetch_raw_block(wres, &data, &rows);
} while (rows && !shell.stop_query); } while (rows && !shell.stop_query);
taosCloseFile(&pFile); taosCloseFile(&pFile);
return numOfRows; return numOfRows;