From e3498d61b4733d657936d8811807fb8be0e09407 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 12 Jan 2023 09:27:18 +0800 Subject: [PATCH 1/4] refact code --- source/dnode/vnode/src/tsdb/tsdbMemTable.c | 54 +--------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c index d68afbed1f..3db9ff2b42 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c +++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c @@ -64,8 +64,6 @@ int32_t tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) { taosMemoryFree(pMemTable); goto _err; } - // pMemTable->qList.pNext = &pMemTable->qList; - // pMemTable->qList.ppNext = &pMemTable->qList.pNext; vnodeBufPoolRef(pMemTable->pPool); *ppMemTable = pMemTable; @@ -112,30 +110,6 @@ int32_t tsdbInsertTableData(STsdb *pTsdb, int64_t version, SSubmitTbData *pSubmi tb_uid_t suid = pSubmitTbData->suid; tb_uid_t uid = pSubmitTbData->uid; -#if 0 - SMetaInfo info; - code = metaGetInfo(pTsdb->pVnode->pMeta, uid, &info, NULL); - if (code) { - code = TSDB_CODE_TDB_TABLE_NOT_EXIST; - goto _err; - } - if (info.suid != suid) { - code = TSDB_CODE_INVALID_MSG; - goto _err; - } - if (info.suid) { - metaGetInfo(pTsdb->pVnode->pMeta, info.suid, &info, NULL); - } - if (pSubmitTbData->sver != info.skmVer) { - tsdbError("vgId:%d, req sver:%d, skmVer:%d suid:%" PRId64 " uid:%" PRId64, TD_VID(pTsdb->pVnode), - pSubmitTbData->sver, info.skmVer, suid, uid); - code = TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER; - goto _err; - } - - if (pRsp) pRsp->sver = info.skmVer; -#endif - // create/get STbData to op code = tsdbGetOrCreateTbData(pMemTable, suid, uid, &pTbData); if (code) { @@ -811,30 +785,4 @@ SArray *tsdbMemTableGetTbDataArray(SMemTable *pMemTable) { _exit: return aTbDataP; -} - -// int32_t tsdbRecycleMemTable(SMemTable *pMemTable) { -// int32_t code = 0; - -// SQueryNode *pNode = pMemTable->qList.pNext; -// while (1) { -// ASSERT(pNode != &pMemTable->qList); -// SQueryNode *pNextNode = pNode->pNext; - -// if (pNextNode == &pMemTable->qList) { -// code = (*pNode->reseek)(pNode->pQHandle); -// if (code) goto _exit; -// break; -// } else { -// code = (*pNode->reseek)(pNode->pQHandle); -// if (code) goto _exit; -// pNode = pMemTable->qList.pNext; -// ASSERT(pNode == pNextNode); -// } -// } - -// // NOTE: Take care here, pMemTable is destroyed - -// _exit: -// return code; -// } +} \ No newline at end of file From 086253b41313e53772a88a72afc7c564f7be573e Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 12 Jan 2023 09:52:03 +0800 Subject: [PATCH 2/4] Revert "vnode: disable buffer pool recycling for 3.0 merging" This reverts commit ba68d5d7b3424f5ca690373a67c39ea4b75b6091. --- source/dnode/vnode/src/vnd/vnodeCommit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c index 63c05ce88c..4473d4e9aa 100644 --- a/source/dnode/vnode/src/vnd/vnodeCommit.c +++ b/source/dnode/vnode/src/vnd/vnodeCommit.c @@ -75,10 +75,10 @@ static int32_t vnodeGetBufPoolToUse(SVnode *pVnode) { break; } else { vDebug("vgId:%d no free buffer pool on %d try, try to recycle...", TD_VID(pVnode), nTry); - /* + code = vnodeTryRecycleBufPool(pVnode); TSDB_CHECK_CODE(code, lino, _exit); - */ + if (pVnode->freeList == NULL) { vDebug("vgId:%d no free buffer pool on %d try, wait %d ms...", TD_VID(pVnode), nTry, WAIT_TIME_MILI_SEC); From beb637554ca51c1f868f0563251af2d590c3520b Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 12 Jan 2023 10:54:58 +0800 Subject: [PATCH 3/4] bp/proactive: remove incorrect proactive assert --- source/dnode/vnode/src/vnd/vnodeBufPool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/dnode/vnode/src/vnd/vnodeBufPool.c b/source/dnode/vnode/src/vnd/vnodeBufPool.c index 80a422ca3b..b1575fb496 100644 --- a/source/dnode/vnode/src/vnd/vnodeBufPool.c +++ b/source/dnode/vnode/src/vnd/vnodeBufPool.c @@ -252,8 +252,6 @@ void vnodeBufPoolUnRef(SVBufPool *pPool, bool proactive) { if (pVnode->onRecycle == pPool) { pVnode->onRecycle = NULL; } else { - ASSERT(proactive); - if (pPool->recyclePrev) { pPool->recyclePrev->recycleNext = pPool->recycleNext; } else { @@ -329,4 +327,4 @@ int32_t vnodeBufPoolRecycle(SVBufPool *pPool) { _exit: taosThreadMutexUnlock(&pPool->mutex); return code; -} \ No newline at end of file +} From 59ecfb6d961f17f74a1384418275de6eeea39e36 Mon Sep 17 00:00:00 2001 From: Huo Linhe Date: Tue, 17 Jan 2023 09:12:45 +0800 Subject: [PATCH 4/4] chore: fix write_raw_block_with_fields error Close [TD-21949](https://jira.taosdata.com:18080/browse/TD-21949) --- source/libs/parser/src/parInsertUtil.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/libs/parser/src/parInsertUtil.c b/source/libs/parser/src/parInsertUtil.c index b8ef7d970d..7cc93b448f 100644 --- a/source/libs/parser/src/parInsertUtil.c +++ b/source/libs/parser/src/parInsertUtil.c @@ -671,7 +671,6 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate goto end; } - colLength[c] = htonl(colLength[c]); int8_t* offset = pStart; if (IS_VAR_DATA_TYPE(pColSchema->type)) { pStart += numOfRows * sizeof(int32_t); @@ -687,4 +686,4 @@ int rawBlockBindData(SQuery* query, STableMeta* pTableMeta, void* data, SVCreate end: return ret; -} \ No newline at end of file +}