提交 179dc390 编写于 作者: H Hongze Cheng

more refact

上级 5b64b292
...@@ -223,8 +223,8 @@ struct STbData { ...@@ -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;
......
...@@ -36,8 +36,8 @@ int tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) { ...@@ -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 ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册