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

more code

This commit is contained in:
Hongze Cheng 2022-09-21 11:28:20 +08:00
parent 2b6001b312
commit 8ffc7e9f3e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,6 +342,7 @@ static int32_t (*tDiskColAddValImpl[])(SDiskCol *pDiskCol, SColVal *pColVal) = {
struct SDiskData {
int64_t suid;
int64_t uid;
int32_t nRow;
uint8_t cmprAlg;
SCompressor *pUidC;
SCompressor *pVerC;
@ -355,6 +356,7 @@ int32_t tDiskDataInit(SDiskData *pDiskData, STSchema *pTSchema, TABLEID *pId, ui
pDiskData->suid = pId->suid;
pDiskData->uid = pId->uid;
pDiskData->nRow = 0;
pDiskData->cmprAlg = cmprAlg;
if (pDiskData->pUidC == NULL) {
@ -443,7 +445,7 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
// TSKEY
TSKEY ts = TSDBROW_TS(pRow);
code = tCompress(pDiskData->pVerC, &ts, sizeof(int64_t));
code = tCompress(pDiskData->pKeyC, &ts, sizeof(int64_t));
if (code) goto _exit;
SRowIter iter = {0};
@ -458,7 +460,8 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
}
if (pColVal == NULL || pColVal->cid > pDiskCol->cid) {
code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, &COL_VAL_NONE(pDiskCol->cid, pDiskCol->type));
SColVal cv = COL_VAL_NONE(pDiskCol->cid, pDiskCol->type);
code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, &cv);
if (code) goto _exit;
} else {
code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, pColVal);
@ -466,6 +469,7 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
pColVal = tRowIterNext(&iter);
}
}
pDiskData->nRow++;
_exit:
return code;

3
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -1082,9 +1082,8 @@ int32_t tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
pColVal = tRowIterNext(&rIter);
}
}
_exit:
pBlockData->nRow++;
return code;
_err: