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

Merge pull request #1127 from taosdata/hjxilinx-patch-3 

Update tscServer.c
This commit is contained in:
slguan 2020-01-13 13:47:07 +08:00 committed by GitHub
parent dc3d8869db 2cdc335d77
commit 3fd7db46e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/src/tscServer.c
View File

@ -1090,8 +1090,8 @@ static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSq
} }
} }
int32_t numOfTotal = pState->numOfTotal; int32_t numOfTotal = trsupport->pState->numOfTotal;
int32_t finished = atomic_add_fetch_32(&pState->numOfCompleted, 1); int32_t finished = atomic_add_fetch_32(&trsupport->pState->numOfCompleted, 1);
if (finished < numOfTotal) { // pState may be released by otherthreads, so keep the value in a local variable. if (finished < numOfTotal) { // pState may be released by otherthreads, so keep the value in a local variable.
return tscFreeSubSqlObj(trsupport, pSql); return tscFreeSubSqlObj(trsupport, pSql);
} }
@ -1220,9 +1220,9 @@ void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
// keep this value local variable, since the pState variable may be released by other threads, if atomic_add opertion // keep this value local variable, since the pState variable may be released by other threads, if atomic_add opertion
// increases the finished value up to pState->numOfTotal value, which means all subqueries are completed. // increases the finished value up to pState->numOfTotal value, which means all subqueries are completed.
// In this case, the comparsion between finished value and released pState->numOfTotal is not safe. // In this case, the comparsion between finished value and released pState->numOfTotal is not safe.
int32_t numOfTotal = pState->numOfTotal; int32_t numOfTotal = trsupport->pState->numOfTotal;
int32_t finished = atomic_add_fetch_32(&pState->numOfCompleted, 1); int32_t finished = atomic_add_fetch_32(&trsupport->pState->numOfCompleted, 1);
if (finished < numOfTotal) { if (finished < numOfTotal) {
tscTrace("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pPObj, pSql, trsupport->subqueryIndex, finished); tscTrace("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pPObj, pSql, trsupport->subqueryIndex, finished);
return tscFreeSubSqlObj(trsupport, pSql); return tscFreeSubSqlObj(trsupport, pSql);