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

Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD-25071

This commit is contained in:
wangmm0220 2023-07-06 19:34:22 +08:00
parent 47ae92af93 50c5dbffe2
commit b2d41ce907
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/client/src/clientTmq.c
View File

@ -2557,6 +2557,9 @@ static int32_t tmqGetWalInfoCb(void* param, SDataBuf* pMsg, int32_t code) {
} }
static void destroyCommonInfo(SMqVgCommon* pCommon) { static void destroyCommonInfo(SMqVgCommon* pCommon) {
if(pCommon == NULL){
return;
}
taosArrayDestroy(pCommon->pList); taosArrayDestroy(pCommon->pList);
tsem_destroy(&pCommon->rsp); tsem_destroy(&pCommon->rsp);
taosThreadMutexDestroy(&pCommon->mutex); taosThreadMutexDestroy(&pCommon->mutex);

2
source/dnode/vnode/src/tq/tqOffset.c
View File

@ -104,7 +104,7 @@ STqOffsetStore* tqOffsetOpen(STQ* pTq) {
pStore->needCommit = 0; pStore->needCommit = 0;
pTq->pOffsetStore = pStore; pTq->pOffsetStore = pStore;
pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_NO_LOCK); pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
if (pStore->pHash == NULL) { if (pStore->pHash == NULL) {
taosMemoryFree(pStore); taosMemoryFree(pStore);
return NULL; return NULL;