From 88f246b988496e0b06c8af9514698e940ce06720 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 1 Feb 2024 15:08:06 +0800 Subject: [PATCH] fix(stream): fix syntax error on windows, and add null ptr check for pTrans obj. --- source/dnode/mnode/impl/src/mndStream.c | 5 +++++ source/libs/parser/src/parTranslater.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 6640e5dca3..18cecddbdb 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -1843,6 +1843,11 @@ static int32_t mndProcessVgroupChange(SMnode *pMnode, SVgroupChangeInfo *pChange } } + // no need to build the trans to handle the vgroup upddate + if (pTrans == NULL) { + return 0; + } + if (mndTransPrepare(pMnode, pTrans) != 0) { mError("trans:%d, failed to prepare update stream trans since %s", pTrans->id, terrstr()); sdbRelease(pMnode->pSdb, pStream); diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 922ad30f39..e221d2158c 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -8330,8 +8330,7 @@ static int32_t createStreamReqVersionInfo(SSDataBlock* pBlock, SArray** pArray, SColumnInfoData* pCol2 = taosArrayGet(pBlock->pDataBlock, 2); for (int32_t i = 0; i < pBlock->info.rows; ++i) { - SVgroupVer v = {.vgId = *(int32_t*)colDataGetData(pCol1, i), .ver = *(int64_t*)colDataGetData(pCol2, i)}; - parserDebug("-------------%ld, vgId:%d, vgVer:%ld\n", *lastTs, v.vgId, v.ver); + SVgroupVer v = {.vgId = *(int32_t*)colDataGetData(pCol1, i), .ver = *(int64_t*)colDataGetData(pCol2, i)}; taosArrayPush(*pArray, &v); } } else {