diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c index 36cd42332b0d84b09798138080da33a856f26a21..62888234019cf2fe9e77fe476b731e6918499d7a 100644 --- a/src/client/src/tscAsync.c +++ b/src/client/src/tscAsync.c @@ -342,8 +342,8 @@ void tscProcessAsyncRes(SSchedMsg *pMsg) { (*pSql->fp)(pSql->param, taosres, code); if (shouldFree) { - tscFreeSqlObj(pSql); tscTrace("%p Async sql is automatically freed in async res", pSql); + tscFreeSqlObj(pSql); } } diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c index 00c8d776190fc2cff077fd9be87e8ac966f4d5cd..739ae7848e6222ee650031649192593991299544 100644 --- a/src/client/src/tscProfile.c +++ b/src/client/src/tscProfile.c @@ -292,7 +292,6 @@ void tscKillConnection(STscObj *pObj) { pthread_mutex_unlock(&pObj->mutex); - taos_close(pObj); - tscTrace("connection:%p is killed", pObj); + taos_close(pObj); } diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 66d5e17747122dd5bd49574d81c14416047c3c49..5ea6941fffcc3403d89b21ed2bb97a6747edc8d9 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -343,8 +343,8 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) { (*pSql->fp)(pSql->param, taosres, rpcMsg->code); if (shouldFree) { - tscFreeSqlObj(pSql); tscTrace("%p Async sql is automatically freed", pSql); + tscFreeSqlObj(pSql); } } diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index f6c1fee633308260da4c8c9ce8c5e327c67338fb..199b4150e81eb52ebe4914b36d4ba9a64a51e44e 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -757,8 +757,8 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) { tscTrace("%p qhandle is null, abort free, fp:%p", pSql, pSql->fp); if (tscShouldFreeAsyncSqlObj(pSql)) { - tscFreeSqlObj(pSql); tscTrace("%p Async SqlObj is freed by app", pSql); + tscFreeSqlObj(pSql); } else { if (keepCmd) { tscFreeSqlResult(pSql); diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c index 4fadad5021b5841f482f365f9a6d07ea6777ad9b..f586db3d08d5decfa3458b789d6dd4eb856e84ef 100644 --- a/src/client/src/tscStream.c +++ b/src/client/src/tscStream.c @@ -582,10 +582,12 @@ void taos_close_stream(TAOS_STREAM *handle) { tscRemoveFromStreamList(pStream, pSql); taosTmrStopA(&(pStream->pTimer)); + + tscTrace("%p stream:%p is closed", pSql, pStream); + tscFreeSqlObj(pSql); pStream->pSql = NULL; - tscTrace("%p stream:%p is closed", pSql, pStream); tfree(pStream); } }