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

more

This commit is contained in:
Hongze Cheng 2022-06-06 01:46:27 +00:00
parent 461cd037bf
commit 5b64b2921f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,10 +226,8 @@ struct SMemTable {
SVBufPool *pPool; SVBufPool *pPool;
T_REF_DECLARE() T_REF_DECLARE()
SRWLatch latch; SRWLatch latch;
TSKEY keyMin; TSDBKEY minKey;
TSKEY keyMax; TSDBKEY maxKey;
int64_t minVer;
int64_t maxVer;
int64_t nRow; int64_t nRow;
SSkipList *pSlIdx; // SSkiplist<STbData> SSkipList *pSlIdx; // SSkiplist<STbData>
SHashObj *pHashIdx; SHashObj *pHashIdx;

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

@ -39,8 +39,8 @@ int tsdbMemTableCreate(STsdb *pTsdb, SMemTable **ppMemTable) {
pMemTable->pPool = pTsdb->pVnode->inUse; pMemTable->pPool = pTsdb->pVnode->inUse;
T_REF_INIT_VAL(pMemTable, 1); T_REF_INIT_VAL(pMemTable, 1);
taosInitRWLatch(&pMemTable->latch); taosInitRWLatch(&pMemTable->latch);
pMemTable->keyMin = TSKEY_MAX; pMemTable->minKey = (TSDBKEY){.ts = TSKEY_MAX, .version = INT64_MAX};
pMemTable->keyMax = TSKEY_MIN; pMemTable->maxKey = (TSDBKEY){.ts = TSKEY_MIN, .version = -1};
pMemTable->nRow = 0; pMemTable->nRow = 0;
pMemTable->pSlIdx = tSkipListCreate(pVnode->config.tsdbCfg.slLevel, TSDB_DATA_TYPE_BIGINT, sizeof(tb_uid_t), pMemTable->pSlIdx = tSkipListCreate(pVnode->config.tsdbCfg.slLevel, TSDB_DATA_TYPE_BIGINT, sizeof(tb_uid_t),
tsdbTbDataComp, SL_DISCARD_DUP_KEY, tsdbTbDataGetUid); tsdbTbDataComp, SL_DISCARD_DUP_KEY, tsdbTbDataGetUid);
@ -309,8 +309,8 @@ int tsdbInsertTableData(STsdb *pTsdb, SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlo
if (pTbData->maxKey.ts < keyMax) pTbData->maxKey.ts = keyMax; if (pTbData->maxKey.ts < keyMax) pTbData->maxKey.ts = keyMax;
pMemTable->nRow += pMsgIter->numOfRows; pMemTable->nRow += pMsgIter->numOfRows;
if (pMemTable->keyMin > keyMin) pMemTable->keyMin = keyMin; if (pMemTable->minKey.ts > keyMin) pMemTable->minKey.ts = keyMin;
if (pMemTable->keyMax < keyMax) pMemTable->keyMax = keyMax; if (pMemTable->maxKey.ts < keyMax) pMemTable->maxKey.ts = keyMax;
pRsp->numOfRows = pMsgIter->numOfRows; pRsp->numOfRows = pMsgIter->numOfRows;
pRsp->affectedRows = pMsgIter->numOfRows; pRsp->affectedRows = pMsgIter->numOfRows;