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

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

This commit is contained in:
54liuyao 2024-08-12 19:40:07 +08:00
parent 5d9101b28d 0d4cb0e26e
commit a3424e6f59
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/meta/metaCommit.c
View File

@ -73,6 +73,8 @@ int metaPrepareAsyncCommit(SMeta *pMeta) {
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
pMeta->changed = false; pMeta->changed = false;
pMeta->txn = NULL;
_exit: _exit:
if (code) { if (code) {
metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__, metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,

2
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -4608,12 +4608,14 @@ static void freeSchemaFunc(void* param) {
} }
static void clearSharedPtr(STsdbReader* p) { static void clearSharedPtr(STsdbReader* p) {
if (p) {
p->status.pTableMap = NULL; p->status.pTableMap = NULL;
p->status.uidList.tableUidList = NULL; p->status.uidList.tableUidList = NULL;
p->info.pSchema = NULL; p->info.pSchema = NULL;
p->pReadSnap = NULL; p->pReadSnap = NULL;
p->pSchemaMap = NULL; p->pSchemaMap = NULL;
} }
}
static int32_t setSharedPtr(STsdbReader* pDst, const STsdbReader* pSrc) { static int32_t setSharedPtr(STsdbReader* pDst, const STsdbReader* pSrc) {
pDst->status.pTableMap = pSrc->status.pTableMap; pDst->status.pTableMap = pSrc->status.pTableMap;