From 13ec77e1f9b324c6840ef8d8572dfd48a3a53ec9 Mon Sep 17 00:00:00 2001 From: Shungang Li Date: Tue, 2 Jul 2024 14:51:35 +0800 Subject: [PATCH] fix: mndCheckTransConflict uses the same iterator variable --- source/dnode/mnode/impl/src/mndTrans.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 39b9e9c14b..4669fdfb38 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -855,15 +855,15 @@ static bool mndCheckTransConflict(SMnode *pMnode, STrans *pNew) { if (pNew->conflict == TRN_CONFLICT_ARBGROUP) { if (pTrans->conflict == TRN_CONFLICT_GLOBAL) conflict = true; if (pTrans->conflict == TRN_CONFLICT_ARBGROUP) { - pIter = taosHashIterate(pNew->arbGroupIds, NULL); - while (pIter != NULL) { - int32_t groupId = *(int32_t *)pIter; + void* pGidIter = taosHashIterate(pNew->arbGroupIds, NULL); + while (pGidIter != NULL) { + int32_t groupId = *(int32_t *)pGidIter; if (taosHashGet(pTrans->arbGroupIds, &groupId, sizeof(int32_t)) != NULL) { - taosHashCancelIterate(pNew->arbGroupIds, pIter); + taosHashCancelIterate(pNew->arbGroupIds, pGidIter); conflict = true; break; } - pIter = taosHashIterate(pNew->arbGroupIds, pIter); + pGidIter = taosHashIterate(pNew->arbGroupIds, pGidIter); } } }