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

Merge pull request #2882 from taosdata/feature/platform 

Modify the incorrect use of tqueue
This commit is contained in:
Shengliang Guan 2020-08-02 22:05:55 +08:00 committed by GitHub
parent 919958dbba ce3d4a79a6
commit 1e5f3c509c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mnode/src/mnodeSdb.c
View File

@ -988,7 +988,7 @@ int32_t sdbAllocWriteQueue() {
} }
void sdbFreeWritequeue() { void sdbFreeWritequeue() {
taosCloseQset(tsSdbWriteQueue); taosCloseQueue(tsSdbWriteQueue);
taosFreeQall(tsSdbWriteQall); taosFreeQall(tsSdbWriteQall);
taosCloseQset(tsSdbWriteQset); taosCloseQset(tsSdbWriteQset);
tsSdbWriteQall = NULL; tsSdbWriteQall = NULL;

3
src/rpc/src/rpcMain.c
View File

@ -747,7 +747,8 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) {
if (pConn) { if (pConn) {
if (pConn->linkUid != pHead->linkUid) { if (pConn->linkUid != pHead->linkUid) {
terrno = TSDB_CODE_RPC_MISMATCHED_LINK_ID; terrno = TSDB_CODE_RPC_MISMATCHED_LINK_ID;
tError("%s %p %p, linkUid:0x%x is not matched with received:0x%x", pRpc->label, pConn, (void*)pHead->ahandle, pConn->linkUid, pHead->linkUid); tDebug("%s %p %p, linkUid:0x%x is not matched with received:0x%x", pRpc->label, pConn, (void *)pHead->ahandle,
pConn->linkUid, pHead->linkUid);
pConn = NULL; pConn = NULL;
} }
} }

2
src/util/src/tqueue.c
View File

@ -241,7 +241,6 @@ void taosCloseQset(taos_qset param) {
if (param == NULL) return; if (param == NULL) return;
STaosQset *qset = (STaosQset *)param; STaosQset *qset = (STaosQset *)param;
#if 0
// remove all the queues from qset // remove all the queues from qset
pthread_mutex_lock(&qset->mutex); pthread_mutex_lock(&qset->mutex);
while (qset->head) { while (qset->head) {
@ -252,7 +251,6 @@ void taosCloseQset(taos_qset param) {
queue->next = NULL; queue->next = NULL;
} }
pthread_mutex_unlock(&qset->mutex); pthread_mutex_unlock(&qset->mutex);
#endif
pthread_mutex_destroy(&qset->mutex); pthread_mutex_destroy(&qset->mutex);
tsem_destroy(&qset->sem); tsem_destroy(&qset->sem);