From a51ea77ddc1453cd0a9c013f10387f968fcc5058 Mon Sep 17 00:00:00 2001 From: xywang Date: Wed, 30 Mar 2022 15:01:49 +0800 Subject: [PATCH] [TS-1318]: fixed compilation errors --- src/client/src/tscSubquery.c | 2 +- src/query/src/qAggMain.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index fe3f1b4c40..128ac1fc27 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -1213,7 +1213,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar for (int32_t i = 0; i < joinNum; ++i) { // reorganize the tid-tag value according to both the vgroup id and tag values // sort according to the tag value - size_t num = taosArrayGetSize(ctxlist[i].res); + int32_t num = (int32_t) taosArrayGetSize(ctxlist[i].res); int32_t ret = tidTagsMergeSort(ctxlist[i].res, 0, num - 1, size); if (ret != TSDB_CODE_SUCCESS) { diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c index cc9c62609d..e5f954ec7c 100644 --- a/src/query/src/qAggMain.c +++ b/src/query/src/qAggMain.c @@ -5869,7 +5869,7 @@ static void state_count_function(SQLFunctionCtx *pCtx) { SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx); SStateInfo *pStateInfo = GET_ROWCELL_INTERBUF(pResInfo); - void *data = GET_INPUT_DATA_LIST(pCtx); + char *data = GET_INPUT_DATA_LIST(pCtx); int64_t *pOutput = (int64_t *)pCtx->pOutput; for (int32_t i = 0; i < pCtx->size; i++,pOutput++,data += pCtx->inputBytes) { @@ -5898,7 +5898,7 @@ static void state_duration_function(SQLFunctionCtx *pCtx) { SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx); SStateInfo *pStateInfo = GET_ROWCELL_INTERBUF(pResInfo); - void *data = GET_INPUT_DATA_LIST(pCtx); + char *data = GET_INPUT_DATA_LIST(pCtx); TSKEY* tsList = GET_TS_LIST(pCtx); int64_t *pOutput = (int64_t *)pCtx->pOutput; -- GitLab