From 7e57747beea402f8a7f00b961e296cd584e46a93 Mon Sep 17 00:00:00 2001 From: kailixu Date: Mon, 12 Aug 2024 15:51:00 +0800 Subject: [PATCH 1/2] fix: null pointer check when clearing tsdb reader --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index 0af88e8551..97be3cde85 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -4608,11 +4608,13 @@ static void freeSchemaFunc(void* param) { } static void clearSharedPtr(STsdbReader* p) { - p->status.pTableMap = NULL; - p->status.uidList.tableUidList = NULL; - p->info.pSchema = NULL; - p->pReadSnap = NULL; - p->pSchemaMap = NULL; + if (p) { + p->status.pTableMap = NULL; + p->status.uidList.tableUidList = NULL; + p->info.pSchema = NULL; + p->pReadSnap = NULL; + p->pSchemaMap = NULL; + } } static int32_t setSharedPtr(STsdbReader* pDst, const STsdbReader* pSrc) { From e3bfb9870ab53fedcbda5eace0bcf3f61caf06d8 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 12 Aug 2024 17:12:19 +0800 Subject: [PATCH 2/2] fix(meta/commit): transfer txn's ownership to asyn commit thread --- source/dnode/vnode/src/meta/metaCommit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/dnode/vnode/src/meta/metaCommit.c b/source/dnode/vnode/src/meta/metaCommit.c index bbf2217b31..ec9e2d90ec 100644 --- a/source/dnode/vnode/src/meta/metaCommit.c +++ b/source/dnode/vnode/src/meta/metaCommit.c @@ -73,6 +73,8 @@ int metaPrepareAsyncCommit(SMeta *pMeta) { TSDB_CHECK_CODE(code, lino, _exit); pMeta->changed = false; + pMeta->txn = NULL; + _exit: if (code) { metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,