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

more refact

This commit is contained in:
Hongze Cheng 2022-06-06 01:51:10 +00:00
parent 5b64b2921f
commit 179dc39075
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/vnode/src/inc/tsdb.h
View File

@ -223,8 +223,8 @@ struct STbData {
}; };
struct SMemTable { struct SMemTable {
SVBufPool *pPool; STsdb *pTsdb;
T_REF_DECLARE() int32_t nRef;
SRWLatch latch; SRWLatch latch;
TSDBKEY minKey; TSDBKEY minKey;
TSDBKEY maxKey; TSDBKEY maxKey;

6
source/dnode/vnode/src/tsdb/tsdbMemTable.c
View File

@ -36,8 +36,8 @@ int tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) {
return -1; return -1;
} }
pMemTable->pPool = pTsdb->pVnode->inUse; pMemTable->pTsdb = pTsdb;
T_REF_INIT_VAL(pMemTable, 1); pMemTable->nRef = 1;
taosInitRWLatch(&pMemTable->latch); taosInitRWLatch(&pMemTable->latch);
pMemTable->minKey = (TSDBKEY){.ts = TSKEY_MAX, .version = INT64_MAX}; pMemTable->minKey = (TSDBKEY){.ts = TSKEY_MAX, .version = INT64_MAX};
pMemTable->maxKey = (TSDBKEY){.ts = TSKEY_MIN, .version = -1}; pMemTable->maxKey = (TSDBKEY){.ts = TSKEY_MIN, .version = -1};
@ -287,7 +287,7 @@ int tsdbInsertTableData(STsdb *pTsdb, SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlo
// copy data to buffer pool // copy data to buffer pool
int32_t tlen = pMsgIter->dataLen + pMsgIter->schemaLen + sizeof(*pBlock); int32_t tlen = pMsgIter->dataLen + pMsgIter->schemaLen + sizeof(*pBlock);
pBlkCopy = (SSubmitBlk *)vnodeBufPoolMalloc(pTsdb->mem->pPool, tlen); pBlkCopy = (SSubmitBlk *)vnodeBufPoolMalloc(pTsdb->pVnode->inUse, tlen);
memcpy(pBlkCopy, pBlock, tlen); memcpy(pBlkCopy, pBlock, tlen);
tInitSubmitBlkIter(pMsgIter, pBlkCopy, &blkIter); tInitSubmitBlkIter(pMsgIter, pBlkCopy, &blkIter);