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

Merge pull request #17351 from taosdata/fix/TD-19544 

fix: fix kill query crash issue
This commit is contained in:
dapan1121 2022-10-14 18:37:48 +08:00 committed by GitHub
parent d82bad5c64 d5cfbebd82
commit 3a20447b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientMain.c
View File

@ -222,7 +222,9 @@ void taos_kill_query(TAOS *taos) {
int64_t rid = *(int64_t *)taos; int64_t rid = *(int64_t *)taos;
STscObj *pTscObj = acquireTscObj(rid); STscObj *pTscObj = acquireTscObj(rid);
if (pTscObj) {
stopAllRequests(pTscObj->pRequests); stopAllRequests(pTscObj->pRequests);
}
releaseTscObj(rid); releaseTscObj(rid);
} }

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

@ -998,7 +998,9 @@ void *shellCancelHandler(void *arg) {
shell.stop_query = true; shell.stop_query = true;
} else { } else {
#endif #endif
if (shell.conn) {
taos_kill_query(shell.conn); taos_kill_query(shell.conn);
}
#ifdef WEBSOCKET #ifdef WEBSOCKET
} }
#endif #endif