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

mroe code

This commit is contained in:
Hongze Cheng 2022-12-26 17:12:08 +08:00
parent 53226eae7c
commit 5abaf4409d
1 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
source/dnode/vnode/src/tsdb/tsdbCompact.c
View File

@ -50,6 +50,8 @@ typedef struct STsdbDataIter {
char handle[]; char handle[];
} STsdbDataIter; } STsdbDataIter;
#define TSDB_DATA_ITER_FROM_RBTN(N) ((STsdbDataIter *)((char *)N - offsetof(STsdbDataIter, n)))
typedef struct { typedef struct {
STsdb *pTsdb; STsdb *pTsdb;
STsdbFS fs; STsdbFS fs;
@ -59,6 +61,7 @@ typedef struct {
SDataFReader *pReader; SDataFReader *pReader;
STsdbDataIter *iterList; // list of iterators STsdbDataIter *iterList; // list of iterators
SRBTree rtree; SRBTree rtree;
STsdbDataIter *pIter;
SBlockData bData; SBlockData bData;
} STsdbCompactor; } STsdbCompactor;
@ -215,18 +218,22 @@ static int32_t tsdbDataIterNext(STsdbDataIter *pIter) {
pSttDIter->iRow++; pSttDIter->iRow++;
if (pSttDIter->iRow < pSttDIter->bData.nRow) { if (pSttDIter->iRow < pSttDIter->bData.nRow) {
ASSERT(0); pIter->rowInfo.uid = pSttDIter->bData.uid ? pSttDIter->bData.uid : pSttDIter->bData.aUid[pSttDIter->iRow];
pIter->rowInfo.row = tsdbRowFromBlockData(&pSttDIter->bData, pSttDIter->iRow);
} else { } else {
pSttDIter->iSttBlk++; pSttDIter->iSttBlk++;
if (pSttDIter->iSttBlk < taosArrayGetSize(pSttDIter->aSttBlk)) { if (pSttDIter->iSttBlk < taosArrayGetSize(pSttDIter->aSttBlk)) {
code = tsdbReadSttBlock(pSttDIter->pReader, pSttDIter->iStt, code = tsdbReadSttBlockEx(pSttDIter->pReader, pSttDIter->iStt,
taosArrayGet(pSttDIter->aSttBlk, pSttDIter->iSttBlk), &pSttDIter->bData); taosArrayGet(pSttDIter->aSttBlk, pSttDIter->iSttBlk), &pSttDIter->bData);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
pSttDIter->iRow = 0; pSttDIter->iRow = 0;
pIter->rowInfo.suid = pSttDIter->bData.suid;
pIter->rowInfo.uid = pSttDIter->bData.uid ? pSttDIter->bData.uid : pSttDIter->bData.aUid[pSttDIter->iRow];
pIter->rowInfo.row = tsdbRowFromBlockData(&pSttDIter->bData, pSttDIter->iRow);
} else { } else {
// code = TSDB_CODE_TDB_NO_DATA; pIter->rowInfo.suid = 0;
// goto _exit; pIter->rowInfo.uid = 0;
} }
} }
} else { } else {
@ -315,10 +322,59 @@ _exit:
return code; return code;
} }
static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor, TSDBROW **ppRow) { static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
// TODO
if (pCompactor->pIter) {
code = tsdbDataIterNext(pCompactor->pIter);
TSDB_CHECK_CODE(code, lino, _exit);
if (pCompactor->pIter->rowInfo.suid == 0 && pCompactor->pIter->rowInfo.uid == 0) {
pCompactor->pIter = NULL;
} else {
SRBTreeNode *pNode = tRBTreeMin(&pCompactor->rtree);
if (pNode) {
STsdbDataIter *pIter = TSDB_DATA_ITER_FROM_RBTN(pNode);
int32_t c = tRowInfoCmprFn(&pCompactor->pIter->rowInfo, &pIter->rowInfo);
ASSERT(c);
if (c > 0) {
tRBTreePut(&pCompactor->rtree, &pCompactor->pIter->n);
pCompactor->pIter = NULL;
}
}
}
}
if (pCompactor->pIter == NULL) {
SRBTreeNode *pNode = tRBTreeMin(&pCompactor->rtree);
if (pNode) {
pCompactor->pIter = TSDB_DATA_ITER_FROM_RBTN(pNode);
tRBTreeDrop(&pCompactor->rtree, pNode);
}
}
_exit:
return code;
}
static int32_t tsdbCompactGetRow(STsdbCompactor *pCompactor, TSDBROW **ppRow) {
int32_t code = 0;
int32_t lino = 0;
if (pCompactor->pIter == NULL) {
code = tsdbCompactNextRow(pCompactor);
TSDB_CHECK_CODE(code, lino, _exit);
}
if (pCompactor->pIter) {
*ppRow = &pCompactor->pIter->rowInfo.row;
} else {
*ppRow = NULL;
}
_exit: _exit:
return code; return code;
} }
@ -364,6 +420,7 @@ static int32_t tsdbOpenCompactor(STsdbCompactor *pCompactor) {
tRBTreePut(&pCompactor->rtree, &pIter->n); tRBTreePut(&pCompactor->rtree, &pIter->n);
} }
} }
pCompactor->pIter = NULL;
_exit: _exit:
if (code) { if (code) {
@ -412,13 +469,16 @@ int32_t tsdbCompact(STsdb *pTsdb, int32_t flag) {
TSDBROW *pRow = NULL; TSDBROW *pRow = NULL;
int64_t nRow = 0; int64_t nRow = 0;
for (;;) { for (;;) {
code = tsdbCompactNextRow(&compactor, &pRow); code = tsdbCompactGetRow(&compactor, &pRow);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
if (pRow == NULL) break; if (pRow == NULL) break;
nRow++; nRow++;
code = tsdbCompactNextRow(&compactor);
TSDB_CHECK_CODE(code, lino, _exit);
// code = tBlockDataAppendRow(&compactor.bData, pRow, pRow, NULL, 0); // code = tBlockDataAppendRow(&compactor.bData, pRow, pRow, NULL, 0);
// TSDB_CHECK_CODE(code, lino, _exit); // TSDB_CHECK_CODE(code, lino, _exit);