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

more work

This commit is contained in:
Hongze Cheng 2022-06-29 02:06:06 +00:00
parent 553f1bd506
commit 0dbdc3d68e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,15 +647,11 @@ void tsdbRowGetColVal(TSDBROW *pRow, STSchema *pTSchema, int32_t iCol, SColVal *
if (pRow->type == 0) { if (pRow->type == 0) {
tTSRowGetVal(pRow->pTSRow, pTSchema, iCol, pColVal); tTSRowGetVal(pRow->pTSRow, pTSchema, iCol, pColVal);
} else if (pRow->type == 1) { } else if (pRow->type == 1) {
SColData *pColData = &(SColData){.cid = pTColumn->colId}; SColData *pColData;
void *p = NULL;
p = taosArraySearch(pRow->pBlockData->aColDataP, &pColData, tColDataPCmprFn, TD_EQ); tBlockDataGetColData(pRow->pBlockData, pTColumn->colId, &pColData);
if (p) {
pColData = *(SColData **)p;
ASSERT(pColData->type == pTColumn->type);
if (pColData) {
tColDataGetValue(pColData, pRow->iRow, pColVal); tColDataGetValue(pColData, pRow->iRow, pColVal);
} else { } else {
*pColVal = COL_VAL_NONE(pTColumn->colId, pTColumn->type); *pColVal = COL_VAL_NONE(pTColumn->colId, pTColumn->type);