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

Merge pull request #29646 from taosdata/fix/TD-33600 

fix:[TD-33600] windows error if taos exist without connection
This commit is contained in:
Pan Wei 2025-01-23 16:21:23 +08:00 committed by GitHub
parent b77754a63e c3c2dcf522
commit 6a597b3d89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1601,6 +1601,11 @@ void tmqFreeImpl(void* handle) {
static void tmqMgmtInit(void) { static void tmqMgmtInit(void) {
tmqInitRes = 0; tmqInitRes = 0;
if (taosThreadMutexInit(&tmqMgmt.lock, NULL) != 0){
goto END;
}
tmqMgmt.timer = taosTmrInit(1000, 100, 360000, "TMQ"); tmqMgmt.timer = taosTmrInit(1000, 100, 360000, "TMQ");
if (tmqMgmt.timer == NULL) { if (tmqMgmt.timer == NULL) {
@ -1612,10 +1617,6 @@ static void tmqMgmtInit(void) {
goto END; goto END;
} }
if (taosThreadMutexInit(&tmqMgmt.lock, NULL) != 0){
goto END;
}
return; return;
END: END:
tmqInitRes = terrno; tmqInitRes = terrno;
@ -1627,8 +1628,8 @@ void tmqMgmtClose(void) {
tmqMgmt.timer = NULL; tmqMgmt.timer = NULL;
} }
if (tmqMgmt.rsetId > 0) {
(void) taosThreadMutexLock(&tmqMgmt.lock); (void) taosThreadMutexLock(&tmqMgmt.lock);
if (tmqMgmt.rsetId >= 0) {
tmq_t *tmq = taosIterateRef(tmqMgmt.rsetId, 0); tmq_t *tmq = taosIterateRef(tmqMgmt.rsetId, 0);
int64_t refId = 0; int64_t refId = 0;
@ -1647,9 +1648,9 @@ void tmqMgmtClose(void) {
} }
taosCloseRef(tmqMgmt.rsetId); taosCloseRef(tmqMgmt.rsetId);
tmqMgmt.rsetId = -1; tmqMgmt.rsetId = -1;
}
(void)taosThreadMutexUnlock(&tmqMgmt.lock); (void)taosThreadMutexUnlock(&tmqMgmt.lock);
} }
}
tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) { tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) {
int32_t code = 0; int32_t code = 0;