From b0bc243413b958e91125d85c747c545c1eac2663 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 19 Mar 2022 15:15:03 +0800 Subject: [PATCH] [td-13039] fix bug in select * --- source/dnode/vnode/src/tsdb/tsdbRead.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 97c52f44eb..66d50c1f9e 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -401,14 +401,20 @@ static STsdbReadHandle* tsdbQueryTablesImpl(STsdb* tsdb, STsdbQueryCond* pCond, for (int32_t i = 0; i < pCond->numOfCols; ++i) { SColumnInfoData colInfo = {{0}, 0}; - colInfo.info = pCond->colList[i]; + colInfo.pData = calloc(1, EXTRA_BYTES + pReadHandle->outputCapacity * pCond->colList[i].bytes); - if (colInfo.pData == NULL) { + if (!IS_VAR_DATA_TYPE(colInfo.info.type)) { + colInfo.nullbitmap = calloc(1, BitmapLen(pReadHandle->outputCapacity)); + } + + if (colInfo.pData == NULL || (colInfo.nullbitmap == NULL && (!IS_VAR_DATA_TYPE(colInfo.info.type)))) { goto _end; } taosArrayPush(pReadHandle->pColumns, &colInfo); + + pReadHandle->statis[i].colId = colInfo.info.colId; }