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

chore: append kv row to block data

This commit is contained in:
Cary Xu 2022-11-11 16:01:41 +08:00
parent 74223b3467
commit 41a2b0e8ea
1 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1058,6 +1058,7 @@ static int32_t tBlockDataAppendTPRow(SBlockData *pBlockData, STSRow *pRow, STSch
int32_t iTColumn = 1; int32_t iTColumn = 1;
STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL;
void *pBitmap = pRow->statis ? tdGetBitmapAddrTp(pRow, pTSchema->flen) : NULL;
for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) { for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) {
SColData *pColData = &((SColData *)pBlockData->aColData->pData)[iColData]; SColData *pColData = &((SColData *)pBlockData->aColData->pData)[iColData];
@ -1076,8 +1077,8 @@ static int32_t tBlockDataAppendTPRow(SBlockData *pBlockData, STSRow *pRow, STSch
SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type}; SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type};
if (pRow->statis) { if (pRow->statis) {
TDRowValT vt; TDRowValT vt = TD_VTYPE_MAX;
tdGetBitmapValTypeII(tdGetBitmapAddrTp(pRow, pTSchema->flen), iTColumn - 1, &vt); tdGetBitmapValTypeII(pBitmap, iTColumn - 1, &vt);
if (vt == TD_VTYPE_NORM) { if (vt == TD_VTYPE_NORM) {
cv.flag = CV_FLAG_VALUE; cv.flag = CV_FLAG_VALUE;
@ -1128,6 +1129,10 @@ _exit:
static int32_t tBlockDataAppendKVRow(SBlockData *pBlockData, STSRow *pRow, STSchema *pTSchema) { static int32_t tBlockDataAppendKVRow(SBlockData *pBlockData, STSRow *pRow, STSchema *pTSchema) {
int32_t code = 0; int32_t code = 0;
col_id_t kvIter = 0;
col_id_t nKvCols = tdRowGetNCols(pRow) - 1;
void *pColIdx = TD_ROW_COL_IDX(pRow);
void *pBitmap = tdGetBitmapAddrKv(pRow, tdRowGetNCols(pRow));
int32_t iTColumn = 1; int32_t iTColumn = 1;
STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL; STColumn *pTColumn = (iTColumn < pTSchema->numOfCols) ? &pTSchema->columns[iTColumn] : NULL;
@ -1144,46 +1149,48 @@ static int32_t tBlockDataAppendKVRow(SBlockData *pBlockData, STSRow *pRow, STSch
if (code) goto _exit; if (code) goto _exit;
} else { } else {
ASSERT(pTColumn->type == pColData->type); ASSERT(pTColumn->type == pColData->type);
ASSERT(pTColumn->colId == pColData->cid);
// SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type}; SColVal cv = {.cid = pTColumn->colId, .type = pTColumn->type};
TDRowValT vt = TD_VTYPE_NONE; // default is NONE
SKvRowIdx *pKvIdx = NULL;
// if (pRow->statis) { while (kvIter < nKvCols) {
// TDRowValT vt; pKvIdx = (SKvRowIdx *)POINTER_SHIFT(pColIdx, kvIter * sizeof(SKvRowIdx));
// tdGetBitmapValTypeII(tdGetBitmapAddrTp(pRow, pTSchema->flen), iTColumn - 1, &vt); if (pKvIdx->colId == pTColumn->colId) {
tdGetBitmapValTypeII(pBitmap, kvIter, &vt);
++kvIter;
break;
} else if (pKvIdx->colId > pTColumn->colId) {
vt = TD_VTYPE_NONE;
break;
} else {
++kvIter;
}
}
// if (vt == TD_VTYPE_NORM) { if (vt == TD_VTYPE_NORM) {
// cv.flag = CV_FLAG_VALUE; cv.flag = CV_FLAG_VALUE;
// if (IS_VAR_DATA_TYPE(pTColumn->type)) { void *pData = POINTER_SHIFT(pRow, pKvIdx->offset);
// void *pData = pRow->data + *(int32_t *)(pRow->data + pTColumn->offset); if (IS_VAR_DATA_TYPE(pTColumn->type)) {
// cv.value.nData = varDataLen(pData); cv.value.nData = varDataLen(pData);
// cv.value.pData = varDataVal(pData); cv.value.pData = varDataVal(pData);
// } else { } else {
// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pTColumn->bytes); memcpy(&cv.value.val, pData, pTColumn->bytes);
// } }
// code = tColDataAppendValue(pColData, &cv); code = tColDataAppendValue(pColData, &cv);
// if (code) goto _exit; if (code) goto _exit;
// } else if (vt == TD_VTYPE_NONE) { } else if (vt == TD_VTYPE_NONE) {
// code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type)); code = tColDataAppendValue(pColData, &COL_VAL_NONE(pColData->cid, pColData->type));
// if (code) goto _exit; if (code) goto _exit;
// } else if (vt == TD_VTYPE_NULL) { } else if (vt == TD_VTYPE_NULL) {
// code = tColDataAppendValue(pColData, &COL_VAL_NULL(pColData->cid, pColData->type)); code = tColDataAppendValue(pColData, &COL_VAL_NULL(pColData->cid, pColData->type));
// if (code) goto _exit; if (code) goto _exit;
// } else { } else {
// ASSERT(0); ASSERT(0);
// } }
// } else {
// cv.flag = CV_FLAG_VALUE;
// if (IS_VAR_DATA_TYPE(pTColumn->type)) {
// void *pData = pRow->data + *(int32_t *)(pRow->data + pTColumn->offset);
// cv.value.nData = varDataLen(pData);
// cv.value.pData = varDataVal(pData);
// } else {
// memcpy(&cv.value.val, pRow->data + pTColumn->offset, pT
// }
// }
} }
} }