From 0dbdc3d68e5965bad2a285037098e19025cce131 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 29 Jun 2022 02:06:06 +0000 Subject: [PATCH] more work --- source/dnode/vnode/src/tsdb/tsdbUtil.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c index c8e79dd14a..fa250831bf 100644 --- a/source/dnode/vnode/src/tsdb/tsdbUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c @@ -647,15 +647,11 @@ void tsdbRowGetColVal(TSDBROW *pRow, STSchema *pTSchema, int32_t iCol, SColVal * if (pRow->type == 0) { tTSRowGetVal(pRow->pTSRow, pTSchema, iCol, pColVal); } else if (pRow->type == 1) { - SColData *pColData = &(SColData){.cid = pTColumn->colId}; - void *p = NULL; + SColData *pColData; - p = taosArraySearch(pRow->pBlockData->aColDataP, &pColData, tColDataPCmprFn, TD_EQ); - if (p) { - pColData = *(SColData **)p; - - ASSERT(pColData->type == pTColumn->type); + tBlockDataGetColData(pRow->pBlockData, pTColumn->colId, &pColData); + if (pColData) { tColDataGetValue(pColData, pRow->iRow, pColVal); } else { *pColVal = COL_VAL_NONE(pTColumn->colId, pTColumn->type);