From 80e3ff934cc05d98eb616fbda6505d427d5d1f68 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 22 Feb 2021 18:05:59 +0800 Subject: [PATCH 1/2] [td-3035] : fix bug in projections query on super table with filter condition. --- src/query/src/qExecutor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 72ae0d566c..2408b7c4c2 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5162,6 +5162,8 @@ static void sequentialTableProcess(SQInfo *pQInfo) { assert(pQuery->prjInfo.vgroupLimit == -1); } + setQueryStatus(pQuery, QUERY_NOT_COMPLETED); + bool hasMoreBlock = true; int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order); SQueryCostInfo *summary = &pRuntimeEnv->summary; From 78c698143901cb425ada8c8acdbcc6442c9b7643 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 22 Feb 2021 18:27:34 +0800 Subject: [PATCH 2/2] [td-3014] : fix error in spread function when applying to unsigned values. --- src/query/src/qAggMain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c index fb8b2394f2..b1c394c5bf 100644 --- a/src/query/src/qAggMain.c +++ b/src/query/src/qAggMain.c @@ -3678,6 +3678,14 @@ static void spread_function(SQLFunctionCtx *pCtx) { LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, double, pCtx->inputType, numOfElems); } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) { LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, float, pCtx->inputType, numOfElems); + } else if (pCtx->inputType == TSDB_DATA_TYPE_UTINYINT) { + LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint8_t, pCtx->inputType, numOfElems); + } else if (pCtx->inputType == TSDB_DATA_TYPE_USMALLINT) { + LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint16_t, pCtx->inputType, numOfElems); + } else if (pCtx->inputType == TSDB_DATA_TYPE_UINT) { + LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint32_t, pCtx->inputType, numOfElems); + } else if (pCtx->inputType == TSDB_DATA_TYPE_UBIGINT) { + LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, uint64_t, pCtx->inputType, numOfElems); } if (!pCtx->hasNull) {