From 434fd97615b8ee8bfe1c9ce09743425f3e150d46 Mon Sep 17 00:00:00 2001 From: sima Date: Mon, 15 Jul 2024 15:22:47 +0800 Subject: [PATCH 1/7] enh:[TD-30998] Handling return value in filter.c --- include/libs/scalar/filter.h | 5 +- include/util/taoserror.h | 1 + source/libs/executor/src/scanoperator.c | 16 +- source/libs/planner/src/planOptimizer.c | 15 +- source/libs/scalar/inc/filterInt.h | 10 +- source/libs/scalar/inc/sclInt.h | 8 +- source/libs/scalar/inc/sclvector.h | 2 +- source/libs/scalar/src/filter.c | 1042 +++++++++++++++-------- source/libs/scalar/src/scalar.c | 6 +- source/libs/scalar/src/sclvector.c | 188 ++-- source/util/src/terror.c | 1 + 11 files changed, 838 insertions(+), 456 deletions(-) diff --git a/include/libs/scalar/filter.h b/include/libs/scalar/filter.h index 750179ee3b..a98bf29afb 100644 --- a/include/libs/scalar/filter.h +++ b/include/libs/scalar/filter.h @@ -58,12 +58,13 @@ extern int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict extern int32_t filterConverNcharColumns(SFilterInfo *pFilterInfo, int32_t rows, bool *gotNchar); extern int32_t filterFreeNcharColumns(SFilterInfo *pFilterInfo); extern void filterFreeInfo(SFilterInfo *info); -extern bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pColsAgg, int32_t numOfCols, int32_t numOfRows); +extern int32_t filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t numOfCols, int32_t numOfRows, + bool *keep); /* condition split interface */ int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond, SNode **pOtherCond); -bool filterIsMultiTableColsCond(SNode *pCond); +int32_t filterIsMultiTableColsCond(SNode *pCond, bool *res); EConditionType filterClassifyCondition(SNode *pNode); #ifdef __cplusplus diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 6e001f303e..9c760a465a 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -597,6 +597,7 @@ int32_t taosGetErrSize(); #define TSDB_CODE_QRY_GEO_NOT_SUPPORT_ERROR TAOS_DEF_ERROR_CODE(0, 0x0731) #define TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x0732) #define TSDB_CODE_QRY_INVALID_JOIN_CONDITION TAOS_DEF_ERROR_CODE(0, 0x0733) +#define TSDB_CODE_QRY_FILTER_NOT_SUPPORT_TYPE TAOS_DEF_ERROR_CODE(0, 0x0734) // grant #define TSDB_CODE_GRANT_EXPIRED TAOS_DEF_ERROR_CODE(0, 0x0800) diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index 678d8d569e..486f8b3ce8 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -220,14 +220,14 @@ static int32_t doDynamicPruneDataBlock(SOperatorInfo* pOperator, SDataBlockInfo* return code; } -static bool doFilterByBlockSMA(SFilterInfo* pFilterInfo, SColumnDataAgg* pColsAgg, int32_t numOfCols, - int32_t numOfRows) { +static int32_t doFilterByBlockSMA(SFilterInfo* pFilterInfo, SColumnDataAgg* pColsAgg, int32_t numOfCols, + int32_t numOfRows, bool *keep) { if (pColsAgg == NULL || pFilterInfo == NULL) { - return true; + *keep = true; + return TSDB_CODE_SUCCESS; } - bool keep = filterRangeExecute(pFilterInfo, pColsAgg, numOfCols, numOfRows); - return keep; + return filterRangeExecute(pFilterInfo, pColsAgg, numOfCols, numOfRows, keep); } static bool doLoadBlockSMA(STableScanBase* pTableScanInfo, SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo) { @@ -351,7 +351,11 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanBase* pTableSca bool success = doLoadBlockSMA(pTableScanInfo, pBlock, pTaskInfo); if (success) { size_t size = taosArrayGetSize(pBlock->pDataBlock); - bool keep = doFilterByBlockSMA(pOperator->exprSupp.pFilterInfo, pBlock->pBlockAgg, size, pBlockInfo->rows); + bool keep = false; + int32_t code = doFilterByBlockSMA(pOperator->exprSupp.pFilterInfo, pBlock->pBlockAgg, size, pBlockInfo->rows, &keep); + if (TSDB_CODE_SUCCESS != code) { + return code; + } if (!keep) { qDebug("%s data block filter out by block SMA, brange:%" PRId64 "-%" PRId64 ", rows:%" PRId64, GET_TASKID(pTaskInfo), pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows); diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index 05ee27f6de..b1db171875 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -5045,7 +5045,13 @@ static int32_t hashJoinOptSplitPrimFromLogicCond(SNode **pCondition, SNode **pPr SNodeList *pPrimaryKeyConds = NULL; SNode *pCond = NULL; WHERE_EACH(pCond, pLogicCond->pParameterList) { - if (filterIsMultiTableColsCond(pCond) || COND_TYPE_PRIMARY_KEY != filterClassifyCondition(pCond)) { + bool result = false; + code = filterIsMultiTableColsCond(pCond, &result); + if (TSDB_CODE_SUCCESS != code) { + break; + } + + if (result || COND_TYPE_PRIMARY_KEY != filterClassifyCondition(pCond)) { WHERE_NEXT; continue; } @@ -5089,7 +5095,12 @@ int32_t hashJoinOptSplitPrimCond(SNode **pCondition, SNode **pPrimaryKeyCond) { } bool needOutput = false; - if (filterIsMultiTableColsCond(*pCondition)) { + bool result = false; + int32_t code = filterIsMultiTableColsCond(*pCondition, &result); + if (TSDB_CODE_SUCCESS != code) { + return code; + } + if (result) { return TSDB_CODE_SUCCESS; } diff --git a/source/libs/scalar/inc/filterInt.h b/source/libs/scalar/inc/filterInt.h index 4296abb588..964efa8291 100644 --- a/source/libs/scalar/inc/filterInt.h +++ b/source/libs/scalar/inc/filterInt.h @@ -98,7 +98,7 @@ typedef struct SFilterRange { typedef bool (*rangeCompFunc)(const void *, const void *, const void *, const void *, __compar_fn_t); typedef int32_t (*filter_desc_compare_func)(const void *, const void *); -typedef bool (*filter_exec_func)(void *, int32_t, SColumnInfoData *, SColumnDataAgg *, int16_t, int32_t *); +typedef int32_t (*filter_exec_func)(void *, int32_t, SColumnInfoData *, SColumnDataAgg *, int16_t, int32_t *, bool *); typedef int32_t (*filer_get_col_from_name)(void *, int32_t, char *, void **); typedef struct SFilterDataInfo { @@ -363,7 +363,8 @@ struct SFilterInfo { } while (0) #define INSERT_RANGE(ctx, r, ra) \ do { \ - SFilterRangeNode *n = filterNewRange(ctx, ra); \ + SFilterRangeNode *n = NULL; \ + FLT_ERR_RET(filterNewRange(ctx, ra, &n)); \ n->prev = (r)->prev; \ if ((r)->prev) { \ (r)->prev->next = n; \ @@ -375,7 +376,8 @@ struct SFilterInfo { } while (0) #define APPEND_RANGE(ctx, r, ra) \ do { \ - SFilterRangeNode *n = filterNewRange(ctx, ra); \ + SFilterRangeNode *n = NULL; \ + FLT_ERR_RET(filterNewRange(ctx, ra, &n)); \ n->prev = (r); \ if (r) { \ (r)->next = n; \ @@ -494,7 +496,7 @@ struct SFilterInfo { #define FILTER_EMPTY_RES(i) FILTER_GET_FLAG((i)->status, FI_STATUS_EMPTY) extern bool filterDoCompare(__compar_fn_t func, uint8_t optr, void *left, void *right); -extern __compar_fn_t filterGetCompFunc(int32_t type, int32_t optr); +extern int32_t filterGetCompFunc(__compar_fn_t *func, int32_t type, int32_t optr); extern __compar_fn_t filterGetCompFuncEx(int32_t lType, int32_t rType, int32_t optr); #ifdef __cplusplus diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h index 8278da0ed0..836cf7d69a 100644 --- a/source/libs/scalar/inc/sclInt.h +++ b/source/libs/scalar/inc/sclInt.h @@ -95,11 +95,11 @@ int32_t sclConvertToTsValueNode(int8_t precision, SValueNode* valueNode); #define GET_PARAM_PRECISON(_c) ((_c)->columnData->info.precision) void sclFreeParam(SScalarParam* param); -void doVectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, +int32_t doVectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, int32_t _ord, int32_t optr); -void vectorCompareImpl(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, - int32_t _ord, int32_t optr); -void vectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t _ord, int32_t optr); +int32_t vectorCompareImpl(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, + int32_t _ord, int32_t optr); +int32_t vectorCompare(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t _ord, int32_t optr); #ifdef __cplusplus } diff --git a/source/libs/scalar/inc/sclvector.h b/source/libs/scalar/inc/sclvector.h index e633b39223..000329be1f 100644 --- a/source/libs/scalar/inc/sclvector.h +++ b/source/libs/scalar/inc/sclvector.h @@ -104,7 +104,7 @@ static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType) } typedef void (*_bufConverteFunc)(char *buf, SScalarParam *pOut, int32_t outType, int32_t *overflow); -typedef void (*_bin_scalar_fn_t)(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *output, int32_t order); +typedef int32_t (*_bin_scalar_fn_t)(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *output, int32_t order); _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binOperator); #ifdef __cplusplus diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 72e38c7a0d..b551851232 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -177,34 +177,40 @@ __compar_fn_t gUint64SignCompare[] = {compareUint64Int8, compareUint64Int16, co compareUint64Int64, compareUint64Float, compareUint64Double}; __compar_fn_t gUint64UsignCompare[] = {compareUint64Uint8, compareUint64Uint16, compareUint64Uint32, compareUint64Val}; -int8_t filterGetCompFuncIdx(int32_t type, int32_t optr, bool scalarMode) { - int8_t comparFn = 0; - +int32_t filterGetCompFuncIdx(int32_t type, int32_t optr, int8_t *comparFn, bool scalarMode) { + int32_t code = TSDB_CODE_SUCCESS; if (optr == OP_TYPE_IN && (type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_VARBINARY && type != TSDB_DATA_TYPE_NCHAR && type != TSDB_DATA_TYPE_GEOMETRY)) { switch (type) { case TSDB_DATA_TYPE_BOOL: case TSDB_DATA_TYPE_TINYINT: case TSDB_DATA_TYPE_UTINYINT: - return 15; + *comparFn = 15; + break; case TSDB_DATA_TYPE_SMALLINT: case TSDB_DATA_TYPE_USMALLINT: - return 16; + *comparFn = 16; + break; case TSDB_DATA_TYPE_INT: case TSDB_DATA_TYPE_UINT: case TSDB_DATA_TYPE_FLOAT: - return 17; + *comparFn = 17; + break; case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_UBIGINT: case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_TIMESTAMP: - return 18; + *comparFn = 18; + break; case TSDB_DATA_TYPE_JSON: - terrno = TSDB_CODE_QRY_JSON_IN_ERROR; - return 0; + *comparFn = 0; + code = TSDB_CODE_QRY_JSON_IN_ERROR; + break; default: - return 0; + *comparFn = 0; + break; } + return code; } if (optr == OP_TYPE_NOT_IN && (type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_VARBINARY && type != TSDB_DATA_TYPE_NCHAR && type != TSDB_DATA_TYPE_GEOMETRY)) { @@ -212,25 +218,32 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr, bool scalarMode) { case TSDB_DATA_TYPE_BOOL: case TSDB_DATA_TYPE_TINYINT: case TSDB_DATA_TYPE_UTINYINT: - return 21; + *comparFn = 21; + break; case TSDB_DATA_TYPE_SMALLINT: case TSDB_DATA_TYPE_USMALLINT: - return 22; + *comparFn = 22; + break; case TSDB_DATA_TYPE_INT: case TSDB_DATA_TYPE_UINT: case TSDB_DATA_TYPE_FLOAT: - return 23; + *comparFn = 23; + break; case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_UBIGINT: case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_TIMESTAMP: - return 24; + *comparFn = 24; + break; case TSDB_DATA_TYPE_JSON: - terrno = TSDB_CODE_QRY_JSON_IN_ERROR; - return 0; + *comparFn = 0; + code = TSDB_CODE_QRY_JSON_IN_ERROR; + break; default: - return 0; + *comparFn = 0; + break; } + return code; } // if (optr == OP_TYPE_JSON_CONTAINS && type == TSDB_DATA_TYPE_JSON) { @@ -240,49 +253,49 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr, bool scalarMode) { switch (type) { case TSDB_DATA_TYPE_BOOL: case TSDB_DATA_TYPE_TINYINT: - comparFn = 1; + *comparFn = 1; break; case TSDB_DATA_TYPE_SMALLINT: - comparFn = 2; + *comparFn = 2; break; case TSDB_DATA_TYPE_INT: - comparFn = 0; + *comparFn = 0; break; case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_TIMESTAMP: - comparFn = 3; + *comparFn = 3; break; case TSDB_DATA_TYPE_FLOAT: - comparFn = 4; + *comparFn = 4; break; case TSDB_DATA_TYPE_DOUBLE: - comparFn = 5; + *comparFn = 5; break; case TSDB_DATA_TYPE_VARBINARY:{ if (optr == OP_TYPE_IN) { - comparFn = 8; + *comparFn = 8; } else if (optr == OP_TYPE_NOT_IN) { - comparFn = 25; + *comparFn = 25; } else { /* normal relational comparFn */ - comparFn = 30; + *comparFn = 30; } break; } case TSDB_DATA_TYPE_BINARY: { if (optr == OP_TYPE_MATCH) { - comparFn = 19; + *comparFn = 19; } else if (optr == OP_TYPE_NMATCH) { - comparFn = 20; + *comparFn = 20; } else if (optr == OP_TYPE_LIKE) { /* wildcard query using like operator */ - comparFn = 7; + *comparFn = 7; } else if (optr == OP_TYPE_NOT_LIKE) { /* wildcard query using like operator */ - comparFn = 26; + *comparFn = 26; } else if (optr == OP_TYPE_IN) { - comparFn = 8; + *comparFn = 8; } else if (optr == OP_TYPE_NOT_IN) { - comparFn = 25; + *comparFn = 25; } else { /* normal relational comparFn */ - comparFn = 6; + *comparFn = 6; } break; @@ -290,19 +303,19 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr, bool scalarMode) { case TSDB_DATA_TYPE_NCHAR: { if (optr == OP_TYPE_MATCH) { - comparFn = scalarMode ? 28 : 19; + *comparFn = scalarMode ? 28 : 19; } else if (optr == OP_TYPE_NMATCH) { - comparFn = scalarMode ? 29 : 20; + *comparFn = scalarMode ? 29 : 20; } else if (optr == OP_TYPE_LIKE) { - comparFn = 9; + *comparFn = 9; } else if (optr == OP_TYPE_NOT_LIKE) { - comparFn = 27; + *comparFn = 27; } else if (optr == OP_TYPE_IN) { - comparFn = 8; + *comparFn = 8; } else if (optr == OP_TYPE_NOT_IN) { - comparFn = 25; + *comparFn = 25; } else { - comparFn = 10; + *comparFn = 10; } break; } @@ -310,40 +323,45 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr, bool scalarMode) { case TSDB_DATA_TYPE_GEOMETRY: { if (optr == OP_TYPE_EQUAL || optr == OP_TYPE_NOT_EQUAL || optr == OP_TYPE_IS_NULL || optr == OP_TYPE_IS_NOT_NULL) { - comparFn = 30; + *comparFn = 30; } else if (optr == OP_TYPE_IN) { - comparFn = 8; + *comparFn = 8; } else if (optr == OP_TYPE_NOT_IN) { - comparFn = 25; + *comparFn = 25; } else { - terrno = TSDB_CODE_QRY_GEO_NOT_SUPPORT_ERROR; - return 0; + *comparFn = 0; + code = TSDB_CODE_QRY_GEO_NOT_SUPPORT_ERROR; } break; } case TSDB_DATA_TYPE_UTINYINT: - comparFn = 11; + *comparFn = 11; break; case TSDB_DATA_TYPE_USMALLINT: - comparFn = 12; + *comparFn = 12; break; case TSDB_DATA_TYPE_UINT: - comparFn = 13; + *comparFn = 13; break; case TSDB_DATA_TYPE_UBIGINT: - comparFn = 14; + *comparFn = 14; break; default: - comparFn = 0; + *comparFn = 0; break; } - return comparFn; + return code; } -__compar_fn_t filterGetCompFunc(int32_t type, int32_t optr) { return gDataCompare[filterGetCompFuncIdx(type, optr, true)]; } +int32_t filterGetCompFunc(__compar_fn_t *func, int32_t type, int32_t optr) { + int8_t compFuncIdx = 0; + int32_t code = filterGetCompFuncIdx(type, optr, &compFuncIdx, true); + *func = gDataCompare[compFuncIdx]; + return code; +} __compar_fn_t filterGetCompFuncEx(int32_t lType, int32_t rType, int32_t optr) { if (TSDB_DATA_TYPE_NULL == rType || TSDB_DATA_TYPE_JSON == rType) { @@ -447,49 +465,62 @@ static FORCE_INLINE int32_t filterCompareGroupCtx(const void *pLeft, const void int32_t filterInitUnitsFields(SFilterInfo *info) { info->unitSize = FILTER_DEFAULT_UNIT_SIZE; info->units = taosMemoryCalloc(info->unitSize, sizeof(SFilterUnit)); + if (info->units == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } info->fields[FLD_TYPE_COLUMN].num = 0; info->fields[FLD_TYPE_COLUMN].size = FILTER_DEFAULT_FIELD_SIZE; info->fields[FLD_TYPE_COLUMN].fields = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].size, sizeof(SFilterField)); + if (info->fields[FLD_TYPE_COLUMN].fields == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } info->fields[FLD_TYPE_VALUE].num = 0; info->fields[FLD_TYPE_VALUE].size = FILTER_DEFAULT_FIELD_SIZE; info->fields[FLD_TYPE_VALUE].fields = taosMemoryCalloc(info->fields[FLD_TYPE_VALUE].size, sizeof(SFilterField)); + if (info->fields[FLD_TYPE_VALUE].fields == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } return TSDB_CODE_SUCCESS; } -static FORCE_INLINE SFilterRangeNode *filterNewRange(SFilterRangeCtx *ctx, SFilterRange *ra) { - SFilterRangeNode *r = NULL; +static FORCE_INLINE int32_t filterNewRange(SFilterRangeCtx *ctx, SFilterRange *ra, SFilterRangeNode **r) { if (ctx->rf) { - r = ctx->rf; + *r = ctx->rf; ctx->rf = ctx->rf->next; - r->prev = NULL; - r->next = NULL; + (*r)->prev = NULL; + (*r)->next = NULL; } else { - r = taosMemoryCalloc(1, sizeof(SFilterRangeNode)); + *r = taosMemoryCalloc(1, sizeof(SFilterRangeNode)); + if (*r == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } } - FILTER_COPY_RA(&r->ra, ra); + FILTER_COPY_RA(&(*r)->ra, ra); - return r; + return TSDB_CODE_SUCCESS; } -void *filterInitRangeCtx(int32_t type, int32_t options) { +int32_t filterInitRangeCtx(int32_t type, int32_t options, SFilterRangeCtx **ctx) { if (type > TSDB_DATA_TYPE_UBIGINT || type < TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_VARBINARY || type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_GEOMETRY) { qError("not supported range type:%d", type); - return NULL; + return TSDB_CODE_QRY_FILTER_NOT_SUPPORT_TYPE; } - SFilterRangeCtx *ctx = taosMemoryCalloc(1, sizeof(SFilterRangeCtx)); + *ctx = taosMemoryCalloc(1, sizeof(SFilterRangeCtx)); + if (*ctx == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } + (*ctx)->type = type; + (*ctx)->options = options; + (*ctx)->pCompareFunc = getComparFunc(type, 0); - ctx->type = type; - ctx->options = options; - ctx->pCompareFunc = getComparFunc(type, 0); - - return ctx; + return TSDB_CODE_SUCCESS; } int32_t filterResetRangeCtx(SFilterRangeCtx *ctx) { @@ -517,7 +548,7 @@ int32_t filterResetRangeCtx(SFilterRangeCtx *ctx) { } int32_t filterReuseRangeCtx(SFilterRangeCtx *ctx, int32_t type, int32_t options) { - filterResetRangeCtx(ctx); + FLT_ERR_RET(filterResetRangeCtx(ctx)); ctx->type = type; ctx->options = options; @@ -697,11 +728,11 @@ int32_t filterAddRangeImpl(void *h, SFilterRange *ra, int32_t optr) { if (ctx->rs && ctx->rs->next == NULL) { bool notnull; - filterConvertRange(ctx, &ctx->rs->ra, ¬null); + FLT_ERR_RET(filterConvertRange(ctx, &ctx->rs->ra, ¬null)); if (notnull) { bool all = false; FREE_FROM_RANGE(ctx, ctx->rs); - filterAddRangeOptr(h, OP_TYPE_IS_NOT_NULL, optr, NULL, &all); + FLT_ERR_RET(filterAddRangeOptr(h, OP_TYPE_IS_NOT_NULL, optr, NULL, &all)); if (all) { FILTER_SET_FLAG(ctx->status, MR_ST_ALL); } @@ -741,7 +772,7 @@ int32_t filterAddRangeCtx(void *dst, void *src, int32_t optr) { SFilterRangeNode *r = sctx->rs; while (r) { - filterAddRange(dctx, &r->ra, optr); + FLT_ERR_RET(filterAddRange(dctx, &r->ra, optr)); r = r->next; } @@ -810,7 +841,7 @@ int32_t filterFinishRange(void *h) { } int32_t filterGetRangeNum(void *h, int32_t *num) { - filterFinishRange(h); + FLT_ERR_RET(filterFinishRange(h)); SFilterRangeCtx *ctx = (SFilterRangeCtx *)h; @@ -827,7 +858,7 @@ int32_t filterGetRangeNum(void *h, int32_t *num) { } int32_t filterGetRangeRes(void *h, SFilterRange *ra) { - filterFinishRange(h); + FLT_ERR_RET(filterFinishRange(h)); SFilterRangeCtx *ctx = (SFilterRangeCtx *)h; uint32_t num = 0; @@ -857,24 +888,24 @@ int32_t filterSourceRangeFromCtx(SFilterRangeCtx *ctx, void *sctx, int32_t optr, SFilterRangeCtx *src = (SFilterRangeCtx *)sctx; if (src->isnull) { - filterAddRangeOptr(ctx, OP_TYPE_IS_NULL, optr, empty, all); + FLT_ERR_RET(filterAddRangeOptr(ctx, OP_TYPE_IS_NULL, optr, empty, all)); if (FILTER_GET_FLAG(ctx->status, MR_ST_ALL)) { *all = true; } } if (src->notnull) { - filterAddRangeOptr(ctx, OP_TYPE_IS_NOT_NULL, optr, empty, all); + FLT_ERR_RET(filterAddRangeOptr(ctx, OP_TYPE_IS_NOT_NULL, optr, empty, all)); if (FILTER_GET_FLAG(ctx->status, MR_ST_ALL)) { *all = true; } } if (src->isrange) { - filterAddRangeOptr(ctx, 0, optr, empty, all); + FLT_ERR_RET(filterAddRangeOptr(ctx, 0, optr, empty, all)); if (!(optr == LOGIC_COND_TYPE_OR && ctx->notnull)) { - filterAddRangeCtx(ctx, src, optr); + FLT_ERR_RET(filterAddRangeCtx(ctx, src, optr)); } if (FILTER_GET_FLAG(ctx->status, MR_ST_ALL)) { @@ -917,12 +948,17 @@ int32_t filterDetachCnfGroup(SFilterGroup *gp1, SFilterGroup *gp2, SArray *group gp.unitNum = gp1->unitNum + gp2->unitNum; gp.unitIdxs = taosMemoryCalloc(gp.unitNum, sizeof(*gp.unitIdxs)); + if (NULL == gp.unitIdxs) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } memcpy(gp.unitIdxs, gp1->unitIdxs, gp1->unitNum * sizeof(*gp.unitIdxs)); memcpy(gp.unitIdxs + gp1->unitNum, gp2->unitIdxs, gp2->unitNum * sizeof(*gp.unitIdxs)); gp.unitFlags = NULL; - taosArrayPush(group, &gp); + if (NULL == taosArrayPush(group, &gp)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } return TSDB_CODE_SUCCESS; } @@ -939,7 +975,9 @@ int32_t filterDetachCnfGroups(SArray *group, SArray *left, SArray *right) { SFilterGroup *gp = NULL; while ((gp = (SFilterGroup *)taosArrayPop(right)) != NULL) { - taosArrayPush(group, gp); + if (NULL == taosArrayPush(group, gp)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } return TSDB_CODE_SUCCESS; @@ -948,7 +986,9 @@ int32_t filterDetachCnfGroups(SArray *group, SArray *left, SArray *right) { if (taosArrayGetSize(right) <= 0) { SFilterGroup *gp = NULL; while ((gp = (SFilterGroup *)taosArrayPop(left)) != NULL) { - taosArrayPush(group, gp); + if (NULL == taosArrayPush(group, gp)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } return TSDB_CODE_SUCCESS; @@ -960,7 +1000,7 @@ int32_t filterDetachCnfGroups(SArray *group, SArray *left, SArray *right) { for (int32_t r = 0; r < rightSize; ++r) { SFilterGroup *gp2 = taosArrayGet(right, r); - filterDetachCnfGroup(gp1, gp2, group); + FLT_ERR_RET(filterDetachCnfGroup(gp1, gp2, group)); } } @@ -1018,6 +1058,9 @@ int32_t filterAddField(SFilterInfo *info, void *desc, void **data, int32_t type, info->fields[type].size += FILTER_DEFAULT_FIELD_SIZE; info->fields[type].fields = taosMemoryRealloc(info->fields[type].fields, info->fields[type].size * sizeof(SFilterField)); + if (info->fields[type].fields == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } } info->fields[type].fields[idx].flag = type; @@ -1057,7 +1100,7 @@ int32_t filterAddField(SFilterInfo *info, void *desc, void **data, int32_t type, } static FORCE_INLINE int32_t filterAddColFieldFromField(SFilterInfo *info, SFilterField *field, SFilterFieldId *fid) { - filterAddField(info, field->desc, &field->data, FILTER_GET_TYPE(field->flag), fid, 0, false, NULL); + FLT_ERR_RET(filterAddField(info, field->desc, &field->data, FILTER_GET_TYPE(field->flag), fid, 0, false, NULL)); FILTER_SET_FLAG(field->flag, FLD_DATA_NO_FREE); @@ -1086,7 +1129,7 @@ int32_t filterAddFieldFromNode(SFilterInfo *info, SNode *node, SFilterFieldId *f v = node; } - filterAddField(info, v, NULL, type, fid, 0, true, NULL); + FLT_ERR_RET(filterAddField(info, v, NULL, type, fid, 0, true, NULL)); _return: return TSDB_CODE_SUCCESS; @@ -1187,7 +1230,7 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { SOperatorNode *node = (SOperatorNode *)tree; int32_t ret = TSDB_CODE_SUCCESS; SFilterFieldId left = {0}, right = {0}; - filterAddFieldFromNode(info, node->pLeft, &left); + FLT_ERR_RET(filterAddFieldFromNode(info, node->pLeft, &left)); uint8_t type = FILTER_GET_COL_FIELD_TYPE(FILTER_GET_FIELD(info, left)); int32_t len = 0; uint32_t uidx = 0; @@ -1198,6 +1241,9 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { SListCell *cell = listNode->pNodeList->pHead; SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))}; + if (out.columnData == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } out.columnData->info.type = type; out.columnData->info.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes; // reserved space for simple_copy @@ -1218,35 +1264,51 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { len = tDataTypes[type].bytes; - filterAddField(info, NULL, (void **)&out.columnData->pData, FLD_TYPE_VALUE, &right, len, true, NULL); + code = filterAddField(info, NULL, (void **)&out.columnData->pData, FLD_TYPE_VALUE, &right, len, true, NULL); + if (TSDB_CODE_SUCCESS != code) { + break; + } out.columnData->pData = NULL; } else { void *data = taosMemoryCalloc(1, tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes); // reserved space for simple_copy if (NULL == data) { - FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + code = TSDB_CODE_OUT_OF_MEMORY; + break; } memcpy(data, nodesGetValueFromNode(valueNode), tDataTypes[type].bytes); - filterAddField(info, NULL, (void **)&data, FLD_TYPE_VALUE, &right, len, true, NULL); + code = filterAddField(info, NULL, (void **)&data, FLD_TYPE_VALUE, &right, len, true, NULL); + if (TSDB_CODE_SUCCESS != code) { + break; + } + } + code = filterAddUnit(info, OP_TYPE_EQUAL, &left, &right, &uidx); + if (TSDB_CODE_SUCCESS != code) { + break; } - filterAddUnit(info, OP_TYPE_EQUAL, &left, &right, &uidx); - SFilterGroup fgroup = {0}; - filterAddUnitToGroup(&fgroup, uidx); - - taosArrayPush(group, &fgroup); + code = filterAddUnitToGroup(&fgroup, uidx); + if (TSDB_CODE_SUCCESS != code) { + break; + } + if (NULL == taosArrayPush(group, &fgroup)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } cell = cell->pNext; } colDataDestroy(out.columnData); taosMemoryFree(out.columnData); + FLT_ERR_RET(code); } else { - filterAddFieldFromNode(info, node->pRight, &right); + FLT_ERR_RET(filterAddFieldFromNode(info, node->pRight, &right)); FLT_ERR_RET(filterAddUnit(info, node->opType, &left, &right, &uidx)); SFilterGroup fgroup = {0}; - filterAddUnitToGroup(&fgroup, uidx); + FLT_ERR_RET(filterAddUnitToGroup(&fgroup, uidx)); - taosArrayPush(group, &fgroup); + if (NULL == taosArrayPush(group, &fgroup)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } return TSDB_CODE_SUCCESS; @@ -1257,7 +1319,7 @@ int32_t filterAddUnitFromUnit(SFilterInfo *dst, SFilterInfo *src, SFilterUnit *u uint8_t type = FILTER_UNIT_DATA_TYPE(u); uint16_t flag = 0; - filterAddField(dst, FILTER_UNIT_COL_DESC(src, u), NULL, FLD_TYPE_COLUMN, &left, 0, false, NULL); + FLT_ERR_RET(filterAddField(dst, FILTER_UNIT_COL_DESC(src, u), NULL, FLD_TYPE_COLUMN, &left, 0, false, NULL)); SFilterField *t = FILTER_UNIT_LEFT_FIELD(src, u); if (u->right.type == FLD_TYPE_VALUE) { @@ -1266,16 +1328,16 @@ int32_t filterAddUnitFromUnit(SFilterInfo *dst, SFilterInfo *src, SFilterUnit *u if (IS_VAR_DATA_TYPE(type)) { if (FILTER_UNIT_OPTR(u) == OP_TYPE_IN) { - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, POINTER_BYTES, false, - &rField->flag); // POINTER_BYTES should be sizeof(SHashObj), but POINTER_BYTES is also right. + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, POINTER_BYTES, false, &rField->flag)); + // POINTER_BYTES should be sizeof(SHashObj), but POINTER_BYTES is also right. t = FILTER_GET_FIELD(dst, right); FILTER_SET_FLAG(t->flag, FLD_DATA_IS_HASH); } else { - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, varDataTLen(data), false, &rField->flag); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, varDataTLen(data), false, &rField->flag)); } } else { - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, false, &rField->flag); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, false, &rField->flag)); } } else { pright = NULL; @@ -1299,22 +1361,22 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan SFilterField *col = FILTER_GET_COL_FIELD(src, cidx); - filterAddColFieldFromField(dst, col, &left); + FLT_ERR_RET(filterAddColFieldFromField(dst, col, &left)); int32_t type = FILTER_GET_COL_FIELD_TYPE(FILTER_GET_FIELD(dst, left)); if (optr == LOGIC_COND_TYPE_AND) { if (ctx->isnull) { ASSERT(ctx->notnull == false && ctx->isrange == false); - filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); return TSDB_CODE_SUCCESS; } if (ctx->notnull) { ASSERT(ctx->isnull == false && ctx->isrange == false); - filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); return TSDB_CODE_SUCCESS; } @@ -1333,44 +1395,59 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan __compar_fn_t func = getComparFunc(type, 0); if (func(&ra->s, &ra->e) == 0) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &ra->s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, OP_TYPE_EQUAL, &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_EQUAL, &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); return TSDB_CODE_SUCCESS; } else { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &ra->s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); void *data2 = taosMemoryMalloc(sizeof(int64_t)); + if (data2 == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data2, &ra->e); - filterAddField(dst, NULL, &data2, FLD_TYPE_VALUE, &right2, tDataTypes[type].bytes, true, NULL); + FLT_ERR_RET(filterAddField(dst, NULL, &data2, FLD_TYPE_VALUE, &right2, tDataTypes[type].bytes, true, NULL)); - filterAddUnitImpl( + FLT_ERR_RET(filterAddUnitImpl( dst, FILTER_GET_FLAG(ra->sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, &left, &right, FILTER_GET_FLAG(ra->eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, &right2, - &uidx); - filterAddUnitToGroup(g, uidx); + &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); return TSDB_CODE_SUCCESS; } } if (!FILTER_GET_FLAG(ra->sflag, RANGE_FLG_NULL)) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &ra->s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, FILTER_GET_FLAG(ra->sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, - &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, FILTER_GET_FLAG(ra->sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, + &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } if (!FILTER_GET_FLAG(ra->eflag, RANGE_FLG_NULL)) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &ra->e); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, FILTER_GET_FLAG(ra->eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, - &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, FILTER_GET_FLAG(ra->eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, + &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } return TSDB_CODE_SUCCESS; @@ -1384,18 +1461,22 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan ASSERT(ctx->isnull || ctx->notnull || ctx->isrange); if (ctx->isnull) { - filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx); - filterAddUnitToGroup(g, uidx); - taosArrayPush(res, g); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_IS_NULL, &left, NULL, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); + if (NULL == taosArrayPush(res,g)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } if (ctx->notnull) { ASSERT(!ctx->isrange); memset(g, 0, sizeof(*g)); - filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx); - filterAddUnitToGroup(g, uidx); - taosArrayPush(res, g); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); + if (NULL == taosArrayPush(res,g)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } if (!ctx->isrange) { @@ -1413,26 +1494,37 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan __compar_fn_t func = getComparFunc(type, 0); if (func(&r->ra.s, &r->ra.e) == 0) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &r->ra.s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, OP_TYPE_EQUAL, &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_EQUAL, &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } else { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &r->ra.s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); void *data2 = taosMemoryMalloc(sizeof(int64_t)); + if (data2 == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data2, &r->ra.e); - filterAddField(dst, NULL, &data2, FLD_TYPE_VALUE, &right2, tDataTypes[type].bytes, true, NULL); + FLT_ERR_RET(filterAddField(dst, NULL, &data2, FLD_TYPE_VALUE, &right2, tDataTypes[type].bytes, true, NULL)); - filterAddUnitImpl( - dst, FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, &left, - &right, FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, &right2, - &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddUnitImpl( + dst, FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, &left, + &right, FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, &right2, + &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } - taosArrayPush(res, g); + if (NULL == taosArrayPush(res,g)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } r = r->next; @@ -1441,25 +1533,33 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan if (!FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_NULL)) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &r->ra.s); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, - &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_GREATER_THAN : OP_TYPE_GREATER_EQUAL, + &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } if (!FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_NULL)) { void *data = taosMemoryMalloc(sizeof(int64_t)); + if (data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SIMPLE_COPY_VALUES(data, &r->ra.e); - filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL); - filterAddUnit(dst, FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, - &left, &right, &uidx); - filterAddUnitToGroup(g, uidx); + FLT_ERR_RET(filterAddField(dst, NULL, &data, FLD_TYPE_VALUE, &right, tDataTypes[type].bytes, true, NULL)); + FLT_ERR_RET(filterAddUnit(dst, FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? OP_TYPE_LOWER_THAN : OP_TYPE_LOWER_EQUAL, + &left, &right, &uidx)); + FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); } ASSERT(g->unitNum > 0); - taosArrayPush(res, g); + if (NULL == taosArrayPush(res,g)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } r = r->next; } @@ -1493,7 +1593,13 @@ EDealRes fltTreeToGroup(SNode *pNode, void *pContext) { SListCell *cell = node->pParameterList->pHead; for (int32_t i = 0; i < node->pParameterList->length; ++i) { newGroup = taosArrayInit(4, sizeof(SFilterGroup)); + if (NULL == newGroup) { + FLT_ERR_RET(terrno); + } resGroup = taosArrayInit(4, sizeof(SFilterGroup)); + if (NULL == resGroup) { + FLT_ERR_RET(terrno); + } SFltBuildGroupCtx tctx = {.info = ctx->info, .group = newGroup}; nodesWalkExpr(cell->pNode, fltTreeToGroup, (void *)&tctx); @@ -1645,11 +1751,11 @@ int32_t fltConverToStr(char *str, int type, void *buf, int32_t bufSize, int32_t return TSDB_CODE_SUCCESS; } -void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) { +int32_t filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) { if (qDebugFlag & DEBUG_DEBUG) { if (info == NULL) { fltDebug("%s - FilterInfo: EMPTY", msg); - return; + return TSDB_CODE_SUCCESS; } if (options == 0) { @@ -1700,7 +1806,9 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) tlen = varDataLen(data); data += VARSTR_HEADER_SIZE; } - if (data) fltConverToStr(str + len, type, data, tlen > 32 ? 32 : tlen, &tlen); + if (data) { + FLT_ERR_RET(fltConverToStr(str + len, type, data, tlen > 32 ? 32 : tlen, &tlen)); + } } else { strcat(str, "NULL"); } @@ -1720,7 +1828,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) tlen = varDataLen(data); data += VARSTR_HEADER_SIZE; } - fltConverToStr(str + strlen(str), type, data, tlen > 32 ? 32 : tlen, &tlen); + FLT_ERR_RET(fltConverToStr(str + strlen(str), type, data, tlen > 32 ? 32 : tlen, &tlen)); } else { strcat(str, "NULL"); } @@ -1741,7 +1849,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) } } - return; + return TSDB_CODE_SUCCESS; } if (options == 1) { @@ -1761,7 +1869,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) strcat(str, "(NULL)"); } else { FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? strcat(str, "(") : strcat(str, "["); - fltConverToStr(str + strlen(str), ctx->type, &r->ra.s, tlen > 32 ? 32 : tlen, &tlen); + FLT_ERR_RET(fltConverToStr(str + strlen(str), ctx->type, &r->ra.s, tlen > 32 ? 32 : tlen, &tlen)); FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? strcat(str, ")") : strcat(str, "]"); } strcat(str, " - "); @@ -1769,7 +1877,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) strcat(str, "(NULL)"); } else { FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? strcat(str, "(") : strcat(str, "["); - fltConverToStr(str + strlen(str), ctx->type, &r->ra.e, tlen > 32 ? 32 : tlen, &tlen); + FLT_ERR_RET(fltConverToStr(str + strlen(str), ctx->type, &r->ra.e, tlen > 32 ? 32 : tlen, &tlen)); FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? strcat(str, ")") : strcat(str, "]"); } qDebug("range: %s", str); @@ -1779,17 +1887,17 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) } } - return; + return TSDB_CODE_SUCCESS; } qDebug("%s - Block Filter info:", msg); if (FILTER_GET_FLAG(info->blkFlag, FI_STATUS_BLK_ALL)) { qDebug("Flag:%s", "ALL"); - return; + return TSDB_CODE_SUCCESS; } else if (FILTER_GET_FLAG(info->blkFlag, FI_STATUS_BLK_EMPTY)) { qDebug("Flag:%s", "EMPTY"); - return; + return TSDB_CODE_SUCCESS; } else if (FILTER_GET_FLAG(info->blkFlag, FI_STATUS_BLK_ACTIVE)) { qDebug("Flag:%s", "ACTIVE"); } @@ -1804,6 +1912,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options) } } } + return TSDB_CODE_SUCCESS; } void filterFreeColInfo(void *data) { @@ -1816,7 +1925,7 @@ void filterFreeColInfo(void *data) { if (info->type == RANGE_TYPE_VAR_HASH) { // TODO } else if (info->type == RANGE_TYPE_MR_CTX) { - filterFreeRangeCtx(info->info); + (void)filterFreeRangeCtx(info->info); // No need to handle the return value. } else if (info->type == RANGE_TYPE_UNIT) { taosArrayDestroy((SArray *)info->info); } @@ -1831,7 +1940,7 @@ void filterFreeColCtx(void *data) { SFilterColCtx *ctx = (SFilterColCtx *)data; if (ctx->ctx) { - filterFreeRangeCtx(ctx->ctx); + (void)filterFreeRangeCtx(ctx->ctx); // No need to handle the return value. } } @@ -1913,7 +2022,7 @@ void filterFreeInfo(SFilterInfo *info) { taosMemoryFreeClear(info->unitFlags); for (uint32_t i = 0; i < info->colRangeNum; ++i) { - filterFreeRangeCtx(info->colRange[i]); + (void)filterFreeRangeCtx(info->colRange[i]); // No need to handle the return value. } taosMemoryFreeClear(info->colRange); @@ -1987,9 +2096,15 @@ int32_t fltInitValFieldData(SFilterInfo *info) { if (dType->type == type) { size_t bufBytes = TMAX(dType->bytes, sizeof(int64_t)); fi->data = taosMemoryCalloc(1, bufBytes); + if (fi->data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } assignVal(fi->data, nodesGetValueFromNode(var), dType->bytes, type); } else { SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))}; + if (out.columnData == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } out.columnData->info.type = type; out.columnData->info.precision = precision; if (!IS_VAR_DATA_TYPE(type)) { @@ -2008,6 +2123,9 @@ int32_t fltInitValFieldData(SFilterInfo *info) { size_t bufBytes = IS_VAR_DATA_TYPE(type) ? varDataTLen(out.columnData->pData) : TMAX(out.columnData->info.bytes, sizeof(int64_t)); fi->data = taosMemoryCalloc(1, bufBytes); + if (fi->data== NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } size_t valBytes = IS_VAR_DATA_TYPE(type) ? varDataTLen(out.columnData->pData) : out.columnData->info.bytes; memcpy(fi->data, out.columnData->pData, valBytes); @@ -2127,7 +2245,7 @@ int32_t filterAddUnitRange(SFilterInfo *info, SFilterUnit *u, SFilterRangeCtx *c return TSDB_CODE_APP_ERROR; } - filterAddRange(ctx, &ra, optr); + FLT_ERR_RET(filterAddRange(ctx, &ra, optr)); return TSDB_CODE_SUCCESS; } @@ -2166,17 +2284,19 @@ int32_t filterMergeUnits(SFilterInfo *info, SFilterGroupCtx *gRes, uint32_t colI SArray *colArray = (SArray *)gRes->colInfo[colIdx].info; int32_t size = (int32_t)taosArrayGetSize(colArray); int32_t type = gRes->colInfo[colIdx].dataType; - SFilterRangeCtx *ctx = filterInitRangeCtx(type, 0); + int32_t code = TSDB_CODE_SUCCESS; + SFilterRangeCtx *ctx = NULL; + FLT_ERR_JRET(filterInitRangeCtx(type, 0, &ctx)); for (uint32_t i = 0; i < size; ++i) { SFilterUnit *u = taosArrayGetP(colArray, i); uint8_t optr = FILTER_UNIT_OPTR(u); - filterAddRangeOptr(ctx, optr, LOGIC_COND_TYPE_AND, empty, NULL); + FLT_ERR_RET(filterAddRangeOptr(ctx, optr, LOGIC_COND_TYPE_AND, empty, NULL)); FLT_CHK_JMP(*empty); if (!FILTER_NO_MERGE_OPTR(optr)) { - filterAddUnitRange(info, u, ctx, LOGIC_COND_TYPE_AND); + FLT_ERR_JRET(filterAddUnitRange(info, u, ctx, LOGIC_COND_TYPE_AND)); FLT_CHK_JMP(MR_EMPTY_RES(ctx)); } if (FILTER_UNIT_OPTR(u) == OP_TYPE_EQUAL && !FILTER_NO_MERGE_DATA_TYPE(FILTER_UNIT_DATA_TYPE(u))) { @@ -2195,22 +2315,30 @@ _return: *empty = true; - filterFreeRangeCtx(ctx); + (void)filterFreeRangeCtx(ctx); // No need to handle the return value. return TSDB_CODE_SUCCESS; } int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gResNum) { bool empty = false; - uint32_t *colIdx = taosMemoryMalloc(info->fields[FLD_TYPE_COLUMN].num * sizeof(uint32_t)); uint32_t colIdxi = 0; uint32_t gResIdx = 0; - + uint32_t *colIdx = taosMemoryMalloc(info->fields[FLD_TYPE_COLUMN].num * sizeof(uint32_t)); + if (colIdx == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } for (uint32_t i = 0; i < info->groupNum; ++i) { SFilterGroup *g = info->groups + i; gRes[gResIdx] = taosMemoryCalloc(1, sizeof(SFilterGroupCtx)); + if (gRes[gResIdx] == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } gRes[gResIdx]->colInfo = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].num, sizeof(SFilterColInfo)); + if (gRes[gResIdx]->colInfo == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } colIdxi = 0; empty = false; @@ -2220,6 +2348,9 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t if (gRes[gResIdx]->colInfo[cidx].info == NULL) { gRes[gResIdx]->colInfo[cidx].info = (SArray *)taosArrayInit(4, POINTER_BYTES); + if (gRes[gResIdx]->colInfo[cidx].info == NULL) { + FLT_ERR_RET(terrno); + } colIdx[colIdxi++] = cidx; ++gRes[gResIdx]->colNum; } else { @@ -2242,7 +2373,7 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t continue; } - filterMergeUnits(info, gRes[gResIdx], colIdx[l], &empty); + FLT_ERR_RET(filterMergeUnits(info, gRes[gResIdx], colIdx[l], &empty)); if (empty) { break; @@ -2371,16 +2502,16 @@ int32_t filterMergeTwoGroupsImpl(SFilterInfo *info, SFilterRangeCtx **ctx, int32 int32_t type = FILTER_GET_COL_FIELD_TYPE(fi); if ((*ctx) == NULL) { - *ctx = filterInitRangeCtx(type, 0); + FLT_ERR_RET(filterInitRangeCtx(type, 0, ctx)); } else { - filterReuseRangeCtx(*ctx, type, 0); + FLT_ERR_RET(filterReuseRangeCtx(*ctx, type, 0)); } ASSERT(gRes2->colInfo[cidx].type == RANGE_TYPE_MR_CTX); ASSERT(gRes1->colInfo[cidx].type == RANGE_TYPE_MR_CTX); - filterCopyRangeCtx(*ctx, gRes2->colInfo[cidx].info); - filterSourceRangeFromCtx(*ctx, gRes1->colInfo[cidx].info, optr, empty, all); + FLT_ERR_RET(filterCopyRangeCtx(*ctx, gRes2->colInfo[cidx].info)); + FLT_ERR_RET(filterSourceRangeFromCtx(*ctx, gRes1->colInfo[cidx].info, optr, empty, all)); return TSDB_CODE_SUCCESS; } @@ -2401,7 +2532,11 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter uint32_t equal1 = 0, equal2 = 0, merNum = 0; SFilterRangeCtx *ctx = NULL; SFilterColCtx colCtx = {0}; + int32_t code = TSDB_CODE_SUCCESS; SArray *colCtxs = taosArrayInit((*gRes2)->colNum, sizeof(SFilterColCtx)); + if (colCtxs == NULL) { + FLT_ERR_JRET(terrno); + } for (; m < (*gRes1)->colNum; ++m) { idx1 = (*gRes1)->colIdx[m]; @@ -2417,7 +2552,7 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter ++merNum; - filterMergeTwoGroupsImpl(info, &ctx, LOGIC_COND_TYPE_OR, idx1, *gRes1, *gRes2, NULL, all); + FLT_ERR_JRET(filterMergeTwoGroupsImpl(info, &ctx, LOGIC_COND_TYPE_OR, idx1, *gRes1, *gRes2, NULL, all)); FLT_CHK_JMP(*all); @@ -2426,15 +2561,17 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter ++equal1; colCtx.colIdx = idx1; colCtx.ctx = ctx; - taosArrayPush(colCtxs, &colCtx); + if (NULL == taosArrayPush(colCtxs, &colCtx)) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } break; } else { - filterCompareRangeCtx(ctx, (*gRes1)->colInfo[idx1].info, &equal); + FLT_ERR_JRET(filterCompareRangeCtx(ctx, (*gRes1)->colInfo[idx1].info, &equal)); if (equal) { ++equal1; } - filterCompareRangeCtx(ctx, (*gRes2)->colInfo[idx2].info, &equal); + FLT_ERR_JRET(filterCompareRangeCtx(ctx, (*gRes2)->colInfo[idx2].info, &equal)); if (equal) { ++equal2; } @@ -2443,10 +2580,12 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter colCtx.colIdx = idx1; colCtx.ctx = ctx; ctx = NULL; - taosArrayPush(colCtxs, &colCtx); + if (NULL == taosArrayPush(colCtxs, &colCtx)) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } } } else { - filterCompareRangeCtx(ctx, (*gRes1)->colInfo[idx1].info, &equal); + FLT_ERR_JRET(filterCompareRangeCtx(ctx, (*gRes1)->colInfo[idx1].info, &equal)); if (equal) { ++equal1; } @@ -2455,7 +2594,9 @@ int32_t filterMergeTwoGroups(SFilterInfo *info, SFilterGroupCtx **gRes1, SFilter colCtx.colIdx = idx1; colCtx.ctx = ctx; ctx = NULL; - taosArrayPush(colCtxs, &colCtx); + if (NULL == taosArrayPush(colCtxs, &colCtx)) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } } ++n; @@ -2498,7 +2639,7 @@ _return: } } - filterFreeRangeCtx(ctx); + (void)filterFreeRangeCtx(ctx); // No need to handle the return value. return TSDB_CODE_SUCCESS; } @@ -2510,6 +2651,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR taosSort(gRes, *gResNum, POINTER_BYTES, filterCompareGroupCtx); + int32_t code = TSDB_CODE_SUCCESS; int32_t pEnd = 0, cStart = 0, cEnd = 0; uint32_t pColNum = 0, cColNum = 0; int32_t movedNum = 0; @@ -2529,7 +2671,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR for (int32_t m = 0; m <= pEnd; ++m) { for (int32_t n = cStart; n <= cEnd; ++n) { ASSERT(m < n); - filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all); + FLT_ERR_JRET(filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all)); FLT_CHK_JMP(all); @@ -2550,7 +2692,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR for (int32_t m = cStart; m < cEnd; ++m) { for (int32_t n = m + 1; n <= cEnd; ++n) { ASSERT(m < n); - filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all); + FLT_ERR_JRET(filterMergeTwoGroups(info, &gRes[m], &gRes[n], &all)); FLT_CHK_JMP(all); @@ -2596,11 +2738,17 @@ int32_t filterConvertGroupFromArray(SFilterInfo *info, SArray *group) { if (info->groupNum > 0) { info->groups = taosMemoryCalloc(info->groupNum, sizeof(*info->groups)); + if (info->groups == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } for (size_t i = 0; i < groupSize; ++i) { SFilterGroup *pg = taosArrayGet(group, i); pg->unitFlags = taosMemoryCalloc(pg->unitNum, sizeof(*pg->unitFlags)); + if (pg->unitFlags == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } info->groups[i] = *pg; } @@ -2617,11 +2765,15 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum FILTER_SET_FLAG(oinfo.status, FI_STATUS_CLONED); - SArray *group = taosArrayInit(FILTER_DEFAULT_GROUP_SIZE, sizeof(SFilterGroup)); SFilterGroupCtx *res = NULL; SFilterColInfo *colInfo = NULL; int32_t optr = 0; uint32_t uidx = 0; + uint32_t code = TSDB_CODE_SUCCESS; + SArray *group = taosArrayInit(FILTER_DEFAULT_GROUP_SIZE, sizeof(SFilterGroup)); + if (group == NULL) { + FLT_ERR_JRET(terrno); + } memset(info, 0, sizeof(*info)); @@ -2632,7 +2784,7 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum FILTER_SET_FLAG(info->options, FLT_OPTION_NEED_UNIQE); - filterInitUnitsFields(info); + FLT_ERR_JRET(filterInitUnitsFields(info)); for (int32_t i = 0; i < gResNum; ++i) { res = gRes[i]; @@ -2650,8 +2802,8 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum for (int32_t n = 0; n < usize; ++n) { SFilterUnit *u = (SFilterUnit *)taosArrayGetP((SArray *)colInfo->info, n); - filterAddUnitFromUnit(info, &oinfo, u, &uidx); - filterAddUnitToGroup(&ng, uidx); + FLT_ERR_JRET(filterAddUnitFromUnit(info, &oinfo, u, &uidx)); + FLT_ERR_JRET(filterAddUnitToGroup(&ng, uidx)); } continue; @@ -2659,29 +2811,35 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum ASSERT(colInfo->type == RANGE_TYPE_MR_CTX); - filterAddGroupUnitFromCtx(info, &oinfo, colInfo->info, res->colIdx[m], &ng, optr, group); + FLT_ERR_JRET(filterAddGroupUnitFromCtx(info, &oinfo, colInfo->info, res->colIdx[m], &ng, optr, group)); } if (ng.unitNum > 0) { - taosArrayPush(group, &ng); + if (NULL == taosArrayPush(group, &ng)) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } } } - filterConvertGroupFromArray(info, group); +_return: + FLT_ERR_RET(filterConvertGroupFromArray(info, group)); taosArrayDestroy(group); filterFreeInfo(&oinfo); - return TSDB_CODE_SUCCESS; + FLT_RET(code); } int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum) { uint32_t *idxs = NULL; uint32_t colNum = 0; SFilterGroupCtx *res = NULL; + int32_t code = TSDB_CODE_SUCCESS; uint32_t *idxNum = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].num, sizeof(*idxNum)); - + if (idxNum == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } for (int32_t i = 0; i < gResNum; ++i) { for (uint32_t m = 0; m < gRes[i]->colNum; ++m) { SFilterColInfo *colInfo = &gRes[i]->colInfo[gRes[i]->colIdx[m]]; @@ -2702,6 +2860,9 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_ if (idxs == NULL) { idxs = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].num, sizeof(*idxs)); + if (idxs == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } } idxs[colNum++] = i; @@ -2711,6 +2872,9 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_ info->colRangeNum = colNum; info->colRange = taosMemoryCalloc(colNum, POINTER_BYTES); + if (info->colRange == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } for (int32_t i = 0; i < gResNum; ++i) { res = gRes[i]; @@ -2726,7 +2890,7 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_ SFilterColInfo *colInfo = &res->colInfo[res->colIdx[n]]; if (info->colRange[m] == NULL) { - info->colRange[m] = filterInitRangeCtx(colInfo->dataType, 0); + FLT_ERR_JRET(filterInitRangeCtx(colInfo->dataType, 0, &(info->colRange[m]))); SFilterField *fi = FILTER_GET_COL_FIELD(info, res->colIdx[n]); info->colRange[m]->colId = FILTER_GET_COL_FIELD_ID(fi); } @@ -2734,9 +2898,9 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_ ASSERT(colInfo->type == RANGE_TYPE_MR_CTX); bool all = false; - filterSourceRangeFromCtx(info->colRange[m], colInfo->info, LOGIC_COND_TYPE_OR, NULL, &all); + FLT_ERR_JRET(filterSourceRangeFromCtx(info->colRange[m], colInfo->info, LOGIC_COND_TYPE_OR, NULL, &all)); if (all) { - filterFreeRangeCtx(info->colRange[m]); + (void)filterFreeRangeCtx(info->colRange[m]); // No need to handle the return value. info->colRange[m] = NULL; if (m < (info->colRangeNum - 1)) { @@ -2777,15 +2941,23 @@ int32_t filterPostProcessRange(SFilterInfo *info) { } int32_t filterGenerateComInfo(SFilterInfo *info) { - terrno = 0; info->cunits = taosMemoryMalloc(info->unitNum * sizeof(*info->cunits)); + if (NULL == info->cunits) { + return TSDB_CODE_OUT_OF_MEMORY; + } info->blkUnitRes = taosMemoryMalloc(sizeof(*info->blkUnitRes) * info->unitNum); + if (NULL == info->blkUnitRes) { + return TSDB_CODE_OUT_OF_MEMORY; + } info->blkUnits = taosMemoryMalloc(sizeof(*info->blkUnits) * (info->unitNum + 1) * info->groupNum); + if (NULL == info->blkUnits) { + return TSDB_CODE_OUT_OF_MEMORY; + } for (uint32_t i = 0; i < info->unitNum; ++i) { SFilterUnit *unit = &info->units[i]; - info->cunits[i].func = filterGetCompFuncIdx(FILTER_UNIT_DATA_TYPE(unit), unit->compare.optr, false); // set terrno if err + FLT_ERR_RET(filterGetCompFuncIdx(FILTER_UNIT_DATA_TYPE(unit), unit->compare.optr, &info->cunits[i].func, false)); info->cunits[i].rfunc = filterGetRangeCompFuncFromOptrs(unit->compare.optr, unit->compare.optr2); info->cunits[i].optr = FILTER_UNIT_OPTR(unit); info->cunits[i].colData = NULL; @@ -2806,7 +2978,7 @@ int32_t filterGenerateComInfo(SFilterInfo *info) { info->cunits[i].dataType = FILTER_UNIT_DATA_TYPE(unit); } - return terrno; + return TSDB_CODE_SUCCESS; } int32_t filterUpdateComUnits(SFilterInfo *info) { @@ -3003,7 +3175,7 @@ int32_t filterRmUnitByRange(SFilterInfo *info, SColumnDataAgg *pDataStatis, int3 _return: - filterDumpInfoToString(info, "Block Filter", 2); + FLT_ERR_RET(filterDumpInfoToString(info, "Block Filter", 2)); return TSDB_CODE_SUCCESS; } @@ -3071,11 +3243,13 @@ bool filterExecuteBasedOnStatisImpl(void *pinfo, int32_t numOfRows, SColumnInfoD } int32_t filterExecuteBasedOnStatis(SFilterInfo *info, int32_t numOfRows, SColumnInfoData *p, SColumnDataAgg *statis, - int16_t numOfCols, bool *all) { + int16_t numOfCols, bool *all, int32_t *result) { + int32_t code = TSDB_CODE_SUCCESS; + *result = 0; if (statis && numOfRows >= FILTER_RM_UNIT_MIN_ROWS) { info->blkFlag = 0; - filterRmUnitByRange(info, statis, numOfCols, numOfRows); + FLT_ERR_JRET(filterRmUnitByRange(info, statis, numOfCols, numOfRows)); if (info->blkFlag) { if (FILTER_GET_FLAG(info->blkFlag, FI_STATUS_BLK_ALL)) { @@ -3093,32 +3267,37 @@ int32_t filterExecuteBasedOnStatis(SFilterInfo *info, int32_t numOfRows, SColumn } } - return 1; + *result = 1; + FLT_RET(TSDB_CODE_SUCCESS); _return: info->blkFlag = 0; - return TSDB_CODE_SUCCESS; + result = 0; + FLT_RET(code); } -static FORCE_INLINE bool filterExecuteImplAll(void *info, int32_t numOfRows, SColumnInfoData *p, SColumnDataAgg *statis, - int16_t numOfCols, int32_t *numOfQualified) { - return true; +static FORCE_INLINE int32_t filterExecuteImplAll(void *info, int32_t numOfRows, SColumnInfoData *p, SColumnDataAgg *statis, + int16_t numOfCols, int32_t *numOfQualified, bool *all) { + *all = true; + FLT_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE bool filterExecuteImplEmpty(void *info, int32_t numOfRows, SColumnInfoData *p, - SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified) { - return false; +static FORCE_INLINE int32_t filterExecuteImplEmpty(void *info, int32_t numOfRows, SColumnInfoData *p, + SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified, bool *all) { + *all = false; + FLT_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE bool filterExecuteImplIsNull(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, - SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified) { +static FORCE_INLINE int32_t filterExecuteImplIsNull(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, + SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified, bool *all) { SFilterInfo *info = (SFilterInfo *)pinfo; - bool all = true; + int8_t *p = (int8_t *)pRes->pData; + int32_t result = 0; - int8_t *p = (int8_t *)pRes->pData; - - if (filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, &all) == 0) { - return all; + *all = true; + FLT_ERR_RET(filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, all, &result)); + if (result == 0) { + FLT_RET(TSDB_CODE_SUCCESS); } for (int32_t i = 0; i < numOfRows; ++i) { @@ -3126,22 +3305,24 @@ static FORCE_INLINE bool filterExecuteImplIsNull(void *pinfo, int32_t numOfRows, p[i] = colDataIsNull((SColumnInfoData *)info->cunits[uidx].colData, 0, i, NULL); if (p[i] == 0) { - all = false; + *all = false; } else { (*numOfQualified) += 1; } } - return all; + FLT_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE bool filterExecuteImplNotNull(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, - SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified) { +static FORCE_INLINE int32_t filterExecuteImplNotNull(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, + SColumnDataAgg *statis, int16_t numOfCols, int32_t *numOfQualified, bool *all) { SFilterInfo *info = (SFilterInfo *)pinfo; - bool all = true; + int32_t result = 0; - if (filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, &all) == 0) { - return all; + *all = true; + FLT_ERR_RET(filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, all, &result)); + if (result == 0) { + FLT_RET(TSDB_CODE_SUCCESS); } int8_t *p = (int8_t *)pRes->pData; @@ -3151,27 +3332,29 @@ static FORCE_INLINE bool filterExecuteImplNotNull(void *pinfo, int32_t numOfRows p[i] = !colDataIsNull((SColumnInfoData *)info->cunits[uidx].colData, 0, i, NULL); if (p[i] == 0) { - all = false; + *all = false; } else { (*numOfQualified) += 1; } } - return all; + FLT_RET(TSDB_CODE_SUCCESS); } -bool filterExecuteImplRange(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, - int16_t numOfCols, int32_t *numOfQualified) { +int32_t filterExecuteImplRange(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, + int16_t numOfCols, int32_t *numOfQualified, bool *all) { SFilterInfo *info = (SFilterInfo *)pinfo; - bool all = true; uint16_t dataSize = info->cunits[0].dataSize; rangeCompFunc rfunc = gRangeCompare[info->cunits[0].rfunc]; void *valData = info->cunits[0].valData; void *valData2 = info->cunits[0].valData2; __compar_fn_t func = gDataCompare[info->cunits[0].func]; + int32_t result = 0; - if (filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, &all) == 0) { - return all; + *all = true; + FLT_ERR_RET(filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, all, &result)); + if (result == 0) { + FLT_RET(TSDB_CODE_SUCCESS); } int8_t *p = (int8_t *)pRes->pData; @@ -3180,7 +3363,7 @@ bool filterExecuteImplRange(void *pinfo, int32_t numOfRows, SColumnInfoData *pRe SColumnInfoData *pData = info->cunits[0].colData; if (colDataIsNull_s(pData, i)) { - all = false; + *all = false; p[i] = 0; continue; } @@ -3189,22 +3372,24 @@ bool filterExecuteImplRange(void *pinfo, int32_t numOfRows, SColumnInfoData *pRe p[i] = (*rfunc)(colData, colData, valData, valData2, func); if (p[i] == 0) { - all = false; + *all = false; } else { (*numOfQualified)++; } } - return all; + FLT_RET(TSDB_CODE_SUCCESS); } -bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, - int16_t numOfCols, int32_t *numOfQualified) { +int32_t filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, + int16_t numOfCols, int32_t *numOfQualified, bool *all) { SFilterInfo *info = (SFilterInfo *)pinfo; - bool all = true; + int32_t result = 0; - if (filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, &all) == 0) { - return all; + *all = true; + FLT_ERR_RET(filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, all, &result)); + if (result == 0) { + FLT_RET(TSDB_CODE_SUCCESS); } int8_t *p = (int8_t *)pRes->pData; @@ -3213,7 +3398,7 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes uint32_t uidx = info->groups[0].unitIdxs[0]; if (colDataIsNull_s((SColumnInfoData *)info->cunits[uidx].colData, i)) { p[i] = 0; - all = false; + *all = false; continue; } @@ -3222,6 +3407,9 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes if (info->cunits[uidx].dataType == TSDB_DATA_TYPE_NCHAR && (info->cunits[uidx].optr == OP_TYPE_MATCH || info->cunits[uidx].optr == OP_TYPE_NMATCH)) { char *newColData = taosMemoryCalloc(info->cunits[uidx].dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1); + if (newColData == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); @@ -3237,22 +3425,24 @@ bool filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes } if (p[i] == 0) { - all = false; + *all = false; } else { (*numOfQualified) += 1; } } - return all; + FLT_RET(TSDB_CODE_SUCCESS); } -bool filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, int16_t numOfCols, - int32_t *numOfQualified) { +int32_t filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SColumnDataAgg *statis, int16_t numOfCols, + int32_t *numOfQualified, bool *all) { SFilterInfo *info = (SFilterInfo *)pinfo; - bool all = true; + int32_t result = 0; - if (filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, &all) == 0) { - return all; + *all = true; + FLT_ERR_RET(filterExecuteBasedOnStatis(info, numOfRows, pRes, statis, numOfCols, all, &result)); + if (result == 0) { + FLT_RET(TSDB_CODE_SUCCESS); } int8_t *p = (int8_t *)pRes->pData; @@ -3290,6 +3480,9 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SC if (cunit->dataType == TSDB_DATA_TYPE_NCHAR && (cunit->optr == OP_TYPE_MATCH || cunit->optr == OP_TYPE_NMATCH)) { char *newColData = taosMemoryCalloc(cunit->dataSize * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE, 1); + if (newColData == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); @@ -3318,13 +3511,13 @@ bool filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, SC } if (p[i] == 0) { - all = false; + *all = false; } else { (*numOfQualified) += 1; } } - return all; + FLT_RET(TSDB_CODE_SUCCESS); } int32_t filterSetExecFunc(SFilterInfo *info) { @@ -3364,12 +3557,15 @@ int32_t filterSetExecFunc(SFilterInfo *info) { int32_t filterPreprocess(SFilterInfo *info) { int32_t code = TSDB_CODE_SUCCESS; - SFilterGroupCtx **gRes = taosMemoryCalloc(info->groupNum, sizeof(SFilterGroupCtx *)); int32_t gResNum = 0; + SFilterGroupCtx **gRes = taosMemoryCalloc(info->groupNum, sizeof(SFilterGroupCtx *)); + if (gRes == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } - filterMergeGroupUnits(info, gRes, &gResNum); + FLT_ERR_JRET(filterMergeGroupUnits(info, gRes, &gResNum)); - filterMergeGroups(info, gRes, &gResNum); + FLT_ERR_JRET(filterMergeGroups(info, gRes, &gResNum)); if (FILTER_GET_FLAG(info->status, FI_STATUS_ALL)) { fltInfo("Final - FilterInfo: [ALL]"); @@ -3381,19 +3577,19 @@ int32_t filterPreprocess(SFilterInfo *info) { goto _return; } - filterGenerateColRange(info, gRes, gResNum); + FLT_ERR_JRET(filterGenerateColRange(info, gRes, gResNum)); - filterDumpInfoToString(info, "Final", 1); + FLT_ERR_JRET(filterDumpInfoToString(info, "Final", 1)); - filterPostProcessRange(info); + FLT_ERR_JRET(filterPostProcessRange(info)); - filterRewrite(info, gRes, gResNum); + FLT_ERR_JRET(filterRewrite(info, gRes, gResNum)); FLT_ERR_JRET(filterGenerateComInfo(info)); _return: - filterSetExecFunc(info); + FLT_ERR_RET(filterSetExecFunc(info)); for (int32_t i = 0; i < gResNum; ++i) { filterFreeGroupCtx(gRes[i]); @@ -3413,13 +3609,13 @@ int32_t fltSetColFieldDataImpl(SFilterInfo *info, void *param, filer_get_col_fro SFilterField *fi = &info->fields[FLD_TYPE_COLUMN].fields[i]; if (fromColId) { - (*fp)(param, FILTER_GET_COL_FIELD_ID(fi), &fi->data); + FLT_ERR_RET((*fp)(param, FILTER_GET_COL_FIELD_ID(fi), &fi->data)); } else { - (*fp)(param, FILTER_GET_COL_FIELD_SLOT_ID(fi), &fi->data); + FLT_ERR_RET((*fp)(param, FILTER_GET_COL_FIELD_SLOT_ID(fi), &fi->data)); } } - filterUpdateComUnits(info); + FLT_ERR_RET(filterUpdateComUnits(info)); return TSDB_CODE_SUCCESS; } @@ -3428,20 +3624,23 @@ int32_t fltInitFromNode(SNode *tree, SFilterInfo *info, uint32_t options) { int32_t code = TSDB_CODE_SUCCESS; SArray *group = taosArrayInit(FILTER_DEFAULT_GROUP_SIZE, sizeof(SFilterGroup)); + if (group == NULL) { + FLT_ERR_JRET(terrno); + } - filterInitUnitsFields(info); + FLT_ERR_JRET(filterInitUnitsFields(info)); SFltBuildGroupCtx tctx = {.info = info, .group = group}; nodesWalkExpr(tree, fltTreeToGroup, (void *)&tctx); FLT_ERR_JRET(tctx.code); - filterConvertGroupFromArray(info, group); + FLT_ERR_JRET(filterConvertGroupFromArray(info, group)); taosArrayDestroy(group); FLT_ERR_JRET(fltInitValFieldData(info)); if (!FILTER_GET_FLAG(info->options, FLT_OPTION_NO_REWRITE)) { - filterDumpInfoToString(info, "Before preprocess", 0); + FLT_ERR_JRET(filterDumpInfoToString(info, "Before preprocess", 0)); FLT_ERR_JRET(filterPreprocess(info)); @@ -3453,9 +3652,14 @@ int32_t fltInitFromNode(SNode *tree, SFilterInfo *info, uint32_t options) { } info->unitRes = taosMemoryMalloc(info->unitNum * sizeof(*info->unitRes)); + if (info->unitRes == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } info->unitFlags = taosMemoryMalloc(info->unitNum * sizeof(*info->unitFlags)); - - filterDumpInfoToString(info, "Final", 0); + if (info->unitFlags == NULL) { + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + FLT_ERR_JRET(filterDumpInfoToString(info, "Final", 0)); return code; _return: @@ -3597,26 +3801,34 @@ int32_t fltSclMergeSort(SArray *pts1, SArray *pts2, SArray *result) { SFltSclPoint *pt2 = taosArrayGet(pts2, j); bool less = fltSclLessPoint(pt1, pt2); if (less) { - taosArrayPush(result, pt1); + if (NULL == taosArrayPush(result, pt1)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } ++i; } else { - taosArrayPush(result, pt2); + if (NULL == taosArrayPush(result, pt2)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } ++j; } } if (i < len1) { for (; i < len1; ++i) { SFltSclPoint *pt1 = taosArrayGet(pts1, i); - taosArrayPush(result, pt1); + if (NULL == taosArrayPush(result, pt1)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } } if (j < len2) { for (; j < len2; ++j) { SFltSclPoint *pt2 = taosArrayGet(pts2, j); - taosArrayPush(result, pt2); + if (NULL == taosArrayPush(result, pt2)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } } - return 0; + return TSDB_CODE_SUCCESS; } int32_t fltSclMerge(SArray *pts1, SArray *pts2, bool isUnion, SArray *merged) { @@ -3624,7 +3836,10 @@ int32_t fltSclMerge(SArray *pts1, SArray *pts2, bool isUnion, SArray *merged) { size_t len2 = taosArrayGetSize(pts2); // first merge sort pts1 and pts2 SArray *all = taosArrayInit(len1 + len2, sizeof(SFltSclPoint)); - fltSclMergeSort(pts1, pts2, all); + if (all == NULL) { + FLT_ERR_RET(terrno); + } + FLT_ERR_RET(fltSclMergeSort(pts1, pts2, all)); int32_t countRequired = (isUnion) ? 1 : 2; int32_t count = 0; for (int32_t i = 0; i < taosArrayGetSize(all); ++i) { @@ -3632,17 +3847,21 @@ int32_t fltSclMerge(SArray *pts1, SArray *pts2, bool isUnion, SArray *merged) { if (pt->start) { ++count; if (count == countRequired) { - taosArrayPush(merged, pt); + if (NULL == taosArrayPush(merged, pt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } } else { if (count == countRequired) { - taosArrayPush(merged, pt); + if (NULL == taosArrayPush(merged, pt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } --count; } } taosArrayDestroy(all); - return 0; + return TSDB_CODE_SUCCESS; } int32_t fltSclIntersect(SArray *pts1, SArray *pts2, SArray *merged) { return fltSclMerge(pts1, pts2, false, merged); } @@ -3655,17 +3874,27 @@ typedef struct { EOperatorType type; } SFltSclOperator; -SFltSclColumnRange *fltSclGetOrCreateColumnRange(SColumnNode *colNode, SArray *colRangeList) { + +int32_t fltSclGetOrCreateColumnRange(SColumnNode *colNode, SArray *colRangeList, SFltSclColumnRange **colRange) { for (int32_t i = 0; i < taosArrayGetSize(colRangeList); ++i) { - SFltSclColumnRange *colRange = taosArrayGet(colRangeList, i); - if (nodesEqualNode((SNode *)colRange->colNode, (SNode *)colNode)) { - return colRange; + *colRange = taosArrayGet(colRangeList, i); + if (nodesEqualNode((SNode *)(*colRange)->colNode, (SNode *)colNode)) { + return TSDB_CODE_SUCCESS; } } + // TODO(smj):wait for nodesCloneNode change it's return value, use terrno for now. + terrno = TSDB_CODE_SUCCESS; SColumnNode *pColumnNode = (SColumnNode *)nodesCloneNode((SNode *)colNode); + FLT_ERR_RET(terrno); SFltSclColumnRange newColRange = {.colNode = pColumnNode, .points = taosArrayInit(4, sizeof(SFltSclPoint))}; - taosArrayPush(colRangeList, &newColRange); - return taosArrayGetLast(colRangeList); + if (NULL == newColRange.points) { + FLT_ERR_RET(terrno); + } + if (NULL == taosArrayPush(colRangeList, &newColRange)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + *colRange = taosArrayGetLast(colRangeList); + return TSDB_CODE_SUCCESS; } int32_t fltSclBuildDatumFromValueNode(SFltSclDatum *datum, SValueNode *valNode) { @@ -3760,29 +3989,42 @@ int32_t fltSclBuildRangeFromBlockSma(SFltSclColumnRange *colRange, SColumnDataAg SFltSclDatum datum = {.kind = FLT_SCL_DATUM_KIND_NULL}; SFltSclPoint startPt = {.start = true, .excl = false, .val = datum}; SFltSclPoint endPt = {.start = false, .excl = false, .val = datum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } return TSDB_CODE_SUCCESS; } if (pAgg->numOfNull > 0) { SFltSclDatum nullDatum = {.kind = FLT_SCL_DATUM_KIND_NULL}; SFltSclPoint startPt = {.start = true, .excl = false, .val = nullDatum}; SFltSclPoint endPt = {.start = false, .excl = false, .val = nullDatum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } SFltSclDatum min = {0}; - fltSclBuildDatumFromBlockSmaValue(&min, colRange->colNode->node.resType.type, pAgg->min); + FLT_ERR_RET(fltSclBuildDatumFromBlockSmaValue(&min, colRange->colNode->node.resType.type, pAgg->min)); SFltSclPoint minPt = {.excl = false, .start = true, .val = min}; SFltSclDatum max = {0}; - fltSclBuildDatumFromBlockSmaValue(&max, colRange->colNode->node.resType.type, pAgg->max); + FLT_ERR_RET(fltSclBuildDatumFromBlockSmaValue(&max, colRange->colNode->node.resType.type, pAgg->max)); SFltSclPoint maxPt = {.excl = false, .start = false, .val = max}; - taosArrayPush(points, &minPt); - taosArrayPush(points, &maxPt); + if (NULL == taosArrayPush(points, &minPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &maxPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } return TSDB_CODE_SUCCESS; } -bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t numOfCols, int32_t numOfRows) { +int32_t filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t numOfCols, int32_t numOfRows, + bool *keep) { if (info->scalarMode) { SArray *colRanges = info->sclCtx.fltSclRange; for (int32_t i = 0; i < taosArrayGetSize(colRanges); ++i) { @@ -3798,12 +4040,18 @@ bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t if (foundCol) { SColumnDataAgg *pAgg = &pDataStatis[j]; SArray *points = taosArrayInit(2, sizeof(SFltSclPoint)); - fltSclBuildRangeFromBlockSma(colRange, pAgg, numOfRows, points); + if (NULL == points) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + FLT_ERR_RET(fltSclBuildRangeFromBlockSma(colRange, pAgg, numOfRows, points)); qDebug("column data agg: nulls %d, rows %d, max %" PRId64 " min %" PRId64, pAgg->numOfNull, numOfRows, pAgg->max, pAgg->min); SArray *merged = taosArrayInit(8, sizeof(SFltSclPoint)); - fltSclIntersect(points, colRange->points, merged); + if (NULL == merged) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + FLT_ERR_RET(fltSclIntersect(points, colRange->points, merged)); bool isIntersect = taosArrayGetSize(merged) != 0; qDebug("filter range execute, scalar mode, column range found. colId: %d colName: %s has overlap: %d", colRange->colNode->colId, colRange->colNode->colName, isIntersect); @@ -3811,19 +4059,23 @@ bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t taosArrayDestroy(merged); taosArrayDestroy(points); if (!isIntersect) { - return false; + *keep = false; + FLT_RET(TSDB_CODE_SUCCESS); } } } - return true; + *keep = true; + FLT_RET(TSDB_CODE_SUCCESS); } if (FILTER_EMPTY_RES(info)) { - return false; + *keep = false; + FLT_RET(TSDB_CODE_SUCCESS); } if (FILTER_ALL_RES(info)) { - return true; + *keep = true; + FLT_RET(TSDB_CODE_SUCCESS); } bool ret = true; @@ -3895,17 +4147,19 @@ bool filterRangeExecute(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t } if (!ret) { - return ret; + *keep = ret; + FLT_RET(TSDB_CODE_SUCCESS); } } - return ret; + *keep = ret; + FLT_RET(TSDB_CODE_SUCCESS); } int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStrict) { SFilterRange ra = {0}; - SFilterRangeCtx *prev = filterInitRangeCtx(TSDB_DATA_TYPE_TIMESTAMP, FLT_OPTION_TIMESTAMP); - SFilterRangeCtx *tmpc = filterInitRangeCtx(TSDB_DATA_TYPE_TIMESTAMP, FLT_OPTION_TIMESTAMP); + SFilterRangeCtx *prev = NULL; + SFilterRangeCtx *tmpc = NULL; SFilterRangeCtx *cur = NULL; int32_t num = 0; int32_t optr = 0; @@ -3913,6 +4167,8 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri bool empty = false, all = false; uint32_t emptyGroups = 0; + FLT_ERR_JRET(filterInitRangeCtx(TSDB_DATA_TYPE_TIMESTAMP, FLT_OPTION_TIMESTAMP, &prev)); + FLT_ERR_JRET(filterInitRangeCtx(TSDB_DATA_TYPE_TIMESTAMP, FLT_OPTION_TIMESTAMP, &tmpc)); for (uint32_t i = 0; i < info->groupNum; ++i) { SFilterGroup *group = &info->groups[i]; if (group->unitNum > 1) { @@ -3930,7 +4186,7 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri uint8_t raOptr = FILTER_UNIT_OPTR(unit); - filterAddRangeOptr(cur, raOptr, LOGIC_COND_TYPE_AND, &empty, NULL); + FLT_ERR_JRET(filterAddRangeOptr(cur, raOptr, LOGIC_COND_TYPE_AND, &empty, NULL)); if (empty) { emptyGroups++; } @@ -3939,7 +4195,7 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri continue; } - filterAddUnitRange(info, unit, cur, optr); + FLT_ERR_JRET(filterAddUnitRange(info, unit, cur, optr)); } if (empty) { @@ -3952,8 +4208,8 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri } if (group->unitNum > 1) { - filterSourceRangeFromCtx(prev, cur, LOGIC_COND_TYPE_OR, &empty, &all); - filterResetRangeCtx(cur); + FLT_ERR_JRET(filterSourceRangeFromCtx(prev, cur, LOGIC_COND_TYPE_OR, &empty, &all)); + FLT_ERR_JRET(filterResetRangeCtx(cur)); if (all) { break; } @@ -3965,7 +4221,7 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri if (prev->notnull) { *win = TSWINDOW_INITIALIZER; } else { - filterGetRangeNum(prev, &num); + FLT_ERR_JRET(filterGetRangeNum(prev, &num)); FLT_CHK_JMP(num < 1); @@ -3975,7 +4231,7 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri } SFilterRange tra; - filterGetRangeRes(prev, &tra); + FLT_ERR_JRET(filterGetRangeRes(prev, &tra)); win->skey = tra.s; win->ekey = tra.e; if (FILTER_GET_FLAG(tra.sflag, RANGE_FLG_EXCLUDE)) { @@ -3986,8 +4242,8 @@ int32_t filterGetTimeRangeImpl(SFilterInfo *info, STimeWindow *win, bool *isStri } } - filterFreeRangeCtx(prev); - filterFreeRangeCtx(tmpc); + (void)filterFreeRangeCtx(prev); // No need to handle the return value. + (void)filterFreeRangeCtx(tmpc); // No need to handle the return value. qDebug("qFilter time range:[%" PRId64 "]-[%" PRId64 "]", win->skey, win->ekey); return TSDB_CODE_SUCCESS; @@ -3996,8 +4252,8 @@ _return: *win = TSWINDOW_DESC_INITIALIZER; - filterFreeRangeCtx(prev); - filterFreeRangeCtx(tmpc); + (void)filterFreeRangeCtx(prev); // No need to handle the return value. + (void)filterFreeRangeCtx(tmpc); // No need to handle the return value. qDebug("qFilter time range:[%" PRId64 "]-[%" PRId64 "]", win->skey, win->ekey); @@ -4009,9 +4265,9 @@ static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) { d->kind = FLT_SCL_DATUM_KIND_INT64; if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) { - getDataMax(point->val.type.type, &(d->i)); + (void)getDataMax(point->val.type.type, &(d->i)); // No need to handle the return value. } else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) { - getDataMin(point->val.type.type, &(d->i)); + (void)getDataMin(point->val.type.type, &(d->i)); // No need to handle the return value. } else if (point->val.kind == FLT_SCL_DATUM_KIND_INT64) { if (point->excl) { if (point->start) { @@ -4044,6 +4300,7 @@ static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) { } } else { qError("not supported type %d when get datum from point", d->type.type); + return TSDB_CODE_FAILED; } return TSDB_CODE_SUCCESS; } @@ -4054,7 +4311,7 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) { *isStrict = true; - FLT_ERR_RET(filterInitFromNode(pNode, &info, FLT_OPTION_NO_REWRITE | FLT_OPTION_TIMESTAMP)); + FLT_ERR_JRET(filterInitFromNode(pNode, &info, FLT_OPTION_NO_REWRITE | FLT_OPTION_TIMESTAMP)); if (info->scalarMode) { SArray *colRanges = info->sclCtx.fltSclRange; @@ -4067,8 +4324,8 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) { SFltSclPoint *endPt = taosArrayGet(points, 1); SFltSclDatum start; SFltSclDatum end; - fltSclGetTimeStampDatum(startPt, &start); - fltSclGetTimeStampDatum(endPt, &end); + FLT_ERR_JRET(fltSclGetTimeStampDatum(startPt, &start)); + FLT_ERR_JRET(fltSclGetTimeStampDatum(endPt, &end)); win->skey = start.i; win->ekey = end.i; *isStrict = true; @@ -4105,6 +4362,9 @@ int32_t filterConverNcharColumns(SFilterInfo *info, int32_t rows, bool *gotNchar nfi.desc = fi->desc; int32_t bytes = FILTER_GET_COL_FIELD_SIZE(fi); nfi.data = taosMemoryMalloc(rows * bytes); + if (nfi.data == NULL) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t bufSize = bytes - VARSTR_HEADER_SIZE; for (int32_t j = 0; j < rows; ++j) { char *src = FILTER_GET_COL_FIELD_DATA(fi, j); @@ -4135,7 +4395,7 @@ int32_t filterConverNcharColumns(SFilterInfo *info, int32_t rows, bool *gotNchar } if (*gotNchar) { - filterUpdateComUnits(info); + FLT_ERR_RET(filterUpdateComUnits(info)); } return TSDB_CODE_SUCCESS; @@ -4409,69 +4669,97 @@ int32_t fltSclBuildRangePoints(SFltSclOperator *oper, SArray *points) { switch (oper->type) { case OP_TYPE_GREATER_THAN: { SFltSclDatum start; - fltSclBuildDatumFromValueNode(&start, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&start, oper->valNode)); SFltSclPoint startPt = {.start = true, .excl = true, .val = start}; SFltSclDatum end = {.kind = FLT_SCL_DATUM_KIND_MAX, .type = oper->colNode->node.resType}; SFltSclPoint endPt = {.start = false, .excl = false, .val = end}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_GREATER_EQUAL: { SFltSclDatum start; - fltSclBuildDatumFromValueNode(&start, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&start, oper->valNode)); SFltSclPoint startPt = {.start = true, .excl = false, .val = start}; SFltSclDatum end = {.kind = FLT_SCL_DATUM_KIND_MAX, .type = oper->colNode->node.resType}; SFltSclPoint endPt = {.start = false, .excl = false, .val = end}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_LOWER_THAN: { SFltSclDatum end; - fltSclBuildDatumFromValueNode(&end, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&end, oper->valNode)); SFltSclPoint endPt = {.start = false, .excl = true, .val = end}; SFltSclDatum start = {.kind = FLT_SCL_DATUM_KIND_MIN, .type = oper->colNode->node.resType}; SFltSclPoint startPt = {.start = true, .excl = false, .val = start}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_LOWER_EQUAL: { SFltSclDatum end; - fltSclBuildDatumFromValueNode(&end, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&end, oper->valNode)); SFltSclPoint endPt = {.start = false, .excl = false, .val = end}; SFltSclDatum start = {.kind = FLT_SCL_DATUM_KIND_MIN, .type = oper->colNode->node.resType}; SFltSclPoint startPt = {.start = true, .excl = false, .val = start}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_EQUAL: { SFltSclDatum valDatum; - fltSclBuildDatumFromValueNode(&valDatum, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&valDatum, oper->valNode)); SFltSclPoint startPt = {.start = true, .excl = false, .val = valDatum}; SFltSclPoint endPt = {.start = false, .excl = false, .val = valDatum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_NOT_EQUAL: { SFltSclDatum valDatum; - fltSclBuildDatumFromValueNode(&valDatum, oper->valNode); + FLT_ERR_RET(fltSclBuildDatumFromValueNode(&valDatum, oper->valNode)); { SFltSclDatum start = {.kind = FLT_SCL_DATUM_KIND_MIN, .type = oper->colNode->node.resType}; SFltSclPoint startPt = {.start = true, .excl = false, .val = start}; SFltSclPoint endPt = {.start = false, .excl = true, .val = valDatum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } { SFltSclPoint startPt = {.start = true, .excl = true, .val = valDatum}; SFltSclDatum end = {.kind = FLT_SCL_DATUM_KIND_MAX, .type = oper->colNode->node.resType}; SFltSclPoint endPt = {.start = false, .excl = false, .val = end}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } break; } @@ -4479,8 +4767,12 @@ int32_t fltSclBuildRangePoints(SFltSclOperator *oper, SArray *points) { SFltSclDatum nullDatum = {.kind = FLT_SCL_DATUM_KIND_NULL}; SFltSclPoint startPt = {.start = true, .excl = false, .val = nullDatum}; SFltSclPoint endPt = {.start = false, .excl = false, .val = nullDatum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } case OP_TYPE_IS_NOT_NULL: { @@ -4488,8 +4780,12 @@ int32_t fltSclBuildRangePoints(SFltSclOperator *oper, SArray *points) { SFltSclPoint startPt = {.start = true, .excl = false, .val = minDatum}; SFltSclDatum maxDatum = {.kind = FLT_SCL_DATUM_KIND_MAX, .type = oper->colNode->node.resType}; SFltSclPoint endPt = {.start = false, .excl = false, .val = maxDatum}; - taosArrayPush(points, &startPt); - taosArrayPush(points, &endPt); + if (NULL == taosArrayPush(points, &startPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(points, &endPt)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } break; } default: { @@ -4505,12 +4801,19 @@ int32_t fltSclProcessCNF(SArray *sclOpListCNF, SArray *colRangeList) { size_t sz = taosArrayGetSize(sclOpListCNF); for (int32_t i = 0; i < sz; ++i) { SFltSclOperator *sclOper = taosArrayGet(sclOpListCNF, i); - SFltSclColumnRange *colRange = fltSclGetOrCreateColumnRange(sclOper->colNode, colRangeList); + SFltSclColumnRange *colRange = NULL; + FLT_ERR_RET(fltSclGetOrCreateColumnRange(sclOper->colNode, colRangeList, &colRange)); SArray *points = taosArrayInit(4, sizeof(SFltSclPoint)); - fltSclBuildRangePoints(sclOper, points); + if (NULL == points) { + FLT_ERR_RET(terrno); + } + FLT_ERR_RET(fltSclBuildRangePoints(sclOper, points)); if (taosArrayGetSize(colRange->points) != 0) { SArray *merged = taosArrayInit(4, sizeof(SFltSclPoint)); - int32_t code = fltSclIntersect(colRange->points, points, merged); + if (NULL == merged) { + FLT_ERR_RET(terrno); + } + FLT_ERR_RET(fltSclIntersect(colRange->points, points, merged)); taosArrayDestroy(colRange->points); taosArrayDestroy(points); colRange->points = merged; @@ -4556,7 +4859,15 @@ static int32_t fltSclCollectOperatorFromNode(SNode *pNode, SArray *sclOpList) { SFltSclOperator sclOp = {.colNode = (SColumnNode *)nodesCloneNode(pOper->pLeft), .valNode = (SValueNode *)nodesCloneNode(pOper->pRight), .type = pOper->opType}; - taosArrayPush(sclOpList, &sclOp); + if (NULL == sclOp.colNode) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == sclOp.valNode) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == taosArrayPush(sclOpList, &sclOp)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } return TSDB_CODE_SUCCESS; @@ -4577,24 +4888,32 @@ static int32_t fltSclCollectOperatorsFromLogicCond(SNode *pNode, SArray *sclOpLi return TSDB_CODE_SUCCESS; } } - FOREACH(pExpr, pLogicCond->pParameterList) { fltSclCollectOperatorFromNode(pExpr, sclOpList); } + FOREACH(pExpr, pLogicCond->pParameterList) { + FLT_ERR_RET(fltSclCollectOperatorFromNode(pExpr, sclOpList)); + } return TSDB_CODE_SUCCESS; } static int32_t fltSclCollectOperators(SNode *pNode, SArray *sclOpList) { if (nodeType(pNode) == QUERY_NODE_OPERATOR) { - fltSclCollectOperatorFromNode(pNode, sclOpList); + FLT_ERR_RET(fltSclCollectOperatorFromNode(pNode, sclOpList)); } else if (nodeType(pNode) == QUERY_NODE_LOGIC_CONDITION) { - fltSclCollectOperatorsFromLogicCond(pNode, sclOpList); + FLT_ERR_RET(fltSclCollectOperatorsFromLogicCond(pNode, sclOpList)); } return TSDB_CODE_SUCCESS; } int32_t fltOptimizeNodes(SFilterInfo *pInfo, SNode **pNode, SFltTreeStat *pStat) { SArray *sclOpList = taosArrayInit(16, sizeof(SFltSclOperator)); - fltSclCollectOperators(*pNode, sclOpList); + if (NULL == sclOpList) { + FLT_ERR_RET(terrno); + } + FLT_ERR_RET(fltSclCollectOperators(*pNode, sclOpList)); SArray *colRangeList = taosArrayInit(16, sizeof(SFltSclColumnRange)); - fltSclProcessCNF(sclOpList, colRangeList); + if (NULL == colRangeList) { + FLT_ERR_RET(terrno); + } + FLT_ERR_RET(fltSclProcessCNF(sclOpList, colRangeList)); pInfo->sclCtx.fltSclRange = colRangeList; for (int32_t i = 0; i < taosArrayGetSize(sclOpList); ++i) { @@ -4716,7 +5035,12 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, if (info->scalarMode) { SArray *pList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(pList, &pSrc); + if (NULL == pList) { + FLT_ERR_RET(terrno); + } + if (NULL == taosArrayPush(pList, &pSrc)) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } code = scalarCalculate(info->sclCtx.node, pList, &output); taosArrayDestroy(pList); @@ -4743,7 +5067,8 @@ int32_t filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, return TSDB_CODE_APP_ERROR; } - bool keepAll = (*info->func)(info, pSrc->info.rows, *p, statis, numOfCols, &output.numOfQualified); + bool keepAll = false; + FLT_ERR_RET((info->func)(info, pSrc->info.rows, *p, statis, numOfCols, &output.numOfQualified, &keepAll)); // todo this should be return during filter procedure if (keepAll) { @@ -4813,7 +5138,7 @@ EConditionType filterClassifyCondition(SNode *pNode) { : (cxt.hasTagIndexCol ? COND_TYPE_TAG_INDEX : COND_TYPE_TAG))); } -bool filterIsMultiTableColsCond(SNode *pCond) { +int32_t filterIsMultiTableColsCond(SNode *pCond, bool *res) { SNodeList *pCondCols = nodesMakeList(); int32_t code = nodesCollectColumnsFromNode(pCond, NULL, COLLECT_COL_TYPE_ALL, &pCondCols); if (code == TSDB_CODE_SUCCESS) { @@ -4824,13 +5149,15 @@ bool filterIsMultiTableColsCond(SNode *pCond) { if (strcmp(((SColumnNode *)pColNode)->dbName, pFirstCol->dbName) != 0 || strcmp(((SColumnNode *)pColNode)->tableAlias, pFirstCol->tableAlias) != 0) { nodesDestroyList(pCondCols); - return true; + *res = true; + return TSDB_CODE_SUCCESS; } } } nodesDestroyList(pCondCols); } - return false; + *res = false; + return code; } static int32_t partitionLogicCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode **pTagIndexCond, SNode **pTagCond, @@ -4845,7 +5172,12 @@ static int32_t partitionLogicCond(SNode **pCondition, SNode **pPrimaryKeyCond, S SNodeList *pOtherConds = NULL; SNode *pCond = NULL; FOREACH(pCond, pLogicCond->pParameterList) { - if (filterIsMultiTableColsCond(pCond)) { + bool result = false; + code = filterIsMultiTableColsCond(pCond, &result); + if (TSDB_CODE_SUCCESS != code) { + break; + } + if (result) { if (NULL != pOtherCond) { code = nodesListMakeAppend(&pOtherConds, nodesCloneNode(pCond)); } @@ -4936,7 +5268,9 @@ int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode * } bool needOutput = false; - if (filterIsMultiTableColsCond(*pCondition)) { + bool result = false; + FLT_ERR_RET(filterIsMultiTableColsCond(*pCondition, &result)); + if (result) { if (NULL != pOtherCond) { *pOtherCond = *pCondition; needOutput = true; diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 8f9ea4d36c..389f8b01a3 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -116,7 +116,9 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) { SNodeListNode *nodeList = (SNodeListNode *)pNode; SListCell *cell = nodeList->pNodeList->pHead; SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))}; - + if (out.columnData == NULL) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t len = 0; void *buf = NULL; @@ -603,7 +605,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell SCL_ERR_RET(sclGetNodeRes(pWhenThen->pWhen, ctx, &pWhen)); SCL_ERR_RET(sclGetNodeRes(pWhenThen->pThen, ctx, &pThen)); - vectorCompareImpl(pCase, pWhen, pComp, rowIdx, 1, TSDB_ORDER_ASC, OP_TYPE_EQUAL); + SCL_ERR_JRET(vectorCompareImpl(pCase, pWhen, pComp, rowIdx, 1, TSDB_ORDER_ASC, OP_TYPE_EQUAL)); bool *equal = (bool *)colDataGetData(pComp->columnData, rowIdx); if (*equal) { diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 16c06c2452..bafc33a61d 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -564,29 +564,32 @@ void *ncharTobinary(void *buf) { // todo need to remove , if tobinary is nchar return t; } -bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t typeRight, char **pLeftData, +int32_t convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t typeRight, char **pLeftData, char **pRightData, void *pLeftOut, void *pRightOut, bool *isNull, bool *freeLeft, - bool *freeRight) { + bool *freeRight, bool *result) { + *result = false; if (optr == OP_TYPE_JSON_CONTAINS) { - return true; + *result = true; + return TSDB_CODE_SUCCESS; } if (typeLeft != TSDB_DATA_TYPE_JSON && typeRight != TSDB_DATA_TYPE_JSON) { - return true; + *result = true; + return TSDB_CODE_SUCCESS; } if (typeLeft == TSDB_DATA_TYPE_JSON) { if (tTagIsJson(*pLeftData)) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; - return false; + *result = false; + return TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; } typeLeft = **pLeftData; (*pLeftData)++; } if (typeRight == TSDB_DATA_TYPE_JSON) { if (tTagIsJson(*pRightData)) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; - return false; + *result = false; + return TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; } typeRight = **pRightData; (*pRightData)++; @@ -595,7 +598,8 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t if (optr == OP_TYPE_LIKE || optr == OP_TYPE_NOT_LIKE || optr == OP_TYPE_MATCH || optr == OP_TYPE_NMATCH) { if (typeLeft != TSDB_DATA_TYPE_NCHAR && typeLeft != TSDB_DATA_TYPE_BINARY && typeLeft != TSDB_DATA_TYPE_GEOMETRY && typeLeft != TSDB_DATA_TYPE_VARBINARY) { - return false; + *result = false; + return TSDB_CODE_SUCCESS; } } @@ -605,27 +609,31 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t (IS_VAR_DATA_TYPE(typeLeft) && !IS_VAR_DATA_TYPE(typeRight)) || (IS_VAR_DATA_TYPE(typeRight) && !IS_VAR_DATA_TYPE(typeLeft)) || ((typeLeft == TSDB_DATA_TYPE_BOOL) && (typeRight != TSDB_DATA_TYPE_BOOL)) || - ((typeRight == TSDB_DATA_TYPE_BOOL) && (typeLeft != TSDB_DATA_TYPE_BOOL))) - return false; + ((typeRight == TSDB_DATA_TYPE_BOOL) && (typeLeft != TSDB_DATA_TYPE_BOOL))) { + *result = false; + return TSDB_CODE_SUCCESS; + } if (typeLeft == TSDB_DATA_TYPE_NULL || typeRight == TSDB_DATA_TYPE_NULL) { *isNull = true; - return true; + *result = true; + return TSDB_CODE_SUCCESS; } - int8_t type = vectorGetConvertType(typeLeft, typeRight); + int8_t type = (int8_t)vectorGetConvertType(typeLeft, typeRight); if (type == 0) { - *fp = filterGetCompFunc(typeLeft, optr); - return true; + *result = true; + SCL_RET(filterGetCompFunc(fp, typeLeft, optr)); } - *fp = filterGetCompFunc(type, optr); + SCL_ERR_RET(filterGetCompFunc(fp, type, optr)); if (IS_NUMERIC_TYPE(type)) { if (typeLeft == TSDB_DATA_TYPE_NCHAR || typeLeft == TSDB_DATA_TYPE_VARCHAR || typeLeft == TSDB_DATA_TYPE_GEOMETRY) { - return false; + *result = false; + return TSDB_CODE_SUCCESS; } else if (typeLeft != type) { convertNumberToNumber(*pLeftData, pLeftOut, typeLeft, type); *pLeftData = pLeftOut; @@ -634,7 +642,8 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t if (typeRight == TSDB_DATA_TYPE_NCHAR || typeRight == TSDB_DATA_TYPE_VARCHAR || typeRight == TSDB_DATA_TYPE_GEOMETRY) { - return false; + *result = false; + return TSDB_CODE_SUCCESS; } else if (typeRight != type) { convertNumberToNumber(*pRightData, pRightOut, typeRight, type); *pRightData = pRightOut; @@ -650,10 +659,12 @@ bool convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t t *freeRight = true; } } else { - return false; + *result = false; + return TSDB_CODE_SUCCESS; } - return true; + *result = true; + return TSDB_CODE_SUCCESS; } int32_t vectorConvertToVarData(SSclVectorConvCtx *pCtx) { @@ -1145,7 +1156,7 @@ static void doReleaseVec(SColumnInfoData *pCol, int32_t type) { } } -void vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; @@ -1207,6 +1218,7 @@ void vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } // TODO not correct for descending order scan @@ -1252,7 +1264,7 @@ static void vectorMathTsSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pR } } -void vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1308,6 +1320,7 @@ void vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } // TODO not correct for descending order scan @@ -1331,7 +1344,7 @@ static void vectorMathMultiplyHelper(SColumnInfoData *pLeftCol, SColumnInfoData } } -void vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1362,9 +1375,10 @@ void vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } -void vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1416,9 +1430,10 @@ void vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } -void vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1494,9 +1509,10 @@ void vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } -void vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = pLeft->numOfRows; @@ -1520,9 +1536,10 @@ void vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO } doReleaseVec(pLeftCol, leftConvert); + return TSDB_CODE_SUCCESS; } -void vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = pLeft->numOfRows; @@ -1537,6 +1554,7 @@ void vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, ASSERT(pRight->numOfQualified == 1 || pRight->numOfQualified == 0); pOut->numOfQualified = pRight->numOfQualified * pOut->numOfRows; + return TSDB_CODE_SUCCESS; } static void vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, @@ -1559,7 +1577,7 @@ static void vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRigh } } -void vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1590,6 +1608,7 @@ void vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } static void vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, @@ -1613,7 +1632,7 @@ static void vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRight } } -void vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); @@ -1644,13 +1663,13 @@ void vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); + return TSDB_CODE_SUCCESS; } int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, - int32_t numOfRows, int32_t step, __compar_fn_t fp, int32_t optr) { - int32_t num = 0; + int32_t numOfRows, int32_t step, __compar_fn_t fp, int32_t optr, int32_t *num) { bool *pRes = (bool *)pOut->columnData->pData; - + int32_t code = TSDB_CODE_SUCCESS; if (IS_MATHABLE_TYPE(GET_PARAM_TYPE(pLeft)) && IS_MATHABLE_TYPE(GET_PARAM_TYPE(pRight))) { if (!(pLeft->columnData->hasNull || pRight->columnData->hasNull)) { for (int32_t i = startIndex; i < numOfRows && i >= 0; i += step) { @@ -1662,7 +1681,7 @@ int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa pRes[i] = filterDoCompare(fp, optr, pLeftData, pRightData); if (pRes[i]) { - ++num; + ++(*num); } } } else { @@ -1679,7 +1698,7 @@ int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa char *pRightData = colDataGetData(pRight->columnData, rightIndex); pRes[i] = filterDoCompare(fp, optr, pLeftData, pRightData); if (pRes[i]) { - ++num; + ++(*num); } } } @@ -1702,9 +1721,11 @@ int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa bool freeLeft = false; bool freeRight = false; bool isJsonnull = false; + bool result = false; + + SCL_ERR_RET(convertJsonValue(&fp, optr, GET_PARAM_TYPE(pLeft), GET_PARAM_TYPE(pRight), &pLeftData, &pRightData, + &leftOut, &rightOut, &isJsonnull, &freeLeft, &freeRight, &result)); - bool result = convertJsonValue(&fp, optr, GET_PARAM_TYPE(pLeft), GET_PARAM_TYPE(pRight), &pLeftData, &pRightData, - &leftOut, &rightOut, &isJsonnull, &freeLeft, &freeRight); if (isJsonnull) { ASSERT(0); } @@ -1718,7 +1739,7 @@ int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa bool res = filterDoCompare(fp, optr, pLeftData, pRightData); colDataSetInt8(pOut->columnData, i, (int8_t *)&res); if (res) { - ++num; + ++(*num); } } @@ -1732,10 +1753,10 @@ int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa } } - return num; + return code; } -void doVectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, +int32_t doVectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, int32_t numOfRows, int32_t _ord, int32_t optr) { int32_t i = 0; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; @@ -1743,9 +1764,8 @@ void doVectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO int32_t rType = GET_PARAM_TYPE(pRight); __compar_fn_t fp = NULL; int32_t compRows = 0; - if (lType == rType) { - fp = filterGetCompFunc(lType, optr); + SCL_ERR_RET(filterGetCompFunc(&fp, lType, optr)); } else { fp = filterGetCompFuncEx(lType, rType, optr); } @@ -1775,87 +1795,88 @@ void doVectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO } } } else { // normal compare - pOut->numOfQualified = doVectorCompareImpl(pLeft, pRight, pOut, i, compRows, step, fp, optr); + SCL_ERR_RET(doVectorCompareImpl(pLeft, pRight, pOut, i, compRows, step, fp, optr, &(pOut->numOfQualified))); } + return TSDB_CODE_SUCCESS; } -void vectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, - int32_t numOfRows, int32_t _ord, int32_t optr) { +int32_t vectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, + int32_t numOfRows, int32_t _ord, int32_t optr) { SScalarParam pLeftOut = {0}; SScalarParam pRightOut = {0}; SScalarParam *param1 = NULL; SScalarParam *param2 = NULL; - + int32_t code = TSDB_CODE_SUCCESS; if (noConvertBeforeCompare(GET_PARAM_TYPE(pLeft), GET_PARAM_TYPE(pRight), optr)) { param1 = pLeft; param2 = pRight; } else { - if (vectorConvertCols(pLeft, pRight, &pLeftOut, &pRightOut, startIndex, numOfRows)) { - return; - } + SCL_ERR_JRET(vectorConvertCols(pLeft, pRight, &pLeftOut, &pRightOut, startIndex, numOfRows)); param1 = (pLeftOut.columnData != NULL) ? &pLeftOut : pLeft; param2 = (pRightOut.columnData != NULL) ? &pRightOut : pRight; } - doVectorCompare(param1, param2, pOut, startIndex, numOfRows, _ord, optr); + SCL_ERR_JRET(doVectorCompare(param1, param2, pOut, startIndex, numOfRows, _ord, optr)); +_return: sclFreeParam(&pLeftOut); sclFreeParam(&pRightOut); + SCL_RET(code); } -void vectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord, int32_t optr) { - vectorCompareImpl(pLeft, pRight, pOut, -1, -1, _ord, optr); +int32_t vectorCompare(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord, int32_t optr) { + SCL_RET(vectorCompareImpl(pLeft, pRight, pOut, -1, -1, _ord, optr)); } -void vectorGreater(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_GREATER_THAN); +int32_t vectorGreater(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_GREATER_THAN)); } -void vectorGreaterEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_GREATER_EQUAL); +int32_t vectorGreaterEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_GREATER_EQUAL)); } -void vectorLower(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LOWER_THAN); +int32_t vectorLower(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LOWER_THAN)); } -void vectorLowerEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LOWER_EQUAL); +int32_t vectorLowerEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LOWER_EQUAL)); } -void vectorEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_EQUAL); +int32_t vectorEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_EQUAL)); } -void vectorNotEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_EQUAL); +int32_t vectorNotEqual(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_EQUAL)); } -void vectorIn(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_IN); +int32_t vectorIn(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_IN)); } -void vectorNotIn(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_IN); +int32_t vectorNotIn(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_IN)); } -void vectorLike(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LIKE); +int32_t vectorLike(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_LIKE)); } -void vectorNotLike(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_LIKE); +int32_t vectorNotLike(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NOT_LIKE)); } -void vectorMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_MATCH); +int32_t vectorMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_MATCH)); } -void vectorNotMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NMATCH); +int32_t vectorNotMatch(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_RET(vectorCompare(pLeft, pRight, pOut, _ord, OP_TYPE_NMATCH)); } -void vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { for (int32_t i = 0; i < pLeft->numOfRows; ++i) { int8_t v = IS_HELPER_NULL(pLeft->columnData, i) ? 1 : 0; if (v) { @@ -1865,9 +1886,10 @@ void vectorIsNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, colDataClearNull_f(pOut->columnData->nullbitmap, i); } pOut->numOfRows = pLeft->numOfRows; + return TSDB_CODE_SUCCESS; } -void vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { for (int32_t i = 0; i < pLeft->numOfRows; ++i) { int8_t v = IS_HELPER_NULL(pLeft->columnData, i) ? 0 : 1; if (v) { @@ -1877,10 +1899,11 @@ void vectorNotNull(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut colDataClearNull_f(pOut->columnData->nullbitmap, i); } pOut->numOfRows = pLeft->numOfRows; + return TSDB_CODE_SUCCESS; } -void vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { - vectorConvertSingleColImpl(pLeft, pOut, NULL, -1, -1); +int32_t vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { + SCL_ERR_RET(vectorConvertSingleColImpl(pLeft, pOut, NULL, -1, -1)); for (int32_t i = 0; i < pOut->numOfRows; ++i) { if (colDataIsNull_s(pOut->columnData, i)) { int8_t v = 0; @@ -1896,6 +1919,7 @@ void vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, } } pOut->columnData->hasNull = false; + return TSDB_CODE_SUCCESS; } STagVal getJsonValue(char *json, char *key, bool *isExist) { @@ -1915,7 +1939,7 @@ STagVal getJsonValue(char *json, char *key, bool *isExist) { return val; } -void vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; @@ -1939,9 +1963,10 @@ void vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam colDataSetVal(pOutputCol, i, (const char *)(&isExist), false); } taosMemoryFree(jsonKey); + return TSDB_CODE_SUCCESS; } -void vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { +int32_t vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; @@ -1968,6 +1993,7 @@ void vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO } } taosMemoryFree(jsonKey); + return TSDB_CODE_SUCCESS; } _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binFunctionId) { diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 4543e746a1..990c84371f 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -471,6 +471,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_QRY_GEO_NOT_SUPPORT_ERROR, "Geometry not support TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_WINDOW_CONDITION, "The time pseudo column is illegally used in the condition of the event window.") TAOS_DEFINE_ERROR(TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR, "Executor internal error") TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_JOIN_CONDITION, "Not supported join on condition") +TAOS_DEFINE_ERROR(TSDB_CODE_QRY_FILTER_NOT_SUPPORT_TYPE, "Not supported range type") // grant TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED, "License expired") From 2893a9330316e372de5434cdb39802010452145b Mon Sep 17 00:00:00 2001 From: sima Date: Tue, 16 Jul 2024 19:26:37 +0800 Subject: [PATCH 2/7] enh:[TD-30998] Handling return value in scalar.c --- source/libs/scalar/src/filter.c | 19 +++- source/libs/scalar/src/scalar.c | 160 ++++++++++++++++++++------------ 2 files changed, 120 insertions(+), 59 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index b551851232..8d5a925898 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -1077,10 +1077,17 @@ int32_t filterAddField(SFilterInfo *info, void *desc, void **data, int32_t type, if (info->pctx.valHash == NULL) { info->pctx.valHash = taosHashInit(FILTER_DEFAULT_GROUP_SIZE * FILTER_DEFAULT_VALUE_SIZE, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, false); + if (NULL == info->pctx.valHash) { + fltError("taosHashInit failed, size:%d", FILTER_DEFAULT_GROUP_SIZE * FILTER_DEFAULT_VALUE_SIZE); + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } SFilterDataInfo dInfo = {idx, *data}; - taosHashPut(info->pctx.valHash, *data, dataLen, &dInfo, sizeof(dInfo)); + if (taosHashPut(info->pctx.valHash, *data, dataLen, &dInfo, sizeof(dInfo))) { + fltError("taosHashPut to set failed"); + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } if (srcFlag) { FILTER_SET_FLAG(*srcFlag, FLD_DATA_NO_FREE); } @@ -1141,6 +1148,10 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left, if (info->pctx.unitHash == NULL) { info->pctx.unitHash = taosHashInit(FILTER_DEFAULT_GROUP_SIZE * FILTER_DEFAULT_UNIT_SIZE, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, false); + if (NULL == info->pctx.unitHash) { + fltError("taosHashInit failed, size:%d", FILTER_DEFAULT_GROUP_SIZE * FILTER_DEFAULT_UNIT_SIZE); + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } } else { char v[14] = {0}; FLT_PACKAGE_UNIT_HASH_KEY(&v, optr, optr2, left->idx, (right ? right->idx : -1), (right2 ? right2->idx : -1)); @@ -1198,7 +1209,11 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left, if (FILTER_GET_FLAG(info->options, FLT_OPTION_NEED_UNIQE)) { char v[14] = {0}; FLT_PACKAGE_UNIT_HASH_KEY(&v, optr, optr2, left->idx, (right ? right->idx : -1), (right2 ? right2->idx : -1)); - taosHashPut(info->pctx.unitHash, v, sizeof(v), uidx, sizeof(*uidx)); + if (taosHashPut(info->pctx.unitHash, v, sizeof(v), uidx, sizeof(*uidx))) { + fltError("taosHashPut to set failed"); + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + } ++info->unitNum; diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 389f8b01a3..191ce16da1 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -72,9 +72,16 @@ int32_t sclConvertValueToSclParam(SValueNode *pValueNode, SScalarParam *out, int return code; } - colDataSetVal(in.columnData, 0, nodesGetValueFromNode(pValueNode), false); + code = colDataSetVal(in.columnData, 0, nodesGetValueFromNode(pValueNode), false); + if (code != TSDB_CODE_SUCCESS) { + return code; + } + + code = colInfoDataEnsureCapacity(out->columnData, 1, true); + if (code != TSDB_CODE_SUCCESS) { + return code; + } - colInfoDataEnsureCapacity(out->columnData, 1, true); code = vectorConvertSingleColImpl(&in, out, overflow, -1, -1); sclFreeParam(&in); @@ -84,6 +91,7 @@ int32_t sclConvertValueToSclParam(SValueNode *pValueNode, SScalarParam *out, int int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockList) { SSDataBlock *pb = taosArrayGetP(pBlockList, 0); SScalarParam *pLeft = taosMemoryCalloc(1, sizeof(SScalarParam)); + int32_t code = TSDB_CODE_SUCCESS; if (NULL == pLeft) { sclError("calloc %d failed", (int32_t)sizeof(SScalarParam)); SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); @@ -92,15 +100,16 @@ int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockL pLeft->numOfRows = pb->info.rows; if (pDst->numOfRows < pb->info.rows) { - colInfoDataEnsureCapacity(pDst->columnData, pb->info.rows, true); + SCL_ERR_JRET(colInfoDataEnsureCapacity(pDst->columnData, pb->info.rows, true)); } _bin_scalar_fn_t OperatorFn = getBinScalarOperatorFn(OP_TYPE_ASSIGN); - OperatorFn(pLeft, pSrc, pDst, TSDB_ORDER_ASC); + SCL_ERR_JRET(OperatorFn(pLeft, pSrc, pDst, TSDB_ORDER_ASC)); +_return: taosMemoryFree(pLeft); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) { @@ -345,7 +354,7 @@ int32_t sclInitParam(SNode *node, SScalarParam *param, SScalarCtx *ctx, int32_t if (TSDB_DATA_TYPE_NULL == valueNode->node.resType.type || valueNode->isNull) { colDataSetNULL(param->columnData, 0); } else { - colDataSetVal(param->columnData, 0, nodesGetValueFromNode(valueNode), false); + SCL_ERR_RET(colDataSetVal(param->columnData, 0, nodesGetValueFromNode(valueNode), false)); } break; } @@ -504,23 +513,27 @@ _return: SCL_RET(code); } -int32_t sclGetNodeType(SNode *pNode, SScalarCtx *ctx) { +int32_t sclGetNodeType(SNode *pNode, SScalarCtx *ctx, int32_t *type) { if (NULL == pNode) { - return -1; + *type = -1; + return TSDB_CODE_SUCCESS; } switch ((int)nodeType(pNode)) { case QUERY_NODE_VALUE: { SValueNode *valueNode = (SValueNode *)pNode; - return valueNode->node.resType.type; + *type = valueNode->node.resType.type; + return TSDB_CODE_SUCCESS; } case QUERY_NODE_NODE_LIST: { SNodeListNode *nodeList = (SNodeListNode *)pNode; - return nodeList->node.resType.type; + *type = nodeList->node.resType.type; + return TSDB_CODE_SUCCESS; } case QUERY_NODE_COLUMN: { SColumnNode *colNode = (SColumnNode *)pNode; - return colNode->node.resType.type; + *type = colNode->node.resType.type; + return TSDB_CODE_SUCCESS; } case QUERY_NODE_FUNCTION: case QUERY_NODE_OPERATOR: @@ -528,19 +541,22 @@ int32_t sclGetNodeType(SNode *pNode, SScalarCtx *ctx) { SScalarParam *res = (SScalarParam *)taosHashGet(ctx->pRes, &pNode, POINTER_BYTES); if (NULL == res) { sclError("no result for node, type:%d, node:%p", nodeType(pNode), pNode); - return -1; + SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT); } - return res->columnData->info.type; + *type = (int32_t)(res->columnData->info.type); + return TSDB_CODE_SUCCESS; } } - return -1; + *type = -1; + return TSDB_CODE_SUCCESS; } -void sclSetOperatorValueType(SOperatorNode *node, SScalarCtx *ctx) { +int32_t sclSetOperatorValueType(SOperatorNode *node, SScalarCtx *ctx) { ctx->type.opResType = node->node.resType.type; - ctx->type.selfType = sclGetNodeType(node->pLeft, ctx); - ctx->type.peerType = sclGetNodeType(node->pRight, ctx); + SCL_ERR_RET(sclGetNodeType(node->pLeft, ctx, &(ctx->type.selfType))); + SCL_ERR_RET(sclGetNodeType(node->pRight, ctx, &(ctx->type.peerType))); + SCL_RET(TSDB_CODE_SUCCESS); } int32_t sclInitOperatorParams(SScalarParam **pParams, SOperatorNode *node, SScalarCtx *ctx, int32_t *rowNum) { @@ -557,7 +573,7 @@ int32_t sclInitOperatorParams(SScalarParam **pParams, SOperatorNode *node, SScal SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - sclSetOperatorValueType(node, ctx); + SCL_ERR_JRET(sclSetOperatorValueType(node, ctx)); SCL_ERR_JRET(sclInitParam(node->pLeft, ¶mList[0], ctx, rowNum)); if (paramNum > 1) { @@ -829,7 +845,7 @@ int32_t sclExecLogic(SLogicConditionNode *node, SScalarCtx *ctx, SScalarParam *o } if (complete) { - colDataSetVal(output->columnData, i, (char *)&value, false); + SCL_ERR_JRET(colDataSetVal(output->columnData, i, (char *)&value, false)); if (value) { numOfQualified++; } @@ -877,9 +893,7 @@ int32_t sclExecOperator(SOperatorNode *node, SScalarCtx *ctx, SScalarParam *outp SScalarParam *pLeft = ¶ms[0]; SScalarParam *pRight = paramNum > 1 ? ¶ms[1] : NULL; - terrno = TSDB_CODE_SUCCESS; - OperatorFn(pLeft, pRight, output, TSDB_ORDER_ASC); - code = terrno; + SCL_ERR_JRET(OperatorFn(pLeft, pRight, output, TSDB_ORDER_ASC)); _return: @@ -930,13 +944,14 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp } if (pCase) { - vectorCompare(pCase, pWhen, &comp, TSDB_ORDER_ASC, OP_TYPE_EQUAL); + SCL_ERR_JRET(vectorCompare(pCase, pWhen, &comp, TSDB_ORDER_ASC, OP_TYPE_EQUAL)); for (int32_t i = 0; i < rowNum; ++i) { bool *equal = (bool *)colDataGetData(comp.columnData, (comp.numOfRows > 1 ? i : 0)); if (*equal) { - colDataSetVal(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), - colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0))); + SCL_ERR_JRET(colDataSetVal(output->columnData, i, + colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), + colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)))); if (0 == i && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); break; @@ -953,8 +968,9 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp for (int32_t i = 0; i < rowNum; ++i) { bool *whenValue = (bool *)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? i : 0)); if (*whenValue) { - colDataSetVal(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), - colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0))); + SCL_ERR_JRET(colDataSetVal(output->columnData, i, + colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), + colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)))); if (0 == i && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); break; @@ -1065,42 +1081,34 @@ static uint8_t sclGetOpValueNodeTsPrecision(SNode *pLeft, SNode *pRight) { return 0; } -int32_t sclConvertOpValueNodeTs(SOperatorNode *node, SScalarCtx *ctx) { - int32_t code = 0; +int32_t sclConvertOpValueNodeTs(SOperatorNode *node) { if (node->pLeft && SCL_IS_VAR_VALUE_NODE(node->pLeft)) { if (node->pRight && (TSDB_DATA_TYPE_TIMESTAMP == ((SExprNode *)node->pRight)->resType.type)) { - SCL_ERR_JRET( + SCL_ERR_RET( sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, node->pRight), (SValueNode *)node->pLeft)); } } else if (node->pRight && SCL_IS_NOTNULL_CONST_NODE(node->pRight)) { if (node->pLeft && (TSDB_DATA_TYPE_TIMESTAMP == ((SExprNode *)node->pLeft)->resType.type)) { if (SCL_IS_VAR_VALUE_NODE(node->pRight)) { - SCL_ERR_JRET(sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, node->pRight), + SCL_ERR_RET(sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, node->pRight), (SValueNode *)node->pRight)); } else if (QUERY_NODE_NODE_LIST == node->pRight->type) { SNode *pNode; FOREACH(pNode, ((SNodeListNode *)node->pRight)->pNodeList) { if (SCL_IS_VAR_VALUE_NODE(pNode)) { - SCL_ERR_JRET( + SCL_ERR_RET( sclConvertToTsValueNode(sclGetOpValueNodeTsPrecision(node->pLeft, pNode), (SValueNode *)pNode)); } } } } } - return TSDB_CODE_SUCCESS; - -_return: - - ctx->code = code; - return DEAL_RES_ERROR; } -int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node, SScalarCtx *ctx) { - int32_t code = 0; +int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node) { if (NULL == node->pCase) { return TSDB_CODE_SUCCESS; } @@ -1110,7 +1118,7 @@ int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node, SScalarCtx *ctx) { FOREACH(pNode, node->pWhenThenList) { SExprNode *pExpr = (SExprNode *)((SWhenThenNode *)pNode)->pWhen; if (TSDB_DATA_TYPE_TIMESTAMP == pExpr->resType.type) { - SCL_ERR_JRET(sclConvertToTsValueNode(pExpr->resType.precision, (SValueNode *)node->pCase)); + SCL_ERR_RET(sclConvertToTsValueNode(pExpr->resType.precision, (SValueNode *)node->pCase)); break; } } @@ -1118,18 +1126,13 @@ int32_t sclConvertCaseWhenValueNodeTs(SCaseWhenNode *node, SScalarCtx *ctx) { SNode *pNode; FOREACH(pNode, node->pWhenThenList) { if (SCL_IS_VAR_VALUE_NODE(((SWhenThenNode *)pNode)->pWhen)) { - SCL_ERR_JRET(sclConvertToTsValueNode(((SExprNode *)node->pCase)->resType.precision, + SCL_ERR_RET(sclConvertToTsValueNode(((SExprNode *)node->pCase)->resType.precision, (SValueNode *)((SWhenThenNode *)pNode)->pWhen)); } } } return TSDB_CODE_SUCCESS; - -_return: - - ctx->code = code; - return DEAL_RES_ERROR; } EDealRes sclRewriteNonConstOperator(SNode **pNode, SScalarCtx *ctx) { @@ -1227,14 +1230,30 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { if (type == TSDB_DATA_TYPE_JSON) { int32_t len = getJsonValueLen(output.columnData->pData); res->datum.p = taosMemoryCalloc(len, 1); + if (NULL == res->datum.p) { + sclError("calloc %d failed", len); + sclFreeParam(&output); + ctx->code = TSDB_CODE_OUT_OF_MEMORY; + return DEAL_RES_ERROR; + } memcpy(res->datum.p, output.columnData->pData, len); } else if (IS_VAR_DATA_TYPE(type)) { // res->datum.p = taosMemoryCalloc(res->node.resType.bytes + VARSTR_HEADER_SIZE + 1, 1); res->datum.p = taosMemoryCalloc(varDataTLen(output.columnData->pData) + 1, 1); + if (NULL == res->datum.p) { + sclError("calloc %d failed", (int)(varDataTLen(output.columnData->pData) + 1)); + sclFreeParam(&output); + ctx->code = TSDB_CODE_OUT_OF_MEMORY; + return DEAL_RES_ERROR; + } res->node.resType.bytes = varDataTLen(output.columnData->pData); memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); } else { - nodesSetValueNodeValue(res, output.columnData->pData); + ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); + if (ctx->code) { + sclFreeParam(&output); + return DEAL_RES_ERROR; + } } } @@ -1271,13 +1290,17 @@ EDealRes sclRewriteLogic(SNode **pNode, SScalarCtx *ctx) { res->node.resType = node->node.resType; res->translate = true; - strcpy(res->node.aliasName, node->node.aliasName); + (void)strcpy(res->node.aliasName, node->node.aliasName); int32_t type = output.columnData->info.type; if (IS_VAR_DATA_TYPE(type)) { res->datum.p = output.columnData->pData; output.columnData->pData = NULL; } else { - nodesSetValueNodeValue(res, output.columnData->pData); + ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); + if (ctx->code) { + sclFreeParam(&output); + return DEAL_RES_ERROR; + } } nodesDestroyNode(*pNode); @@ -1290,7 +1313,10 @@ EDealRes sclRewriteLogic(SNode **pNode, SScalarCtx *ctx) { EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) { SOperatorNode *node = (SOperatorNode *)*pNode; - SCL_ERR_RET(sclConvertOpValueNodeTs(node, ctx)); + ctx->code = sclConvertOpValueNodeTs(node); + if (ctx->code) { + return DEAL_RES_ERROR; + } if ((!SCL_IS_CONST_NODE(node->pLeft)) || (!SCL_IS_CONST_NODE(node->pRight))) { return sclRewriteNonConstOperator(pNode, ctx); @@ -1324,7 +1350,11 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) { res->datum.p = output.columnData->pData; output.columnData->pData = NULL; } else { - nodesSetValueNodeValue(res, output.columnData->pData); + ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); + if (ctx->code) { + sclFreeParam(&output); + return DEAL_RES_ERROR; + } } } @@ -1338,7 +1368,10 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) { EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { SCaseWhenNode *node = (SCaseWhenNode *)*pNode; - SCL_ERR_RET(sclConvertCaseWhenValueNodeTs(node, ctx)); + ctx->code = sclConvertCaseWhenValueNodeTs(node); + if (ctx->code) { + return DEAL_RES_ERROR; + } if ((!SCL_IS_CONST_NODE(node->pCase)) || (!SCL_IS_CONST_NODE(node->pElse))) { return DEAL_RES_CONTINUE; @@ -1378,9 +1411,19 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { int32_t type = output.columnData->info.type; if (IS_VAR_DATA_TYPE(type)) { // todo refactor res->datum.p = taosMemoryCalloc(varDataTLen(output.columnData->pData) + 1, sizeof(char)); // add \0 to the end for print json value + if (NULL == res->datum.p) { + sclError("calloc %d failed", (int)(varDataTLen(output.columnData->pData) + 1)); + sclFreeParam(&output); + ctx->code = TSDB_CODE_OUT_OF_MEMORY; + return DEAL_RES_ERROR; + } memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); } else { - nodesSetValueNodeValue(res, output.columnData->pData); + ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); + if (ctx->code) { + sclFreeParam(&output); + return DEAL_RES_ERROR; + } } } @@ -1515,7 +1558,10 @@ EDealRes sclWalkTarget(SNode *pNode, SScalarCtx *ctx) { return DEAL_RES_ERROR; } - colDataAssign(col, res->columnData, res->numOfRows, NULL); + ctx->code = colDataAssign(col, res->columnData, res->numOfRows, NULL); + if (ctx->code) { + return DEAL_RES_ERROR; + } block->info.rows = res->numOfRows; sclFreeParam(res); @@ -1735,8 +1781,8 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) { if (1 == res->numOfRows && pb->info.rows > 0) { SCL_ERR_JRET(sclExtendResRows(pDst, res, pBlockList)); } else { - colInfoDataEnsureCapacity(pDst->columnData, res->numOfRows, true); - colDataAssign(pDst->columnData, res->columnData, res->numOfRows, NULL); + SCL_ERR_JRET(colInfoDataEnsureCapacity(pDst->columnData, res->numOfRows, true)); + SCL_ERR_JRET(colDataAssign(pDst->columnData, res->columnData, res->numOfRows, NULL)); pDst->numOfRows = res->numOfRows; pDst->numOfQualified = res->numOfQualified; } From e0ffc8edcb5404e75f87726a9e710e2f120d1728 Mon Sep 17 00:00:00 2001 From: sima Date: Tue, 16 Jul 2024 19:51:06 +0800 Subject: [PATCH 3/7] enh:[TD-30998] Handling return value in sclfunc.c --- source/libs/scalar/src/filter.c | 12 +- source/libs/scalar/src/scalar.c | 17 +-- source/libs/scalar/src/sclfunc.c | 239 +++++++++++++++++++++---------- 3 files changed, 178 insertions(+), 90 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 8d5a925898..0ffff0e119 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -951,8 +951,8 @@ int32_t filterDetachCnfGroup(SFilterGroup *gp1, SFilterGroup *gp2, SArray *group if (NULL == gp.unitIdxs) { FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(gp.unitIdxs, gp1->unitIdxs, gp1->unitNum * sizeof(*gp.unitIdxs)); - memcpy(gp.unitIdxs + gp1->unitNum, gp2->unitIdxs, gp2->unitNum * sizeof(*gp.unitIdxs)); + (void)memcpy(gp.unitIdxs, gp1->unitIdxs, gp1->unitNum * sizeof(*gp.unitIdxs)); + (void)memcpy(gp.unitIdxs + gp1->unitNum, gp2->unitIdxs, gp2->unitNum * sizeof(*gp.unitIdxs)); gp.unitFlags = NULL; @@ -1290,7 +1290,7 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { code = TSDB_CODE_OUT_OF_MEMORY; break; } - memcpy(data, nodesGetValueFromNode(valueNode), tDataTypes[type].bytes); + (void)memcpy(data, nodesGetValueFromNode(valueNode), tDataTypes[type].bytes); code = filterAddField(info, NULL, (void **)&data, FLD_TYPE_VALUE, &right, len, true, NULL); if (TSDB_CODE_SUCCESS != code) { break; @@ -1735,7 +1735,7 @@ int32_t fltConverToStr(char *str, int type, void *buf, int32_t bufSize, int32_t } *str = '"'; - memcpy(str + 1, buf, bufSize); + (void)memcpy(str + 1, buf, bufSize); *(str + bufSize + 1) = '"'; n = bufSize + 2; break; @@ -2143,7 +2143,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) { } size_t valBytes = IS_VAR_DATA_TYPE(type) ? varDataTLen(out.columnData->pData) : out.columnData->info.bytes; - memcpy(fi->data, out.columnData->pData, valBytes); + (void)memcpy(fi->data, out.columnData->pData, valBytes); colDataDestroy(out.columnData); taosMemoryFree(out.columnData); @@ -3428,6 +3428,7 @@ int32_t filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *p int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); + FLT_ERR_RET(TSDB_CODE_APP_ERROR); } else { varDataSetLen(newColData, len); p[i] = filterDoCompare(gDataCompare[info->cunits[uidx].func], info->cunits[uidx].optr, newColData, @@ -3501,6 +3502,7 @@ int32_t filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); + FLT_ERR_RET(TSDB_CODE_APP_ERROR); } else { varDataSetLen(newColData, len); p[i] = filterDoCompare(gDataCompare[cunit->func], cunit->optr, newColData, cunit->valData); diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 191ce16da1..e920b613cf 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -239,7 +239,7 @@ int32_t sclCopyValueNodeValue(SValueNode *pNode, void **res) { SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(*res, nodesGetValueFromNode(pNode), pNode->node.resType.bytes); + (void)memcpy(*res, nodesGetValueFromNode(pNode), pNode->node.resType.bytes); return TSDB_CODE_SUCCESS; } @@ -893,8 +893,9 @@ int32_t sclExecOperator(SOperatorNode *node, SScalarCtx *ctx, SScalarParam *outp SScalarParam *pLeft = ¶ms[0]; SScalarParam *pRight = paramNum > 1 ? ¶ms[1] : NULL; + terrno = TSDB_CODE_SUCCESS; SCL_ERR_JRET(OperatorFn(pLeft, pRight, output, TSDB_ORDER_ASC)); - + SCL_ERR_JRET(terrno); _return: sclFreeParamList(params, paramNum); @@ -1218,7 +1219,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { res->translate = true; - strcpy(res->node.aliasName, node->node.aliasName); + (void)strcpy(res->node.aliasName, node->node.aliasName); res->node.resType.type = output.columnData->info.type; res->node.resType.bytes = output.columnData->info.bytes; res->node.resType.scale = output.columnData->info.scale; @@ -1236,7 +1237,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { ctx->code = TSDB_CODE_OUT_OF_MEMORY; return DEAL_RES_ERROR; } - memcpy(res->datum.p, output.columnData->pData, len); + (void)memcpy(res->datum.p, output.columnData->pData, len); } else if (IS_VAR_DATA_TYPE(type)) { // res->datum.p = taosMemoryCalloc(res->node.resType.bytes + VARSTR_HEADER_SIZE + 1, 1); res->datum.p = taosMemoryCalloc(varDataTLen(output.columnData->pData) + 1, 1); @@ -1247,7 +1248,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { return DEAL_RES_ERROR; } res->node.resType.bytes = varDataTLen(output.columnData->pData); - memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); + (void)memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); } else { ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); if (ctx->code) { @@ -1339,7 +1340,7 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) { res->translate = true; - strcpy(res->node.aliasName, node->node.aliasName); + (void)strcpy(res->node.aliasName, node->node.aliasName); res->node.resType = node->node.resType; if (colDataIsNull_s(output.columnData, 0)) { res->isNull = true; @@ -1402,7 +1403,7 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { res->translate = true; - strcpy(res->node.aliasName, node->node.aliasName); + (void)strcpy(res->node.aliasName, node->node.aliasName); res->node.resType = node->node.resType; if (colDataIsNull_s(output.columnData, 0)) { res->isNull = true; @@ -1417,7 +1418,7 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { ctx->code = TSDB_CODE_OUT_OF_MEMORY; return DEAL_RES_ERROR; } - memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); + (void)memcpy(res->datum.p, output.columnData->pData, varDataTLen(output.columnData->pData)); } else { ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); if (ctx->code) { diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index 282e935dd8..47fe2bb75c 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -124,7 +124,7 @@ int32_t absFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutpu } default: { - colDataAssign(pOutputData, pInputData, pInput->numOfRows, NULL); + SCL_ERR_RET(colDataAssign(pOutputData, pInputData, pInput->numOfRows, NULL)); } } @@ -277,7 +277,7 @@ static int32_t doScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP } default: { - colDataAssign(pOutputData, pInputData, pInput->numOfRows, NULL); + SCL_ERR_RET(colDataAssign(pOutputData, pInputData, pInput->numOfRows, NULL)); } } @@ -380,6 +380,9 @@ static int32_t doLengthFunction(SScalarParam *pInput, int32_t inputNum, SScalarP static int32_t concatCopyHelper(const char *input, char *output, bool hasNchar, int32_t type, VarDataLenT *dataLen) { if (hasNchar && type == TSDB_DATA_TYPE_VARCHAR) { TdUcs4 *newBuf = taosMemoryCalloc((varDataLen(input) + 1) * TSDB_NCHAR_SIZE, 1); + if (NULL == newBuf) { + return TSDB_CODE_OUT_OF_MEMORY; + } int32_t len = varDataLen(input); bool ret = taosMbsToUcs4(varDataVal(input), len, newBuf, (varDataLen(input) + 1) * TSDB_NCHAR_SIZE, &len); if (!ret) { @@ -410,12 +413,19 @@ static int32_t getNumOfNullEntries(SColumnInfoData *pColumnInfoData, int32_t num } int32_t concatFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { - int32_t ret = TSDB_CODE_SUCCESS; + int32_t code = TSDB_CODE_SUCCESS; SColumnInfoData **pInputData = taosMemoryCalloc(inputNum, sizeof(SColumnInfoData *)); SColumnInfoData *pOutputData = pOutput->columnData; char **input = taosMemoryCalloc(inputNum, POINTER_BYTES); char *outputBuf = NULL; + if (NULL == pInputData) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == input) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + int32_t inputLen = 0; int32_t numOfRows = 0; bool hasNchar = (GET_PARAM_TYPE(pOutput) == TSDB_DATA_TYPE_NCHAR) ? true : false; @@ -441,6 +451,9 @@ int32_t concatFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu int32_t outputLen = inputLen + numOfRows * VARSTR_HEADER_SIZE; outputBuf = taosMemoryCalloc(outputLen, 1); + if (NULL == outputBuf) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } char *output = outputBuf; for (int32_t k = 0; k < numOfRows; ++k) { @@ -462,33 +475,37 @@ int32_t concatFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu int32_t rowIdx = (pInput[i].numOfRows == 1) ? 0 : k; input[i] = colDataGetData(pInputData[i], rowIdx); - ret = concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen); - if (ret != TSDB_CODE_SUCCESS) { - goto DONE; - } + SCL_ERR_JRET(concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen)); } varDataSetLen(output, dataLen); - colDataSetVal(pOutputData, k, output, false); + SCL_ERR_JRET(colDataSetVal(pOutputData, k, output, false)); output += varDataTLen(output); } pOutput->numOfRows = numOfRows; -DONE: +_return: taosMemoryFree(input); taosMemoryFree(outputBuf); taosMemoryFree(pInputData); - return ret; + SCL_RET(code); } int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { - int32_t ret = TSDB_CODE_SUCCESS; + int32_t code = TSDB_CODE_SUCCESS; SColumnInfoData **pInputData = taosMemoryCalloc(inputNum, sizeof(SColumnInfoData *)); SColumnInfoData *pOutputData = pOutput->columnData; char **input = taosMemoryCalloc(inputNum, POINTER_BYTES); char *outputBuf = NULL; + if (NULL == pInputData) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + if (NULL == input) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + int32_t inputLen = 0; int32_t numOfRows = 0; bool hasNchar = (GET_PARAM_TYPE(pOutput) == TSDB_DATA_TYPE_NCHAR) ? true : false; @@ -518,6 +535,10 @@ int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p int32_t outputLen = inputLen + numOfRows * VARSTR_HEADER_SIZE; outputBuf = taosMemoryCalloc(outputLen, 1); + if (NULL == outputBuf) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + char *output = outputBuf; for (int32_t k = 0; k < numOfRows; ++k) { @@ -537,18 +558,12 @@ int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p int32_t rowIdx = (pInput[i].numOfRows == 1) ? 0 : k; input[i] = colDataGetData(pInputData[i], rowIdx); - ret = concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen); - if (ret != TSDB_CODE_SUCCESS) { - goto DONE; - } + SCL_ERR_JRET(concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen)); if (i < inputNum - 1) { // insert the separator char *sep = (pInput[0].numOfRows == 1) ? colDataGetData(pInputData[0], 0) : colDataGetData(pInputData[0], k); - ret = concatCopyHelper(sep, output, hasNchar, GET_PARAM_TYPE(&pInput[0]), &dataLen); - if (ret != TSDB_CODE_SUCCESS) { - goto DONE; - } + SCL_ERR_JRET(concatCopyHelper(sep, output, hasNchar, GET_PARAM_TYPE(&pInput[0]), &dataLen)); } } @@ -557,19 +572,19 @@ int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p memset(output, 0, dataLen); } else { varDataSetLen(output, dataLen); - colDataSetVal(pOutputData, k, output, false); + SCL_ERR_JRET(colDataSetVal(pOutputData, k, output, false)); output += varDataTLen(output); } } pOutput->numOfRows = numOfRows; -DONE: +_return: taosMemoryFree(input); taosMemoryFree(outputBuf); taosMemoryFree(pInputData); - return ret; + return code; } static int32_t doCaseConvFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput, _conv_fn convFn) { @@ -580,6 +595,10 @@ static int32_t doCaseConvFunction(SScalarParam *pInput, int32_t inputNum, SScala int32_t outputLen = pInputData->varmeta.length; char *outputBuf = taosMemoryCalloc(outputLen, 1); + if (outputBuf == NULL) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + char *output = outputBuf; for (int32_t i = 0; i < pInput->numOfRows; ++i) { @@ -600,7 +619,11 @@ static int32_t doCaseConvFunction(SScalarParam *pInput, int32_t inputNum, SScala } } varDataSetLen(output, len); - colDataSetVal(pOutputData, i, output, false); + int32_t code = colDataSetVal(pOutputData, i, output, false); + if (TSDB_CODE_SUCCESS != code) { + taosMemoryFree(outputBuf); + SCL_ERR_RET(code); + } output += varDataTLen(output); } @@ -618,6 +641,10 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar int32_t outputLen = pInputData->varmeta.length; char *outputBuf = taosMemoryCalloc(outputLen, 1); + if (outputBuf == NULL) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + char *output = outputBuf; for (int32_t i = 0; i < pInput->numOfRows; ++i) { @@ -631,7 +658,11 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar int32_t charLen = (type == TSDB_DATA_TYPE_VARCHAR) ? len : len / TSDB_NCHAR_SIZE; trimFn(input, output, type, charLen); - colDataSetVal(pOutputData, i, output, false); + int32_t code = colDataSetVal(pOutputData, i, output, false); + if (TSDB_CODE_SUCCESS != code) { + taosMemoryFree(outputBuf); + SCL_ERR_RET(code); + } output += varDataTLen(output); } @@ -688,7 +719,11 @@ int32_t substrFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu varDataSetLen(output, 0); } - colDataSetVal(pOutputData, i, output, false); + int32_t code = colDataSetVal(pOutputData, i, output, false); + if (TSDB_CODE_SUCCESS != code) { + taosMemoryFree(outputBuf); + SCL_ERR_RET(code); + } } pOutput->numOfRows = pInput->numOfRows; @@ -715,12 +750,21 @@ int32_t md5Function(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOutpu if (bufLen < varDataLen(input) + VARSTR_HEADER_SIZE) { bufLen = varDataLen(input) + VARSTR_HEADER_SIZE; pOutputBuf = taosMemoryRealloc(pOutputBuf, bufLen); + if (!pOutputBuf) { + qError("md5 function alloc memory failed"); + return TSDB_CODE_OUT_OF_MEMORY; + } } char *output = pOutputBuf; memcpy(varDataVal(output), varDataVal(input), varDataLen(input)); int32_t len = taosCreateMD5Hash(varDataVal(output), varDataLen(input)); varDataSetLen(output, len); - colDataSetVal(pOutputData, i, output, false); + int32_t code = colDataSetVal(pOutputData, i, output, false); + if (TSDB_CODE_SUCCESS != code) { + taosMemoryFree(pOutputBuf); + SCL_ERR_RET(code); + } + } pOutput->numOfRows = pInput->numOfRows; taosMemoryFree(pOutputBuf); @@ -1062,7 +1106,10 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp } } - colDataSetVal(pOutput->columnData, i, output, false); + code = colDataSetVal(pOutput->columnData, i, output, false); + if (TSDB_CODE_SUCCESS != code) { + goto _end; + } } pOutput->numOfRows = pInput->numOfRows; @@ -1167,7 +1214,7 @@ _end: memmove(buf + VARSTR_HEADER_SIZE, buf, len); varDataSetLen(buf, len); - colDataSetVal(pOutput->columnData, i, buf, false); + SCL_ERR_RET(colDataSetVal(pOutput->columnData, i, buf, false)); } pOutput->numOfRows = pInput->numOfRows; @@ -1193,7 +1240,7 @@ int32_t toUnixtimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarP if (ret != TSDB_CODE_SUCCESS) { colDataSetNULL(pOutput->columnData, i); } else { - colDataSetVal(pOutput->columnData, i, (char *)&timeVal, false); + SCL_ERR_RET(colDataSetVal(pOutput->columnData, i, (char *)&timeVal, false)); } } @@ -1206,12 +1253,21 @@ int32_t toJsonFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu int32_t type = GET_PARAM_TYPE(pInput); char tmp[TSDB_MAX_JSON_TAG_LEN] = {0}; + int32_t code = TSDB_CODE_SUCCESS; for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { SArray *pTagVals = taosArrayInit(8, sizeof(STagVal)); + if (NULL == pTagVals) { + return TSDB_CODE_OUT_OF_MEMORY; + } STag *pTag = NULL; if (colDataIsNull_s(pInput[0].columnData, i)) { - tTagNew(pTagVals, 1, true, &pTag); + code = tTagNew(pTagVals, 1, true, &pTag); + if (TSDB_CODE_SUCCESS != code) { + tTagFree(pTag); + taosArrayDestroy(pTagVals); + SCL_ERR_RET(code); + } } else { char *input = pInput[0].columnData->pData + pInput[0].columnData->varmeta.offset[i]; if (varDataLen(input) > (TSDB_MAX_JSON_TAG_LEN - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE) { @@ -1221,13 +1277,21 @@ int32_t toJsonFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu memcpy(tmp, varDataVal(input), varDataLen(input)); tmp[varDataLen(input)] = 0; if (parseJsontoTagData(tmp, pTagVals, &pTag, NULL)) { - tTagNew(pTagVals, 1, true, &pTag); + code = tTagNew(pTagVals, 1, true, &pTag); + if (TSDB_CODE_SUCCESS != code) { + tTagFree(pTag); + taosArrayDestroy(pTagVals); + SCL_ERR_RET(code); + } } } - colDataSetVal(pOutput->columnData, i, (const char *)pTag, false); + code = colDataSetVal(pOutput->columnData, i, (const char *)pTag, false); tTagFree(pTag); taosArrayDestroy(pTagVals); + if (TSDB_CODE_SUCCESS != code ) { + SCL_ERR_RET(code); + } } pOutput->numOfRows = pInput->numOfRows; @@ -1242,6 +1306,9 @@ int32_t toTimestampFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam int32_t len, code = TSDB_CODE_SUCCESS; SArray *formats = NULL; + if (tsStr == NULL || format == NULL) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[1].columnData, i) || colDataIsNull_s(pInput[0].columnData, i)) { colDataSetNULL(pOutput->columnData, i); @@ -1251,11 +1318,11 @@ int32_t toTimestampFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam char *tsData = colDataGetData(pInput[0].columnData, i); char *formatData = colDataGetData(pInput[1].columnData, pInput[1].numOfRows > 1 ? i : 0); len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(tsData)); - strncpy(tsStr, varDataVal(tsData), len); + (void)strncpy(tsStr, varDataVal(tsData), len); // No need to handle the return value. tsStr[len] = '\0'; len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(formatData)); if (pInput[1].numOfRows > 1 || i == 0) { - strncpy(format, varDataVal(formatData), len); + (void)strncpy(format, varDataVal(formatData), len); // No need to handle the return value. format[len] = '\0'; if (formats) { taosArrayDestroy(formats); @@ -1267,10 +1334,12 @@ int32_t toTimestampFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam code = taosChar2Ts(format, &formats, tsStr, &ts, precision, errMsg, 128); if (code) { qError("func to_timestamp failed %s", errMsg); - break; + SCL_ERR_JRET(code); } - colDataSetVal(pOutput->columnData, i, (char *)&ts, false); + SCL_ERR_JRET(colDataSetVal(pOutput->columnData, i, (char *)&ts, false)); } + +_return: if (formats) taosArrayDestroy(formats); taosMemoryFree(tsStr); taosMemoryFree(format); @@ -1283,6 +1352,10 @@ int32_t toCharFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOu int32_t len; SArray *formats = NULL; int32_t code = 0; + + if (format == NULL || out == NULL) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[1].columnData, i) || colDataIsNull_s(pInput[0].columnData, i)) { colDataSetNULL(pOutput->columnData, i); @@ -1293,7 +1366,7 @@ int32_t toCharFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOu char *formatData = colDataGetData(pInput[1].columnData, pInput[1].numOfRows > 1 ? i : 0); len = TMIN(TS_FORMAT_MAX_LEN - 1, varDataLen(formatData)); if (pInput[1].numOfRows > 1 || i == 0) { - strncpy(format, varDataVal(formatData), len); + (void)strncpy(format, varDataVal(formatData), len); format[len] = '\0'; if (formats) { taosArrayDestroy(formats); @@ -1301,11 +1374,12 @@ int32_t toCharFunction(SScalarParam* pInput, int32_t inputNum, SScalarParam* pOu } } int32_t precision = pInput[0].columnData->info.precision; - code = taosTs2Char(format, &formats, *(int64_t *)ts, precision, varDataVal(out), TS_FORMAT_MAX_LEN); - if (code) break; + SCL_ERR_JRET(taosTs2Char(format, &formats, *(int64_t *)ts, precision, varDataVal(out), TS_FORMAT_MAX_LEN)); varDataSetLen(out, strlen(varDataVal(out))); - colDataSetVal(pOutput->columnData, i, out, false); + SCL_ERR_JRET(colDataSetVal(pOutput->columnData, i, out, false)); } + +_return: if (formats) taosArrayDestroy(formats); taosMemoryFree(format); taosMemoryFree(out); @@ -1341,7 +1415,7 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } GET_TYPED_DATA(timePrec, int64_t, GET_PARAM_TYPE(&pInput[timePrecIdx]), pInput[timePrecIdx].columnData->pData); - memcpy(timezone, varDataVal(pInput[timeZoneIdx].columnData->pData), varDataLen(pInput[timeZoneIdx].columnData->pData)); + (void)memcpy(timezone, varDataVal(pInput[timeZoneIdx].columnData->pData), varDataLen(pInput[timeZoneIdx].columnData->pData)); for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[0].columnData, i)) { @@ -1373,7 +1447,7 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else { timeVal = timeVal / timeUnit * timeUnit; } - colDataSetVal(pOutput->columnData, i, (char *)&timeVal, false); + SCL_ERR_RET(colDataSetVal(pOutput->columnData, i, (char *)&timeVal, false)); } pOutput->numOfRows = pInput->numOfRows; @@ -1507,7 +1581,7 @@ int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p } } - colDataSetVal(pOutput->columnData, i, (char *)&result, false); + SCL_ERR_RET(colDataSetVal(pOutput->columnData, i, (char *)&result, false)); } pOutput->numOfRows = numOfRows; @@ -1541,10 +1615,10 @@ int32_t todayFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOut int32_t timezoneFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { char output[TD_TIMEZONE_LEN + VARSTR_HEADER_SIZE] = {0}; - memcpy(varDataVal(output), tsTimezoneStr, TD_TIMEZONE_LEN); + (void)memcpy(varDataVal(output), tsTimezoneStr, TD_TIMEZONE_LEN); varDataSetLen(output, strlen(tsTimezoneStr)); for (int32_t i = 0; i < pInput->numOfRows; ++i) { - colDataSetVal(pOutput->columnData, i, output, false); + SCL_ERR_RET(colDataSetVal(pOutput->columnData, i, output, false)); } pOutput->numOfRows = pInput->numOfRows; return TSDB_CODE_SUCCESS; @@ -2259,16 +2333,16 @@ int32_t leastSQRScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarPa char interceptBuf[64] = {0}; int n = snprintf(slopBuf, 64, "%.6lf", matrix02); if (n > LEASTSQUARES_DOUBLE_ITEM_LENGTH) { - snprintf(slopBuf, 64, "%." DOUBLE_PRECISION_DIGITS, matrix02); + (void)snprintf(slopBuf, 64, "%." DOUBLE_PRECISION_DIGITS, matrix02); } n = snprintf(interceptBuf, 64, "%.6lf", matrix12); if (n > LEASTSQUARES_DOUBLE_ITEM_LENGTH) { - snprintf(interceptBuf, 64, "%." DOUBLE_PRECISION_DIGITS, matrix12); + (void) snprintf(interceptBuf, 64, "%." DOUBLE_PRECISION_DIGITS, matrix12); } size_t len = snprintf(varDataVal(buf), sizeof(buf) - VARSTR_HEADER_SIZE, "{slop:%s, intercept:%s}", slopBuf, interceptBuf); varDataSetLen(buf, len); - colDataSetVal(pOutputData, 0, buf, false); + SCL_ERR_RET(colDataSetVal(pOutputData, 0, buf, false)); } pOutput->numOfRows = 1; @@ -2295,7 +2369,7 @@ int32_t percentileScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalar if (hasNull) { colDataSetNULL(pOutputData, 0); } else { - colDataSetVal(pOutputData, 0, (char *)&val, false); + SCL_ERR_RET(colDataSetVal(pOutputData, 0, (char *)&val, false)); } pOutput->numOfRows = 1; @@ -2341,7 +2415,7 @@ int32_t spreadScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara colDataSetNULL(pOutputData, 0); } else { double result = max - min; - colDataSetVal(pOutputData, 0, (char *)&result, false); + SCL_ERR_RET(colDataSetVal(pOutputData, 0, (char *)&result, false)); } pOutput->numOfRows = 1; @@ -2544,7 +2618,7 @@ int32_t stateCountScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalar } else { count = 0; } - colDataSetVal(pOutputData, i, (char *)&out, false); + SCL_ERR_RET(colDataSetVal(pOutputData, i, (char *)&out, false)); } pOutput->numOfRows = pInput->numOfRows; @@ -2568,7 +2642,7 @@ int32_t stateDurationScalarFunction(SScalarParam *pInput, int32_t inputNum, SSca if (ret) { out = 0; } - colDataSetVal(pOutputData, i, (char *)&out, false); + SCL_ERR_RET(colDataSetVal(pOutputData, i, (char *)&out, false)); } pOutput->numOfRows = pInput->numOfRows; @@ -2599,7 +2673,7 @@ typedef struct SHistoFuncBin { double percentage; } SHistoFuncBin; -static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *binDescStr, int8_t binType, +static int32_t getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *binDescStr, int8_t binType, bool normalized) { cJSON *binDesc = cJSON_Parse(binDescStr); int32_t numOfBins; @@ -2609,7 +2683,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin int32_t startIndex; if (numOfParams != 4) { cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } cJSON *start = cJSON_GetObjectItem(binDesc, "start"); @@ -2620,18 +2694,18 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin if (!cJSON_IsNumber(start) || !cJSON_IsNumber(count) || !cJSON_IsBool(infinity)) { cJSON_Delete(binDesc); - return false; + SCL_RET(TSDB_CODE_SUCCESS); } if (count->valueint <= 0 || count->valueint > 1000) { // limit count to 1000 cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } if (isinf(start->valuedouble) || (width != NULL && isinf(width->valuedouble)) || (factor != NULL && isinf(factor->valuedouble)) || (count != NULL && isinf(count->valuedouble))) { cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } int32_t counter = (int32_t)count->valueint; @@ -2644,19 +2718,22 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin } intervals = taosMemoryCalloc(numOfBins, sizeof(double)); + if (NULL == intervals) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } if (cJSON_IsNumber(width) && factor == NULL && binType == LINEAR_BIN) { // linear bin process if (width->valuedouble == 0) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } for (int i = 0; i < counter + 1; ++i) { intervals[startIndex] = start->valuedouble + i * width->valuedouble; if (isinf(intervals[startIndex])) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } startIndex++; } @@ -2665,26 +2742,26 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin if (start->valuedouble == 0) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } if (factor->valuedouble < 0 || factor->valuedouble == 0 || factor->valuedouble == 1) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } for (int i = 0; i < counter + 1; ++i) { intervals[startIndex] = start->valuedouble * pow(factor->valuedouble, i * 1.0); if (isinf(intervals[startIndex])) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } startIndex++; } } else { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } if (infinity->valueint == true) { @@ -2692,7 +2769,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin intervals[numOfBins - 1] = INFINITY; // in case of desc bin orders, -inf/inf should be swapped if (numOfBins < 4) { - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } if (intervals[1] > intervals[numOfBins - 2]) { TSWAP(intervals[0], intervals[numOfBins - 1]); @@ -2701,15 +2778,18 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin } else if (cJSON_IsArray(binDesc)) { /* user input bins */ if (binType != USER_INPUT_BIN) { cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } numOfBins = cJSON_GetArraySize(binDesc); intervals = taosMemoryCalloc(numOfBins, sizeof(double)); + if (NULL == intervals) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } cJSON *bin = binDesc->child; if (bin == NULL) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } int i = 0; while (bin) { @@ -2717,23 +2797,26 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin if (!cJSON_IsNumber(bin)) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } if (i != 0 && intervals[i] <= intervals[i - 1]) { taosMemoryFree(intervals); cJSON_Delete(binDesc); - return false; + SCL_ERR_RET(TSDB_CODE_FAILED); } bin = bin->next; i++; } } else { cJSON_Delete(binDesc); - return false; + SCL_RET(TSDB_CODE_FAILED); } *binNum = numOfBins - 1; *bins = taosMemoryCalloc(numOfBins, sizeof(SHistoFuncBin)); + if (NULL == bins) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } for (int32_t i = 0; i < *binNum; ++i) { (*bins)[i].lower = intervals[i] < intervals[i + 1] ? intervals[i] : intervals[i + 1]; (*bins)[i].upper = intervals[i + 1] > intervals[i] ? intervals[i + 1] : intervals[i]; @@ -2743,7 +2826,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin taosMemoryFree(intervals); cJSON_Delete(binDesc); - return true; + SCL_RET(TSDB_CODE_SUCCESS); } int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { @@ -2762,9 +2845,10 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP int64_t normalized = *(int64_t *)(pInput[3].columnData->pData); int32_t type = GET_PARAM_TYPE(pInput); - if (!getHistogramBinDesc(&bins, &numOfBins, binDesc, binType, (bool)normalized)) { + int32_t code = getHistogramBinDesc(&bins, &numOfBins, binDesc, binType, (bool)normalized); + if (TSDB_CODE_SUCCESS != code) { taosMemoryFree(binDesc); - return TSDB_CODE_FAILED; + return code; } taosMemoryFree(binDesc); @@ -2796,7 +2880,7 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP } } - colInfoDataEnsureCapacity(pOutputData, numOfBins, false); + SCL_ERR_JRET(colInfoDataEnsureCapacity(pOutputData, numOfBins, false)); for (int32_t k = 0; k < numOfBins; ++k) { int32_t len; @@ -2809,11 +2893,12 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP bins[k].upper, bins[k].percentage); } varDataSetLen(buf, len); - colDataSetVal(pOutputData, k, buf, false); + SCL_ERR_JRET(colDataSetVal(pOutputData, k, buf, false)); } - - taosMemoryFree(bins); pOutput->numOfRows = numOfBins; + +_return: + taosMemoryFree(bins); return TSDB_CODE_SUCCESS; } @@ -2830,7 +2915,7 @@ int32_t selectScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } char *data = colDataGetData(pInputData, i); - colDataSetVal(pOutputData, i, data, false); + SCL_ERR_RET(colDataSetVal(pOutputData, i, data, false)); } pOutput->numOfRows = 1; From a1fb874c221c56a52f17f9d119a7a53730f31a8c Mon Sep 17 00:00:00 2001 From: sima Date: Wed, 17 Jul 2024 15:39:50 +0800 Subject: [PATCH 4/7] enh:[TD-30998] Handling return value in sclvector.c --- source/libs/geometry/src/geomFunc.c | 20 +- source/libs/scalar/inc/sclvector.h | 61 +- source/libs/scalar/src/sclfunc.c | 24 +- source/libs/scalar/src/sclvector.c | 635 +++++++++++------- .../libs/scalar/test/scalar/scalarTests.cpp | 2 +- 5 files changed, 478 insertions(+), 264 deletions(-) diff --git a/source/libs/geometry/src/geomFunc.c b/source/libs/geometry/src/geomFunc.c index 2ac1761737..6e32aaf1a6 100644 --- a/source/libs/geometry/src/geomFunc.c +++ b/source/libs/geometry/src/geomFunc.c @@ -143,12 +143,24 @@ int32_t executeMakePointFunc(SColumnInfoData *pInputData[], int32_t iLeft, int32 getDoubleValueFn[1]= getVectorDoubleValueFn(pInputData[1]->info.type); unsigned char *output = NULL; - code = doMakePointFunc(getDoubleValueFn[0](pInputData[0]->pData, iLeft), getDoubleValueFn[1](pInputData[1]->pData, iRight), &output); - if (code != TSDB_CODE_SUCCESS) { + double leftRes = 0; + double rightRes = 0; + code = getDoubleValueFn[0](pInputData[0]->pData, iLeft, &leftRes); + if (TSDB_CODE_SUCCESS != code) { + goto _exit; + } + code = getDoubleValueFn[1](pInputData[1]->pData, iRight, &rightRes); + if (TSDB_CODE_SUCCESS != code) { + goto _exit; + } + code = doMakePointFunc(leftRes, rightRes, &output); + if (TSDB_CODE_SUCCESS != code) { + goto _exit; + } + code = colDataSetVal(pOutputData, TMAX(iLeft, iRight), output, (output == NULL)); + if (TSDB_CODE_SUCCESS != code) { goto _exit; } - - colDataSetVal(pOutputData, TMAX(iLeft, iRight), output, (output == NULL)); _exit: if (output) { diff --git a/source/libs/scalar/inc/sclvector.h b/source/libs/scalar/inc/sclvector.h index 000329be1f..c2eb13dc75 100644 --- a/source/libs/scalar/inc/sclvector.h +++ b/source/libs/scalar/inc/sclvector.h @@ -29,43 +29,54 @@ typedef struct SSclVectorConvCtx { int16_t outType; } SSclVectorConvCtx; -typedef double (*_getDoubleValue_fn_t)(void *src, int32_t index); +typedef int32_t (*_getDoubleValue_fn_t)(void *src, int32_t index, double *out); -static FORCE_INLINE double getVectorDoubleValue_TINYINT(void *src, int32_t index) { - return (double)*((int8_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_TINYINT(void *src, int32_t index, double *out) { + *out = (double)*((int8_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_UTINYINT(void *src, int32_t index) { - return (double)*((uint8_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_UTINYINT(void *src, int32_t index, double *out) { + *out = (double)*((uint8_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_SMALLINT(void *src, int32_t index) { - return (double)*((int16_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_SMALLINT(void *src, int32_t index, double *out) { + *out = (double)*((int16_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_USMALLINT(void *src, int32_t index) { - return (double)*((uint16_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_USMALLINT(void *src, int32_t index, double *out) { + *out = (double)*((uint16_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_INT(void *src, int32_t index) { - return (double)*((int32_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_INT(void *src, int32_t index, double *out) { + *out = (double)*((int32_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_UINT(void *src, int32_t index) { - return (double)*((uint32_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_UINT(void *src, int32_t index, double *out) { + *out = (double)*((uint32_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_BIGINT(void *src, int32_t index) { - return (double)*((int64_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_BIGINT(void *src, int32_t index, double *out) { + *out = (double)*((int64_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_UBIGINT(void *src, int32_t index) { - return (double)*((uint64_t *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_UBIGINT(void *src, int32_t index, double *out) { + *out = (double)*((uint64_t *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_FLOAT(void *src, int32_t index) { - return (double)*((float *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_FLOAT(void *src, int32_t index, double *out) { + *out = (double)*((float *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_DOUBLE(void *src, int32_t index) { - return (double)*((double *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_DOUBLE(void *src, int32_t index, double *out) { + *out = (double)*((double *)src + index); + return TSDB_CODE_SUCCESS; } -static FORCE_INLINE double getVectorDoubleValue_BOOL(void *src, int32_t index) { - return (double)*((bool *)src + index); +static FORCE_INLINE int32_t getVectorDoubleValue_BOOL(void *src, int32_t index, double *out) { + *out = (double)*((bool *)src + index); + return TSDB_CODE_SUCCESS; } -double getVectorDoubleValue_JSON(void *src, int32_t index); +int32_t getVectorDoubleValue_JSON(void *src, int32_t index, double *out); static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType) { _getDoubleValue_fn_t p = NULL; @@ -103,7 +114,7 @@ static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType) return p; } -typedef void (*_bufConverteFunc)(char *buf, SScalarParam *pOut, int32_t outType, int32_t *overflow); +typedef int32_t (*_bufConverteFunc)(char *buf, SScalarParam *pOut, int32_t outType, int32_t *overflow); typedef int32_t (*_bin_scalar_fn_t)(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *output, int32_t order); _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binOperator); diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index 47fe2bb75c..db3a5d8537 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -147,7 +147,9 @@ static int32_t doScalarFunctionUnique(SScalarParam *pInput, int32_t inputNum, SS colDataSetNULL(pOutputData, i); continue; } - double result = valFn(getValueFn(pInputData->pData, i)); + double tmp = 0; + SCL_ERR_RET(getValueFn(pInputData->pData, i, &tmp)); + double result = valFn(tmp); if (isinf(result) || isnan(result)) { colDataSetNULL(pOutputData, i); } else { @@ -182,7 +184,11 @@ static int32_t doScalarFunctionUnique2(SScalarParam *pInput, int32_t inputNum, S colDataSetNULL(pOutputData, i); continue; } - result = valFn(getValueFn[0](pInputData[0]->pData, i), getValueFn[1](pInputData[1]->pData, i)); + double val1 = 0; + double val2 = 0; + SCL_ERR_RET(getValueFn[0](pInputData[0]->pData, i, &val1)); + SCL_ERR_RET(getValueFn[1](pInputData[1]->pData, i, &val2)); + result = valFn(val1, val2); if (isinf(result) || isnan(result)) { colDataSetNULL(pOutputData, i); } else { @@ -198,8 +204,11 @@ static int32_t doScalarFunctionUnique2(SScalarParam *pInput, int32_t inputNum, S colDataSetNULL(pOutputData, i); continue; } - - result = valFn(getValueFn[0](pInputData[0]->pData, 0), getValueFn[1](pInputData[1]->pData, i)); + double val1 = 0; + double val2 = 0; + SCL_ERR_RET(getValueFn[0](pInputData[0]->pData, 0, &val1)); + SCL_ERR_RET(getValueFn[1](pInputData[1]->pData, i, &val2)); + result = valFn(val1, val2); if (isinf(result) || isnan(result)) { colDataSetNULL(pOutputData, i); continue; @@ -217,8 +226,11 @@ static int32_t doScalarFunctionUnique2(SScalarParam *pInput, int32_t inputNum, S colDataSetNULL(pOutputData, i); continue; } - - result = valFn(getValueFn[0](pInputData[0]->pData, i), getValueFn[1](pInputData[1]->pData, 0)); + double val1 = 0; + double val2 = 0; + SCL_ERR_RET(getValueFn[0](pInputData[0]->pData, i, &val1)); + SCL_ERR_RET(getValueFn[1](pInputData[1]->pData, 0, &val2)); + result = valFn(val1, val2); if (isinf(result) || isnan(result)) { colDataSetNULL(pOutputData, i); continue; diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index bafc33a61d..77c8912671 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -96,11 +96,16 @@ void convertNumberToNumber(const void *inData, void *outData, int8_t inType, int } } -void convertNcharToDouble(const void *inData, void *outData) { - char *tmp = taosMemoryMalloc(varDataTLen(inData)); +int32_t convertNcharToDouble(const void *inData, void *outData) { + int32_t code = TSDB_CODE_SUCCESS; + char *tmp = taosMemoryMalloc(varDataTLen(inData)); + if (NULL == tmp) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int len = taosUcs4ToMbs((TdUcs4 *)varDataVal(inData), varDataLen(inData), tmp); if (len < 0) { sclError("castConvert taosUcs4ToMbs error 1"); + SCL_ERR_JRET(TSDB_CODE_FAILED); } tmp[len] = 0; @@ -108,50 +113,89 @@ void convertNcharToDouble(const void *inData, void *outData) { double value = taosStr2Double(tmp, NULL); *((double *)outData) = value; + +_return: taosMemoryFreeClear(tmp); + SCL_RET(code); } -void convertBinaryToDouble(const void *inData, void *outData) { +int32_t convertBinaryToDouble(const void *inData, void *outData) { char *tmp = taosMemoryCalloc(1, varDataTLen(inData)); if (tmp == NULL) { *((double *)outData) = 0.; - return; + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(tmp, varDataVal(inData), varDataLen(inData)); + (void)memcpy(tmp, varDataVal(inData), varDataLen(inData)); double ret = taosStr2Double(tmp, NULL); taosMemoryFree(tmp); *((double *)outData) = ret; + SCL_RET(TSDB_CODE_SUCCESS); } -typedef int64_t (*_getBigintValue_fn_t)(void *src, int32_t index); +typedef int32_t (*_getBigintValue_fn_t)(void *src, int32_t index, int64_t *res); -int64_t getVectorBigintValue_TINYINT(void *src, int32_t index) { return (int64_t) * ((int8_t *)src + index); } -int64_t getVectorBigintValue_UTINYINT(void *src, int32_t index) { return (int64_t) * ((uint8_t *)src + index); } -int64_t getVectorBigintValue_SMALLINT(void *src, int32_t index) { return (int64_t) * ((int16_t *)src + index); } -int64_t getVectorBigintValue_USMALLINT(void *src, int32_t index) { return (int64_t) * ((uint16_t *)src + index); } -int64_t getVectorBigintValue_INT(void *src, int32_t index) { return (int64_t) * ((int32_t *)src + index); } -int64_t getVectorBigintValue_UINT(void *src, int32_t index) { return (int64_t) * ((uint32_t *)src + index); } -int64_t getVectorBigintValue_BIGINT(void *src, int32_t index) { return (int64_t) * ((int64_t *)src + index); } -int64_t getVectorBigintValue_UBIGINT(void *src, int32_t index) { return (int64_t) * ((uint64_t *)src + index); } -int64_t getVectorBigintValue_FLOAT(void *src, int32_t index) { return (int64_t) * ((float *)src + index); } -int64_t getVectorBigintValue_DOUBLE(void *src, int32_t index) { return (int64_t) * ((double *)src + index); } -int64_t getVectorBigintValue_BOOL(void *src, int32_t index) { return (int64_t) * ((bool *)src + index); } +int32_t getVectorBigintValue_TINYINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((int8_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_UTINYINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((uint8_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_SMALLINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((int16_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_USMALLINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((uint16_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_INT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((int32_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_UINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((uint32_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_BIGINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((int64_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_UBIGINT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((uint64_t *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_FLOAT(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((float *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_DOUBLE(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((double *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} +int32_t getVectorBigintValue_BOOL(void *src, int32_t index, int64_t *res) { + *res = (int64_t) * ((bool *)src + index); + SCL_RET(TSDB_CODE_SUCCESS); +} -int64_t getVectorBigintValue_JSON(void *src, int32_t index) { +int32_t getVectorBigintValue_JSON(void *src, int32_t index, int64_t *res) { ASSERT(!colDataIsNull_var(((SColumnInfoData *)src), index)); char *data = colDataGetVarData((SColumnInfoData *)src, index); double out = 0; if (*data == TSDB_DATA_TYPE_NULL) { - return 0; + *res = 0; + SCL_RET(TSDB_CODE_SUCCESS); } else if (*data == TSDB_DATA_TYPE_NCHAR) { // json inner type can not be BINARY - convertNcharToDouble(data + CHAR_BYTES, &out); + SCL_ERR_RET(convertNcharToDouble(data + CHAR_BYTES, &out)); } else if (tTagIsJson(data)) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; - return 0; + *res = 0; + SCL_ERR_RET(TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR); } else { convertNumberToNumber(data + CHAR_BYTES, &out, *data, TSDB_DATA_TYPE_DOUBLE); } - return (int64_t)out; + *res = (int64_t)out; + SCL_RET(TSDB_CODE_SUCCESS); } _getBigintValue_fn_t getVectorBigintValueFn(int32_t srcType) { @@ -190,31 +234,29 @@ _getBigintValue_fn_t getVectorBigintValueFn(int32_t srcType) { return p; } -static FORCE_INLINE void varToTimestamp(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToTimestamp(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { int64_t value = 0; + int32_t code = TSDB_CODE_SUCCESS; if (taosParseTime(buf, &value, strlen(buf), pOut->columnData->info.precision, tsDaylight) != TSDB_CODE_SUCCESS) { value = 0; - terrno = TSDB_CODE_SCALAR_CONVERT_ERROR; + code = TSDB_CODE_SCALAR_CONVERT_ERROR; } colDataSetInt64(pOut->columnData, rowIndex, &value); + SCL_RET(code); } -static FORCE_INLINE void varToSigned(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToSigned(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { if (overflow) { int64_t minValue = tDataTypes[pOut->columnData->info.type].minValue; int64_t maxValue = tDataTypes[pOut->columnData->info.type].maxValue; int64_t value = (int64_t)taosStr2Int64(buf, NULL, 10); if (value > maxValue) { *overflow = 1; - return; + SCL_RET(TSDB_CODE_SUCCESS); } else if (value < minValue) { *overflow = -1; - return; + SCL_RET(TSDB_CODE_SUCCESS); } else { *overflow = 0; } @@ -243,21 +285,20 @@ static FORCE_INLINE void varToSigned(char *buf, SScalarParam *pOut, int32_t rowI break; } } + SCL_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE void varToUnsigned(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToUnsigned(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { if (overflow) { uint64_t minValue = (uint64_t)tDataTypes[pOut->columnData->info.type].minValue; uint64_t maxValue = (uint64_t)tDataTypes[pOut->columnData->info.type].maxValue; uint64_t value = (uint64_t)taosStr2UInt64(buf, NULL, 10); if (value > maxValue) { *overflow = 1; - return; + SCL_RET(TSDB_CODE_SUCCESS); } else if (value < minValue) { *overflow = -1; - return; + SCL_RET(TSDB_CODE_SUCCESS); } else { *overflow = 0; } @@ -285,150 +326,156 @@ static FORCE_INLINE void varToUnsigned(char *buf, SScalarParam *pOut, int32_t ro break; } } + SCL_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE void varToFloat(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToFloat(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { if (TSDB_DATA_TYPE_FLOAT == pOut->columnData->info.type) { float value = taosStr2Float(buf, NULL); colDataSetFloat(pOut->columnData, rowIndex, &value); - return; + SCL_RET(TSDB_CODE_SUCCESS); } double value = taosStr2Double(buf, NULL); colDataSetDouble(pOut->columnData, rowIndex, &value); + SCL_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE void varToBool(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToBool(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { int64_t value = taosStr2Int64(buf, NULL, 10); bool v = (value != 0) ? true : false; colDataSetInt8(pOut->columnData, rowIndex, (int8_t *)&v); + SCL_RET(TSDB_CODE_SUCCESS); } // todo remove this malloc -static FORCE_INLINE void varToVarbinary(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToVarbinary(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { if(isHex(varDataVal(buf), varDataLen(buf))){ if(!isValidateHex(varDataVal(buf), varDataLen(buf))){ - terrno = TSDB_CODE_PAR_INVALID_VARBINARY; - return; + SCL_ERR_RET(TSDB_CODE_PAR_INVALID_VARBINARY); } void* data = NULL; uint32_t size = 0; if(taosHex2Ascii(varDataVal(buf), varDataLen(buf), &data, &size) < 0){ - terrno = TSDB_CODE_OUT_OF_MEMORY; - return; + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } int32_t inputLen = size + VARSTR_HEADER_SIZE; char *t = taosMemoryCalloc(1, inputLen); if (t == NULL) { sclError("Out of memory"); - terrno = TSDB_CODE_OUT_OF_MEMORY; taosMemoryFree(data); - return; + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } varDataSetLen(t, size); - memcpy(varDataVal(t), data, size); - colDataSetVal(pOut->columnData, rowIndex, t, false); + (void)memcpy(varDataVal(t), data, size); + int32_t code = colDataSetVal(pOut->columnData, rowIndex, t, false); taosMemoryFree(t); taosMemoryFree(data); + SCL_ERR_RET(code); }else{ int32_t inputLen = varDataTLen(buf); char *t = taosMemoryCalloc(1, inputLen); if (t == NULL) { sclError("Out of memory"); - terrno = TSDB_CODE_OUT_OF_MEMORY; - return; + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(t, buf, inputLen); - colDataSetVal(pOut->columnData, rowIndex, t, false); + (void)memcpy(t, buf, inputLen); + int32_t code = colDataSetVal(pOut->columnData, rowIndex, t, false); taosMemoryFree(t); + SCL_ERR_RET(code); } + SCL_RET(TSDB_CODE_SUCCESS); } -static FORCE_INLINE void varToNchar(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t varToNchar(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { int32_t len = 0; int32_t inputLen = varDataLen(buf); int32_t outputMaxLen = (inputLen + 1) * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE; + int32_t code = TSDB_CODE_SUCCESS; char *t = taosMemoryCalloc(1, outputMaxLen); + if (NULL == t) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t ret = taosMbsToUcs4(varDataVal(buf), inputLen, (TdUcs4 *)varDataVal(t), outputMaxLen - VARSTR_HEADER_SIZE, &len); if (!ret) { sclError("failed to convert to NCHAR"); - terrno = TSDB_CODE_SCALAR_CONVERT_ERROR; + SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR); } varDataSetLen(t, len); - colDataSetVal(pOut->columnData, rowIndex, t, false); + SCL_ERR_JRET(colDataSetVal(pOut->columnData, rowIndex, t, false)); + +_return: taosMemoryFree(t); + SCL_RET(code); } -static FORCE_INLINE void ncharToVar(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - +static FORCE_INLINE int32_t ncharToVar(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { + int32_t code =TSDB_CODE_SUCCESS; int32_t inputLen = varDataLen(buf); char *t = taosMemoryCalloc(1, inputLen + VARSTR_HEADER_SIZE); + if (NULL == t) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(buf), varDataLen(buf), varDataVal(t)); if (len < 0) { - terrno = TSDB_CODE_SCALAR_CONVERT_ERROR; - taosMemoryFree(t); - return; + SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR); } varDataSetLen(t, len); - colDataSetVal(pOut->columnData, rowIndex, t, false); + SCL_ERR_JRET(colDataSetVal(pOut->columnData, rowIndex, t, false)); + +_return: taosMemoryFree(t); + SCL_RET(code); } -static FORCE_INLINE void varToGeometry(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { +static FORCE_INLINE int32_t varToGeometry(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { //[ToDo] support to parse WKB as well as WKT - terrno = TSDB_CODE_SUCCESS; - + int32_t code = TSDB_CODE_SUCCESS; size_t len = 0; unsigned char *t = NULL; char *output = NULL; if (initCtxGeomFromText()) { sclError("failed to init geometry ctx, %s", getThreadLocalGeosCtx()->errMsg); - terrno = TSDB_CODE_APP_ERROR; - goto _err; + SCL_ERR_JRET(TSDB_CODE_APP_ERROR); } if (doGeomFromText(buf, &t, &len)) { sclInfo("failed to convert text to geometry, %s", getThreadLocalGeosCtx()->errMsg); - terrno = TSDB_CODE_SCALAR_CONVERT_ERROR; - goto _err; + SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR); } output = taosMemoryCalloc(1, len + VARSTR_HEADER_SIZE); - memcpy(output + VARSTR_HEADER_SIZE, t, len); + if (NULL == output) { + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); + } + (void)memcpy(output + VARSTR_HEADER_SIZE, t, len); varDataSetLen(output, len); - colDataSetVal(pOut->columnData, rowIndex, output, false); + SCL_ERR_JRET(colDataSetVal(pOut->columnData, rowIndex, output, false)); taosMemoryFree(output); geosFreeBuffer(t); - return; + SCL_RET(TSDB_CODE_SUCCESS); -_err: +_return: + taosMemoryFree(output); + geosFreeBuffer(t); ASSERT(t == NULL && len == 0); VarDataLenT dummyHeader = 0; - colDataSetVal(pOut->columnData, rowIndex, (const char *)&dummyHeader, false); + SCL_ERR_RET(colDataSetVal(pOut->columnData, rowIndex, (const char *)&dummyHeader, false)); + SCL_RET(code); } // TODO opt performance, tmp is not needed. int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { - terrno = TSDB_CODE_SUCCESS; - + int32_t code = TSDB_CODE_SUCCESS; bool vton = false; _bufConverteFunc func = NULL; @@ -457,8 +504,7 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { vton = true; } else { sclError("invalid convert outType:%d, inType:%d", pCtx->outType, pCtx->inType); - terrno = TSDB_CODE_APP_ERROR; - return terrno; + SCL_ERR_RET(TSDB_CODE_APP_ERROR); } pCtx->pOut->numOfRows = pCtx->pIn->numOfRows; @@ -477,8 +523,7 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { data += CHAR_BYTES; convertType = TSDB_DATA_TYPE_NCHAR; } else if (tTagIsJson(data) || *data == TSDB_DATA_TYPE_NULL) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; - goto _err; + SCL_ERR_JRET(TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR); } else { convertNumberToNumber(data + CHAR_BYTES, colDataGetNumData(pCtx->pOut->columnData, i), *data, pCtx->outType); continue; @@ -490,78 +535,71 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { tmp = taosMemoryMalloc(bufSize); if (tmp == NULL) { sclError("out of memory in vectorConvertFromVarData"); - terrno = TSDB_CODE_OUT_OF_MEMORY; - goto _err; + SCL_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); } } if (vton) { - memcpy(tmp, data, varDataTLen(data)); + (void)memcpy(tmp, data, varDataTLen(data)); } else { if (TSDB_DATA_TYPE_VARCHAR == convertType || TSDB_DATA_TYPE_GEOMETRY == convertType) { - memcpy(tmp, varDataVal(data), varDataLen(data)); + (void)memcpy(tmp, varDataVal(data), varDataLen(data)); tmp[varDataLen(data)] = 0; } else if (TSDB_DATA_TYPE_NCHAR == convertType) { // we need to convert it to native char string, and then perform the string to numeric data if (varDataLen(data) > bufSize) { sclError("castConvert convert buffer size too small"); - terrno = TSDB_CODE_APP_ERROR; - goto _err; + SCL_ERR_JRET(TSDB_CODE_APP_ERROR); } int len = taosUcs4ToMbs((TdUcs4 *)varDataVal(data), varDataLen(data), tmp); if (len < 0) { sclError("castConvert taosUcs4ToMbs error 1"); - terrno = TSDB_CODE_SCALAR_CONVERT_ERROR; - goto _err; + SCL_ERR_JRET(TSDB_CODE_SCALAR_CONVERT_ERROR); } tmp[len] = 0; } } - (*func)(tmp, pCtx->pOut, i, overflow); - if (terrno != TSDB_CODE_SUCCESS) { - goto _err; - } + SCL_ERR_JRET((*func)(tmp, pCtx->pOut, i, overflow)); } -_err: +_return: if (tmp != NULL) { taosMemoryFreeClear(tmp); } - return terrno; + SCL_RET(code); } -double getVectorDoubleValue_JSON(void *src, int32_t index) { +int32_t getVectorDoubleValue_JSON(void *src, int32_t index, double *out) { char *data = colDataGetVarData((SColumnInfoData *)src, index); - double out = 0; + *out = 0; if (*data == TSDB_DATA_TYPE_NULL) { - return out; + SCL_RET(TSDB_CODE_SUCCESS); } else if (*data == TSDB_DATA_TYPE_NCHAR) { // json inner type can not be BINARY - convertNcharToDouble(data + CHAR_BYTES, &out); + SCL_ERR_RET(convertNcharToDouble(data + CHAR_BYTES, out)); } else if (tTagIsJson(data)) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; - return 0; + SCL_ERR_RET(TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR); } else { - convertNumberToNumber(data + CHAR_BYTES, &out, *data, TSDB_DATA_TYPE_DOUBLE); + convertNumberToNumber(data + CHAR_BYTES, out, *data, TSDB_DATA_TYPE_DOUBLE); } - return out; + SCL_RET(TSDB_CODE_SUCCESS); } -void *ncharTobinary(void *buf) { // todo need to remove , if tobinary is nchar +int32_t ncharTobinary(void *buf, void **out) { // todo need to remove , if tobinary is nchar int32_t inputLen = varDataTLen(buf); - void *t = taosMemoryCalloc(1, inputLen); - int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(buf), varDataLen(buf), varDataVal(t)); + *out = taosMemoryCalloc(1, inputLen); + int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(buf), varDataLen(buf), varDataVal(*out)); if (len < 0) { sclError("charset:%s to %s. val:%s convert ncharTobinary failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, (char *)varDataVal(buf)); - taosMemoryFree(t); - return NULL; + taosMemoryFree(*out); + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - varDataSetLen(t, len); - return t; + varDataSetLen(*out, len); + SCL_RET(TSDB_CODE_SUCCESS); } int32_t convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_t typeRight, char **pLeftData, @@ -651,11 +689,15 @@ int32_t convertJsonValue(__compar_fn_t *fp, int32_t optr, int8_t typeLeft, int8_ } else if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_GEOMETRY) { if (typeLeft == TSDB_DATA_TYPE_NCHAR) { - *pLeftData = ncharTobinary(*pLeftData); + char *tmpLeft = NULL; + SCL_ERR_RET(ncharTobinary(*pLeftData, (void *)&tmpLeft)); + *pLeftData = tmpLeft; *freeLeft = true; } if (typeRight == TSDB_DATA_TYPE_NCHAR) { - *pRightData = ncharTobinary(*pRightData); + char *tmpRight = NULL; + SCL_ERR_RET(ncharTobinary(*pRightData, (void *)&tmpRight)); + *pRightData = tmpRight; *freeRight = true; } } else { @@ -685,9 +727,9 @@ int32_t vectorConvertToVarData(SSclVectorConvCtx *pCtx) { int32_t len = sprintf(varDataVal(tmp), "%" PRId64, value); varDataLen(tmp) = len; if (pCtx->outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pCtx->pOut, i, NULL); + SCL_ERR_RET(varToNchar(tmp, pCtx->pOut, i, NULL)); } else { - colDataSetVal(pOutputCol, i, (char *)tmp, false); + SCL_ERR_RET(colDataSetVal(pOutputCol, i, (char *)tmp, false)); } } } else if (IS_UNSIGNED_NUMERIC_TYPE(pCtx->inType)) { @@ -702,9 +744,9 @@ int32_t vectorConvertToVarData(SSclVectorConvCtx *pCtx) { int32_t len = sprintf(varDataVal(tmp), "%" PRIu64, value); varDataLen(tmp) = len; if (pCtx->outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pCtx->pOut, i, NULL); + SCL_ERR_RET(varToNchar(tmp, pCtx->pOut, i, NULL)); } else { - colDataSetVal(pOutputCol, i, (char *)tmp, false); + SCL_ERR_RET(colDataSetVal(pOutputCol, i, (char *)tmp, false)); } } } else if (IS_FLOAT_TYPE(pCtx->inType)) { @@ -719,9 +761,9 @@ int32_t vectorConvertToVarData(SSclVectorConvCtx *pCtx) { int32_t len = sprintf(varDataVal(tmp), "%lf", value); varDataLen(tmp) = len; if (pCtx->outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pCtx->pOut, i, NULL); + SCL_ERR_RET(varToNchar(tmp, pCtx->pOut, i, NULL)); } else { - colDataSetVal(pOutputCol, i, (char *)tmp, false); + SCL_ERR_RET(colDataSetVal(pOutputCol, i, (char *)tmp, false)); } } } else { @@ -1086,7 +1128,7 @@ enum { }; // TODO not correct for descending order scan -static void vectorMathAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, +static int32_t vectorMathAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, int32_t numOfRows, int32_t step, int32_t i) { _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1101,12 +1143,17 @@ static void vectorMathAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRig colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) + getVectorDoubleValueFnRight(RIGHT_COL, 0); + double leftRes = 0; + double rightRes = 0; + SCL_ERR_RET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_RET(getVectorDoubleValueFnRight(RIGHT_COL, 0, &rightRes)); + *output = leftRes + rightRes; } } + SCL_RET(TSDB_CODE_SUCCESS); } -static void vectorMathTsAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, +static int32_t vectorMathTsAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, int32_t numOfRows, int32_t step, int32_t i) { _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1121,32 +1168,38 @@ static void vectorMathTsAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pR colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_RET(getVectorBigintValueFnLeft(pLeftCol->pData, i, &leftRes)); + SCL_ERR_RET(getVectorBigintValueFnRight(pRightCol->pData, 0, &rightRes)); *output = - taosTimeAdd(getVectorBigintValueFnLeft(pLeftCol->pData, i), getVectorBigintValueFnRight(pRightCol->pData, 0), - pRightCol->info.scale, pRightCol->info.precision); + taosTimeAdd(leftRes, rightRes, pRightCol->info.scale, pRightCol->info.precision); } } + SCL_RET(TSDB_CODE_SUCCESS); } -static SColumnInfoData *vectorConvertVarToDouble(SScalarParam *pInput, int32_t *converted) { +static int32_t vectorConvertVarToDouble(SScalarParam *pInput, int32_t *converted, SColumnInfoData **pOutputCol) { SScalarParam output = {0}; SColumnInfoData *pCol = pInput->columnData; if (IS_VAR_DATA_TYPE(pCol->info.type) && pCol->info.type != TSDB_DATA_TYPE_JSON && pCol->info.type != TSDB_DATA_TYPE_VARBINARY) { int32_t code = vectorConvertSingleCol(pInput, &output, TSDB_DATA_TYPE_DOUBLE, -1, -1); if (code != TSDB_CODE_SUCCESS) { - terrno = code; - return NULL; + *pOutputCol = NULL; + SCL_ERR_RET(code); } *converted = VECTOR_DO_CONVERT; - return output.columnData; + *pOutputCol = output.columnData; + SCL_RET(code); } *converted = VECTOR_UN_CONVERT; - return pInput->columnData; + *pOutputCol = pInput->columnData; + SCL_RET(TSDB_CODE_SUCCESS); } static void doReleaseVec(SColumnInfoData *pCol, int32_t type) { @@ -1164,9 +1217,12 @@ int32_t vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); if ((GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_TIMESTAMP && IS_INTEGER_TYPE(GET_PARAM_TYPE(pRight))) || (GET_PARAM_TYPE(pRight) == TSDB_DATA_TYPE_TIMESTAMP && IS_INTEGER_TYPE(GET_PARAM_TYPE(pLeft))) || @@ -1179,21 +1235,25 @@ int32_t vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p if (pLeft->numOfRows == 1 && pRight->numOfRows == 1) { if (GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_TIMESTAMP) { - vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pRight->numOfRows, step, i)); } else { - vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } } else if (pLeft->numOfRows == 1) { - vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } else if (pRight->numOfRows == 1) { - vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i); + SCL_ERR_JRET(vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } else if (pLeft->numOfRows == pRight->numOfRows) { for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) { if (IS_NULL) { colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(pLeftCol->pData, i) + getVectorBigintValueFnRight(pRightCol->pData, i); + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_JRET(getVectorBigintValueFnLeft(pLeftCol->pData, i, &leftRes)); + SCL_ERR_JRET(getVectorBigintValueFnRight(pRightCol->pData, i, &rightRes)); + *output = leftRes + rightRes; } } } else { @@ -1207,22 +1267,27 @@ int32_t vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) + getVectorDoubleValueFnRight(RIGHT_COL, i); + double leftRes = 0; + double rightRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rightRes)); + *output = leftRes + rightRes; } } else if (pLeft->numOfRows == 1) { - vectorMathAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorMathAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } else if (pRight->numOfRows == 1) { - vectorMathAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i); + SCL_ERR_JRET(vectorMathAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } // TODO not correct for descending order scan -static void vectorMathSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, +static int32_t vectorMathSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, int32_t numOfRows, int32_t step, int32_t factor, int32_t i) { _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1237,12 +1302,17 @@ static void vectorMathSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRig colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = (getVectorDoubleValueFnLeft(LEFT_COL, i) - getVectorDoubleValueFnRight(RIGHT_COL, 0)) * factor; + double leftRes = 0; + double rightRes = 0; + SCL_ERR_RET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_RET(getVectorDoubleValueFnRight(RIGHT_COL, 0, &rightRes)); + *output = (leftRes - rightRes) * factor; } } + SCL_RET(TSDB_CODE_SUCCESS); } -static void vectorMathTsSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, +static int32_t vectorMathTsSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, int32_t numOfRows, int32_t step, int32_t factor, int32_t i) { _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1257,11 +1327,15 @@ static void vectorMathTsSubHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pR colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_RET(getVectorBigintValueFnLeft(pLeftCol->pData, i, &leftRes)); + SCL_ERR_RET(getVectorBigintValueFnRight(pRightCol->pData, 0, &rightRes)); *output = - taosTimeAdd(getVectorBigintValueFnLeft(pLeftCol->pData, i), -getVectorBigintValueFnRight(pRightCol->pData, 0), - pRightCol->info.scale, pRightCol->info.precision); + taosTimeAdd(leftRes, -rightRes, pRightCol->info.scale, pRightCol->info.precision); } } + SCL_RET(TSDB_CODE_SUCCESS); } int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { @@ -1269,12 +1343,15 @@ int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); if ((GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_TIMESTAMP && GET_PARAM_TYPE(pRight) == TSDB_DATA_TYPE_BIGINT) || (GET_PARAM_TYPE(pRight) == TSDB_DATA_TYPE_TIMESTAMP && @@ -1284,18 +1361,22 @@ int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); if (pLeft->numOfRows == 1 && pRight->numOfRows == 1) { - vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i); + SCL_ERR_JRET(vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i)); } else if (pLeft->numOfRows == 1) { - vectorMathTsSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i); + SCL_ERR_JRET(vectorMathTsSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i)); } else if (pRight->numOfRows == 1) { - vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i); + SCL_ERR_JRET(vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i)); } else if (pLeft->numOfRows == pRight->numOfRows) { for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) { if (IS_NULL) { colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(pLeftCol->pData, i) - getVectorBigintValueFnRight(pRightCol->pData, i); + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_JRET(getVectorBigintValueFnLeft(pLeftCol->pData, i, &leftRes)); + SCL_ERR_JRET(getVectorBigintValueFnRight(pRightCol->pData, i, &rightRes)); + *output = leftRes - rightRes; } } } else { @@ -1309,22 +1390,27 @@ int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) - getVectorDoubleValueFnRight(RIGHT_COL, i); + double leftRes = 0; + double rightRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rightRes)); + *output = leftRes - rightRes; } } else if (pLeft->numOfRows == 1) { - vectorMathSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i); + SCL_ERR_JRET(vectorMathSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i)); } else if (pRight->numOfRows == 1) { - vectorMathSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i); + SCL_ERR_JRET(vectorMathSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i)); } } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } // TODO not correct for descending order scan -static void vectorMathMultiplyHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, +static int32_t vectorMathMultiplyHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, int32_t numOfRows, int32_t step, int32_t i) { _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1339,21 +1425,29 @@ static void vectorMathMultiplyHelper(SColumnInfoData *pLeftCol, SColumnInfoData colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) * getVectorDoubleValueFnRight(RIGHT_COL, 0); + double leftRes = 0; + double rightRes = 0; + SCL_ERR_RET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_RET(getVectorDoubleValueFnRight(RIGHT_COL, 0, &rightRes)); + *output = leftRes * rightRes; } } + SCL_RET(TSDB_CODE_SUCCESS); } int32_t vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1365,29 +1459,37 @@ int32_t vectorMathMultiply(SScalarParam *pLeft, SScalarParam *pRight, SScalarPar colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) * getVectorDoubleValueFnRight(RIGHT_COL, i); + double leftRes = 0; + double rightRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rightRes)); + *output = leftRes * rightRes; } } else if (pLeft->numOfRows == 1) { - vectorMathMultiplyHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorMathMultiplyHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } else if (pRight->numOfRows == 1) { - vectorMathMultiplyHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i); + SCL_ERR_JRET(vectorMathMultiplyHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1395,54 +1497,81 @@ int32_t vectorMathDivide(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam double *output = (double *)pOutputCol->pData; if (pLeft->numOfRows == pRight->numOfRows) { for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) { - if (IS_NULL || (getVectorDoubleValueFnRight(RIGHT_COL, i) == 0)) { // divide by 0 check + if (IS_NULL) { // divide by 0 check colDataSetNULL(pOutputCol, i); continue; } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) / getVectorDoubleValueFnRight(RIGHT_COL, i); + double rightRes = 0; + SCL_ERR_JRET((getVectorDoubleValueFnRight(RIGHT_COL, i, &rightRes))); + if (rightRes == 0) { + colDataSetNULL(pOutputCol, i); + continue; + } + double leftRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + *output = leftRes / rightRes; } } else if (pLeft->numOfRows == 1) { if (IS_HELPER_NULL(pLeftCol, 0)) { // Set pLeft->numOfRows NULL value colDataSetNNULL(pOutputCol, 0, pRight->numOfRows); } else { for (; i >= 0 && i < pRight->numOfRows; i += step, output += 1) { - if (IS_HELPER_NULL(pRightCol, i) || (getVectorDoubleValueFnRight(RIGHT_COL, i) == 0)) { // divide by 0 check + if (IS_HELPER_NULL(pRightCol, i)) { // divide by 0 check colDataSetNULL(pOutputCol, i); continue; } - *output = getVectorDoubleValueFnLeft(LEFT_COL, 0) / getVectorDoubleValueFnRight(RIGHT_COL, i); + double rightRes = 0; + SCL_ERR_JRET((getVectorDoubleValueFnRight(RIGHT_COL, i, &rightRes))); + if (rightRes == 0) { + colDataSetNULL(pOutputCol, i); + continue; + } + double leftRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, 0, &leftRes)); + *output = leftRes / rightRes; } } } else if (pRight->numOfRows == 1) { - if (IS_HELPER_NULL(pRightCol, 0) || - (getVectorDoubleValueFnRight(RIGHT_COL, 0) == 0)) { // Set pLeft->numOfRows NULL value (divde by 0 check) + if (IS_HELPER_NULL(pRightCol, 0)) { // Set pLeft->numOfRows NULL value (divde by 0 check) colDataSetNNULL(pOutputCol, 0, pLeft->numOfRows); } else { - for (; i >= 0 && i < pLeft->numOfRows; i += step, output += 1) { - if (IS_HELPER_NULL(pLeftCol, i)) { - colDataSetNULL(pOutputCol, i); - continue; + double rightRes = 0; + SCL_ERR_JRET((getVectorDoubleValueFnRight(RIGHT_COL, 0, &rightRes))); + if (rightRes == 0) { + colDataSetNNULL(pOutputCol, 0, pLeft->numOfRows); + } else { + for (; i >= 0 && i < pLeft->numOfRows; i += step, output += 1) { + if (IS_HELPER_NULL(pLeftCol, i)) { + colDataSetNULL(pOutputCol, i); + continue; + } + double leftRes = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &leftRes)); + *output = leftRes / rightRes; } - *output = getVectorDoubleValueFnLeft(LEFT_COL, i) / getVectorDoubleValueFnRight(RIGHT_COL, 0); } } } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); _getDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(pRightCol->info.type); @@ -1456,8 +1585,10 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa continue; } - double lx = getVectorDoubleValueFnLeft(LEFT_COL, i); - double rx = getVectorDoubleValueFnRight(RIGHT_COL, i); + double lx = 0; + double rx = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &lx)); + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rx)); if (isnan(lx) || isinf(lx) || isnan(rx) || isinf(rx) || FLT_EQUAL(rx, 0)) { colDataSetNULL(pOutputCol, i); continue; @@ -1466,7 +1597,8 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa *output = lx - ((int64_t)(lx / rx)) * rx; } } else if (pLeft->numOfRows == 1) { - double lx = getVectorDoubleValueFnLeft(LEFT_COL, 0); + double lx = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, 0, &lx)); if (IS_HELPER_NULL(pLeftCol, 0)) { // Set pLeft->numOfRows NULL value colDataSetNNULL(pOutputCol, 0, pRight->numOfRows); } else { @@ -1476,7 +1608,8 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa continue; } - double rx = getVectorDoubleValueFnRight(RIGHT_COL, i); + double rx = 0; + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rx)); if (isnan(rx) || isinf(rx) || FLT_EQUAL(rx, 0)) { colDataSetNULL(pOutputCol, i); continue; @@ -1486,7 +1619,8 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa } } } else if (pRight->numOfRows == 1) { - double rx = getVectorDoubleValueFnRight(RIGHT_COL, 0); + double rx = 0; + SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, 0, &rx)); if (IS_HELPER_NULL(pRightCol, 0) || FLT_EQUAL(rx, 0)) { // Set pLeft->numOfRows NULL value colDataSetNNULL(pOutputCol, 0, pLeft->numOfRows); } else { @@ -1496,7 +1630,8 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa continue; } - double lx = getVectorDoubleValueFnLeft(LEFT_COL, i); + double lx = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &lx)); if (isnan(lx) || isinf(lx)) { colDataSetNULL(pOutputCol, i); continue; @@ -1507,9 +1642,10 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa } } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { @@ -1517,11 +1653,13 @@ int32_t vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam pOut->numOfRows = pLeft->numOfRows; + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : (pLeft->numOfRows - 1); int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); + SColumnInfoData *pLeftCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); _getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type); @@ -1531,12 +1669,14 @@ int32_t vectorMathMinus(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam colDataSetNULL(pOutputCol, i); continue; } - double result = getVectorDoubleValueFnLeft(LEFT_COL, i); + double result = 0; + SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &result)); *output = (result == 0) ? 0 : -result; } +_return: doReleaseVec(pLeftCol, leftConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { @@ -1548,7 +1688,7 @@ int32_t vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO } else { char *d = colDataGetData(pRight->columnData, 0); for (int32_t i = 0; i < pOut->numOfRows; ++i) { - colDataSetVal(pOutputCol, i, d, false); + SCL_ERR_RET(colDataSetVal(pOutputCol, i, d, false)); } } @@ -1557,8 +1697,8 @@ int32_t vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO return TSDB_CODE_SUCCESS; } -static void vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, - int32_t numOfRows, int32_t step, int32_t i) { +static int32_t vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, + int32_t numOfRows, int32_t step, int32_t i) { _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1572,21 +1712,29 @@ static void vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRigh colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(LEFT_COL, i) & getVectorBigintValueFnRight(RIGHT_COL, 0); + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_RET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_RET(getVectorBigintValueFnRight(RIGHT_COL, 0, &rightRes)); + *output = leftRes & rightRes; } } + SCL_RET(TSDB_CODE_SUCCESS); } int32_t vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1598,21 +1746,26 @@ int32_t vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(LEFT_COL, i) & getVectorBigintValueFnRight(RIGHT_COL, i); + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, i, &rightRes)); + *output = leftRes & rightRes; } } else if (pLeft->numOfRows == 1) { - vectorBitAndHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorBitAndHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } else if (pRight->numOfRows == 1) { - vectorBitAndHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i); + SCL_ERR_JRET(vectorBitAndHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } -static void vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, - int32_t numOfRows, int32_t step, int32_t i) { +static int32_t vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol, + int32_t numOfRows, int32_t step, int32_t i) { _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1621,27 +1774,34 @@ static void vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRight if (IS_HELPER_NULL(pRightCol, 0)) { // Set pLeft->numOfRows NULL value colDataSetNNULL(pOutputCol, 0, numOfRows); } else { - int64_t rx = getVectorBigintValueFnRight(RIGHT_COL, 0); + int64_t rx = 0; + SCL_ERR_RET(getVectorBigintValueFnRight(RIGHT_COL, 0, &rx)); for (; i >= 0 && i < numOfRows; i += step, output += 1) { if (IS_HELPER_NULL(pLeftCol, i)) { colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(LEFT_COL, i) | rx; + int64_t lx = 0; + SCL_ERR_RET(getVectorBigintValueFnLeft(LEFT_COL, i, &lx)); + *output = lx | rx; } } + SCL_RET(TSDB_CODE_SUCCESS); } int32_t vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows); + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; int32_t leftConvert = 0, rightConvert = 0; - SColumnInfoData *pLeftCol = vectorConvertVarToDouble(pLeft, &leftConvert); - SColumnInfoData *pRightCol = vectorConvertVarToDouble(pRight, &rightConvert); + SColumnInfoData *pLeftCol = NULL; + SColumnInfoData *pRightCol = NULL; + SCL_ERR_JRET(vectorConvertVarToDouble(pLeft, &leftConvert, &pLeftCol)); + SCL_ERR_JRET(vectorConvertVarToDouble(pRight, &rightConvert, &pRightCol)); _getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type); _getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type); @@ -1653,17 +1813,22 @@ int32_t vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOu colDataSetNULL(pOutputCol, i); continue; // TODO set null or ignore } - *output = getVectorBigintValueFnLeft(LEFT_COL, i) | getVectorBigintValueFnRight(RIGHT_COL, i); + int64_t leftRes = 0; + int64_t rightRes = 0; + SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes)); + SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, i, &rightRes)); + *output = leftRes | rightRes; } } else if (pLeft->numOfRows == 1) { - vectorBitOrHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i); + SCL_ERR_JRET(vectorBitOrHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i)); } else if (pRight->numOfRows == 1) { - vectorBitOrHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i); + SCL_ERR_JRET(vectorBitOrHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } +_return: doReleaseVec(pLeftCol, leftConvert); doReleaseVec(pRightCol, rightConvert); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t doVectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t startIndex, @@ -1922,26 +2087,26 @@ int32_t vectorIsTrue(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO return TSDB_CODE_SUCCESS; } -STagVal getJsonValue(char *json, char *key, bool *isExist) { - STagVal val = {.pKey = key}; +int32_t getJsonValue(char *json, char *key, bool *isExist, STagVal *val) { + val->pKey = key; if (json == NULL || tTagIsJson((const STag *)json) == false) { - terrno = TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR; if (isExist) { *isExist = false; } - return val; + SCL_ERR_RET(TSDB_CODE_QRY_JSON_NOT_SUPPORT_ERROR); } - bool find = tTagGet(((const STag *)json), &val); // json value is null and not exist is different + bool find = tTagGet(((const STag *)json), val); // json value is null and not exist is different if (isExist) { *isExist = find; } - return val; + SCL_RET(TSDB_CODE_SUCCESS); } int32_t vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; @@ -1949,26 +2114,33 @@ int32_t vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarPar char *pRightData = colDataGetVarData(pRight->columnData, 0); char *jsonKey = taosMemoryCalloc(1, varDataLen(pRightData) + 1); + if (NULL == jsonKey) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); for (; i >= 0 && i < pLeft->numOfRows; i += step) { bool isExist = false; if (!colDataIsNull_var(pLeft->columnData, i)) { char *pLeftData = colDataGetVarData(pLeft->columnData, i); - getJsonValue(pLeftData, jsonKey, &isExist); + STagVal value; + SCL_ERR_JRET(getJsonValue(pLeftData, jsonKey, &isExist, &value)); } if (isExist) { ++pOut->numOfQualified; } - colDataSetVal(pOutputCol, i, (const char *)(&isExist), false); + SCL_ERR_JRET(colDataSetVal(pOutputCol, i, (const char *)(&isExist), false)); } + +_return: taosMemoryFree(jsonKey); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } int32_t vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) { SColumnInfoData *pOutputCol = pOut->columnData; + int32_t code = TSDB_CODE_SUCCESS; int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : TMAX(pLeft->numOfRows, pRight->numOfRows) - 1; int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1; @@ -1976,6 +2148,9 @@ int32_t vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam char *pRightData = colDataGetVarData(pRight->columnData, 0); char *jsonKey = taosMemoryCalloc(1, varDataLen(pRightData) + 1); + if (NULL == jsonKey) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); for (; i >= 0 && i < pLeft->numOfRows; i += step) { if (colDataIsNull_var(pLeft->columnData, i)) { @@ -1985,15 +2160,19 @@ int32_t vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam } char *pLeftData = colDataGetVarData(pLeft->columnData, i); bool isExist = false; - STagVal value = getJsonValue(pLeftData, jsonKey, &isExist); + STagVal value; + SCL_ERR_JRET(getJsonValue(pLeftData, jsonKey, &isExist, &value)); char *data = isExist ? tTagValToData(&value, true) : NULL; - colDataSetVal(pOutputCol, i, data, data == NULL); + code = colDataSetVal(pOutputCol, i, data, data == NULL); if (isExist && IS_VAR_DATA_TYPE(value.type) && data) { taosMemoryFree(data); } + SCL_ERR_JRET(code); } + +_return: taosMemoryFree(jsonKey); - return TSDB_CODE_SUCCESS; + SCL_RET(code); } _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binFunctionId) { diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp index dd88344962..2a333cbfd4 100644 --- a/source/libs/scalar/test/scalar/scalarTests.cpp +++ b/source/libs/scalar/test/scalar/scalarTests.cpp @@ -80,7 +80,7 @@ void scltInitLogFile() { tsAsyncLog = 0; qDebugFlag = 159; - strcpy(tsLogDir, TD_LOG_DIR_PATH); + (void)strcpy(tsLogDir, TD_LOG_DIR_PATH); if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) { printf("failed to open log file in directory:%s\n", tsLogDir); From 71e57b1dfc9280d4478232bd5a9a0f0f28eb7018 Mon Sep 17 00:00:00 2001 From: sima Date: Thu, 18 Jul 2024 11:22:08 +0800 Subject: [PATCH 5/7] enh:[TD-30998] Handling return value in filterTest.c --- source/libs/scalar/inc/filterInt.h | 12 +- source/libs/scalar/src/filter.c | 27 ++- source/libs/scalar/src/scalar.c | 12 +- .../libs/scalar/test/filter/filterTests.cpp | 175 ++++++++++++------ 4 files changed, 147 insertions(+), 79 deletions(-) diff --git a/source/libs/scalar/inc/filterInt.h b/source/libs/scalar/inc/filterInt.h index 964efa8291..a645c43f86 100644 --- a/source/libs/scalar/inc/filterInt.h +++ b/source/libs/scalar/inc/filterInt.h @@ -460,11 +460,13 @@ struct SFilterInfo { #define FILTER_UNIT_GET_R(i, idx) ((i)->unitRes[idx]) #define FILTER_UNIT_SET_R(i, idx, v) (i)->unitRes[idx] = (v) -#define FILTER_PUSH_UNIT(colInfo, u) \ - do { \ - (colInfo).type = RANGE_TYPE_UNIT; \ - (colInfo).dataType = FILTER_UNIT_DATA_TYPE(u); \ - taosArrayPush((SArray *)((colInfo).info), &u); \ +#define FILTER_PUSH_UNIT(colInfo, u) \ + do { \ + (colInfo).type = RANGE_TYPE_UNIT; \ + (colInfo).dataType = FILTER_UNIT_DATA_TYPE(u); \ + if (taosArrayPush((SArray *)((colInfo).info), &u) == NULL) { \ + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); \ + } \ } while (0) #define FILTER_PUSH_VAR_HASH(colInfo, ha) \ do { \ diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 0ffff0e119..c722259361 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -1632,7 +1632,7 @@ EDealRes fltTreeToGroup(SNode *pNode, void *pContext) { cell = cell->pNext; } - taosArrayAddAll(ctx->group, preGroup); + (void)taosArrayAddAll(ctx->group, preGroup); taosArrayDestroy(preGroup); @@ -1825,12 +1825,12 @@ int32_t filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t optio FLT_ERR_RET(fltConverToStr(str + len, type, data, tlen > 32 ? 32 : tlen, &tlen)); } } else { - strcat(str, "NULL"); + (void)strcat(str, "NULL"); } - strcat(str, "]"); + (void)strcat(str, "]"); if (unit->compare.optr2) { - strcat(str, " && "); + (void)strcat(str, " && "); if (unit->compare.optr2 <= OP_TYPE_JSON_CONTAINS) { sprintf(str + strlen(str), "[%d][%d] %s [", refNode->dataBlockId, refNode->slotId, operatorTypeStr(unit->compare.optr2)); @@ -1845,9 +1845,9 @@ int32_t filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t optio } FLT_ERR_RET(fltConverToStr(str + strlen(str), type, data, tlen > 32 ? 32 : tlen, &tlen)); } else { - strcat(str, "NULL"); + (void)strcat(str, "NULL"); } - strcat(str, "]"); + (void)strcat(str, "]"); } qDebug("%s", str); // TODO @@ -1881,15 +1881,15 @@ int32_t filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t optio while (r) { char str[256] = {0}; if (FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_NULL)) { - strcat(str, "(NULL)"); + (void)strcat(str, "(NULL)"); } else { FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? strcat(str, "(") : strcat(str, "["); FLT_ERR_RET(fltConverToStr(str + strlen(str), ctx->type, &r->ra.s, tlen > 32 ? 32 : tlen, &tlen)); FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_EXCLUDE) ? strcat(str, ")") : strcat(str, "]"); } - strcat(str, " - "); + (void)strcat(str, " - "); if (FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_NULL)) { - strcat(str, "(NULL)"); + (void)strcat(str, "(NULL)"); } else { FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_EXCLUDE) ? strcat(str, "(") : strcat(str, "["); FLT_ERR_RET(fltConverToStr(str + strlen(str), ctx->type, &r->ra.e, tlen > 32 ? 32 : tlen, &tlen)); @@ -2692,7 +2692,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR if (gRes[n] == NULL) { if (n < ((*gResNum) - 1)) { - memmove(&gRes[n], &gRes[n + 1], (*gResNum - n - 1) * POINTER_BYTES); + (void)memmove(&gRes[n], &gRes[n + 1], (*gResNum - n - 1) * POINTER_BYTES); } --cEnd; @@ -2713,7 +2713,7 @@ int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gR if (gRes[n] == NULL) { if (n < ((*gResNum) - 1)) { - memmove(&gRes[n], &gRes[n + 1], (*gResNum - n - 1) * POINTER_BYTES); + (void)memmove(&gRes[n], &gRes[n + 1], (*gResNum - n - 1) * POINTER_BYTES); } --cEnd; @@ -2917,10 +2917,9 @@ int32_t filterGenerateColRange(SFilterInfo *info, SFilterGroupCtx **gRes, int32_ if (all) { (void)filterFreeRangeCtx(info->colRange[m]); // No need to handle the return value. info->colRange[m] = NULL; - if (m < (info->colRangeNum - 1)) { - memmove(&info->colRange[m], &info->colRange[m + 1], (info->colRangeNum - m - 1) * POINTER_BYTES); - memmove(&idxs[m], &idxs[m + 1], (info->colRangeNum - m - 1) * sizeof(*idxs)); + (void)memmove(&info->colRange[m], &info->colRange[m + 1], (info->colRangeNum - m - 1) * POINTER_BYTES); + (void)memmove(&idxs[m], &idxs[m + 1], (info->colRangeNum - m - 1) * sizeof(*idxs)); } --info->colRangeNum; diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index e920b613cf..4fbce9e5b2 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -627,7 +627,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell if (*equal) { bool isNull = colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)); char *pData = isNull ? NULL : colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)); - colDataSetVal(output->columnData, rowIdx, pData, isNull); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, pData, isNull)); if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); @@ -641,7 +641,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell if (pElse) { bool isNull = colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)); char *pData = isNull ? NULL : colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)); - colDataSetVal(output->columnData, rowIdx, pData, isNull); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, pData, isNull)); if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pElse->numOfRows && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); @@ -651,7 +651,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell goto _return; } - colDataSetVal(output->columnData, rowIdx, NULL, true); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, NULL, true)); if (0 == rowIdx && 1 == pCase->numOfRows && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); @@ -690,7 +690,7 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCe if (*whenValue) { bool isNull = colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)); char *pData = isNull ? NULL : colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)); - colDataSetVal(output->columnData, rowIdx, pData, isNull); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, pData, isNull)); if (preSingle && 0 == rowIdx && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); @@ -709,7 +709,7 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCe if (pElse) { bool isNull = colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)); char *pData = isNull ? NULL : colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)); - colDataSetVal(output->columnData, rowIdx, pData, isNull); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, pData, isNull)); if (preSingle && 0 == rowIdx && 1 == pElse->numOfRows && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); @@ -719,7 +719,7 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCe goto _return; } - colDataSetVal(output->columnData, rowIdx, NULL, true); + SCL_ERR_JRET(colDataSetVal(output->columnData, rowIdx, NULL, true)); if (preSingle && 0 == rowIdx && totalRows > 1) { SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList)); diff --git a/source/libs/scalar/test/filter/filterTests.cpp b/source/libs/scalar/test/filter/filterTests.cpp index cd3d681f58..49e490f9e9 100644 --- a/source/libs/scalar/test/filter/filterTests.cpp +++ b/source/libs/scalar/test/filter/filterTests.cpp @@ -55,21 +55,24 @@ void flttInitLogFile() { tsAsyncLog = 0; qDebugFlag = 159; - strcpy(tsLogDir, TD_LOG_DIR_PATH); + (void)strcpy(tsLogDir, TD_LOG_DIR_PATH); if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) { printf("failed to open log file in directory:%s\n", tsLogDir); } } -void flttMakeValueNode(SNode **pNode, int32_t dataType, void *value) { +int32_t flttMakeValueNode(SNode **pNode, int32_t dataType, void *value) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_VALUE); SValueNode *vnode = (SValueNode *)node; vnode->node.resType.type = dataType; if (IS_VAR_DATA_TYPE(dataType)) { vnode->datum.p = (char *)taosMemoryMalloc(varDataTLen(value)); - varDataCopy(vnode->datum.p, value); + if (NULL == vnode->datum.p) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + (void)varDataCopy(vnode->datum.p, value); vnode->node.resType.bytes = varDataLen(value); } else { vnode->node.resType.bytes = tDataTypes[dataType].bytes; @@ -77,13 +80,17 @@ void flttMakeValueNode(SNode **pNode, int32_t dataType, void *value) { } *pNode = (SNode *)vnode; + FLT_RET(TSDB_CODE_SUCCESS); } -void flttMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, +int32_t flttMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) { static uint64_t dbidx = 0; SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_COLUMN); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SColumnNode *rnode = (SColumnNode *)node; rnode->node.resType.type = dataType; rnode->node.resType.bytes = dataBytes; @@ -96,23 +103,27 @@ void flttMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in rnode->colId = 3; *pNode = (SNode *)rnode; - return; + FLT_RET(TSDB_CODE_SUCCESS); } if (NULL == *block) { SSDataBlock *res = createDataBlock(); for (int32_t i = 0; i < 2; ++i) { SColumnInfoData idata = createColumnInfoData(TSDB_DATA_TYPE_NULL, 10, 1 + i); - blockDataAppendColInfo(res, &idata); + FLT_ERR_RET(blockDataAppendColInfo(res, &idata)); } SColumnInfoData idata = createColumnInfoData(dataType, dataBytes, 3); - blockDataAppendColInfo(res, &idata); - blockDataEnsureCapacity(res, rowNum); + FLT_ERR_RET(blockDataAppendColInfo(res, &idata)); + FLT_ERR_RET(blockDataEnsureCapacity(res, rowNum)); SColumnInfoData *pColumn = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock); + if (NULL == pColumn) { + fltError("fail to get the last task, num:%d", (int32_t)taosArrayGetSize(res->pDataBlock)); + FLT_ERR_RET(TSDB_CODE_QRY_SYS_ERROR); + } for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pColumn, i, (const char *)value, false); + FLT_ERR_RET(colDataSetVal(pColumn, i, (const char *)value, false)); if (IS_VAR_DATA_TYPE(dataType)) { value = (char *)value + varDataTLen(value); } else { @@ -130,13 +141,16 @@ void flttMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in int32_t idx = taosArrayGetSize(res->pDataBlock); SColumnInfoData idata = createColumnInfoData(dataType, dataBytes, 1 + idx); - blockDataAppendColInfo(res, &idata); - blockDataEnsureCapacity(res, rowNum); + FLT_ERR_RET(blockDataAppendColInfo(res, &idata)); + FLT_ERR_RET(blockDataEnsureCapacity(res, rowNum)); SColumnInfoData *pColumn = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock); - + if (NULL == pColumn) { + fltError("fail to get the last task, num:%d", (int32_t)taosArrayGetSize(res->pDataBlock)); + FLT_ERR_RET(TSDB_CODE_QRY_SYS_ERROR); + } for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pColumn, i, (const char *)value, false); + FLT_ERR_RET(colDataSetVal(pColumn, i, (const char *)value, false)); if (IS_VAR_DATA_TYPE(dataType)) { value = (char *)value + varDataTLen(value); } else { @@ -149,10 +163,14 @@ void flttMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in } *pNode = (SNode *)rnode; + FLT_RET(TSDB_CODE_SUCCESS); } -void flttMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight) { +int32_t flttMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_OPERATOR); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SOperatorNode *onode = (SOperatorNode *)node; onode->node.resType.type = resType; onode->node.resType.bytes = tDataTypes[resType].bytes; @@ -162,10 +180,14 @@ void flttMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode onode->pRight = pRight; *pNode = (SNode *)onode; + FLT_RET(TSDB_CODE_SUCCESS); } -void flttMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeList, int32_t nodeNum) { +int32_t flttMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeList, int32_t nodeNum) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_LOGIC_CONDITION); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SLogicConditionNode *onode = (SLogicConditionNode *)node; onode->condType = opType; onode->node.resType.type = TSDB_DATA_TYPE_BOOL; @@ -173,14 +195,18 @@ void flttMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeLi onode->pParameterList = nodesMakeList(); for (int32_t i = 0; i < nodeNum; ++i) { - nodesListAppend(onode->pParameterList, nodeList[i]); + FLT_ERR_RET(nodesListAppend(onode->pParameterList, nodeList[i])); } *pNode = (SNode *)onode; + FLT_RET(TSDB_CODE_SUCCESS); } -void flttMakeLogicNodeFromList(SNode **pNode, ELogicConditionType opType, SNodeList *nodeList) { +int32_t flttMakeLogicNodeFromList(SNode **pNode, ELogicConditionType opType, SNodeList *nodeList) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_LOGIC_CONDITION); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SLogicConditionNode *onode = (SLogicConditionNode *)node; onode->condType = opType; onode->node.resType.type = TSDB_DATA_TYPE_BOOL; @@ -189,15 +215,20 @@ void flttMakeLogicNodeFromList(SNode **pNode, ELogicConditionType opType, SNodeL onode->pParameterList = nodeList; *pNode = (SNode *)onode; + FLT_RET(TSDB_CODE_SUCCESS); } -void flttMakeListNode(SNode **pNode, SNodeList *list, int32_t resType) { +int32_t flttMakeListNode(SNode **pNode, SNodeList *list, int32_t resType) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_NODE_LIST); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SNodeListNode *lnode = (SNodeListNode *)node; lnode->node.resType.type = resType; lnode->pNodeList = list; *pNode = (SNode *)lnode; + FLT_RET(TSDB_CODE_SUCCESS); } void initScalarParam(SScalarParam *pParam) { @@ -213,17 +244,21 @@ TEST(timerangeTest, greater) { SScalarParam res; initScalarParam(&res); + int32_t code = TSDB_CODE_SUCCESS; int64_t tsmall = 222, tbig = 333; - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); - flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); // SFilterInfo *filter = NULL; // int32_t code = filterInitFromNode(opNode1, &filter, FLT_OPTION_NO_REWRITE|FLT_OPTION_TIMESTAMP); // ASSERT_EQ(code, 0); STimeWindow win = {0}; bool isStrict = false; - int32_t code = filterGetTimeRange(opNode1, &win, &isStrict); + code = filterGetTimeRange(opNode1, &win, &isStrict); ASSERT_EQ(code, 0); ASSERT_EQ(isStrict, true); ASSERT_EQ(win.skey, tsmall + 1); @@ -237,25 +272,33 @@ TEST(timerangeTest, greater_and_lower) { bool eRes[5] = {false, false, true, true, true}; SScalarParam res; initScalarParam(&res); + int32_t code = TSDB_CODE_SUCCESS; int64_t tsmall = 222, tbig = 333; - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); - flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig); - flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); SNode *list[2] = {0}; list[0] = opNode1; list[1] = opNode2; - flttMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = flttMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, 0); // SFilterInfo *filter = NULL; // int32_t code = filterInitFromNode(logicNode, &filter, FLT_OPTION_NO_REWRITE|FLT_OPTION_TIMESTAMP); // ASSERT_EQ(code, 0); STimeWindow win = {0}; bool isStrict = false; - int32_t code = filterGetTimeRange(logicNode, &win, &isStrict); + code = filterGetTimeRange(logicNode, &win, &isStrict); ASSERT_EQ(isStrict, true); ASSERT_EQ(code, 0); ASSERT_EQ(win.skey, tsmall + 1); @@ -269,25 +312,33 @@ TEST(timerangeTest, greater_equal_and_lower_equal) { bool eRes[5] = {false, false, true, true, true}; SScalarParam res; initScalarParam(&res); + int32_t code = TSDB_CODE_SUCCESS; int64_t tsmall = 222, tbig = 333; - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); - flttMakeOpNode(&opNode1, OP_TYPE_GREATER_EQUAL, TSDB_DATA_TYPE_BOOL, pcol, pval); - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig); - flttMakeOpNode(&opNode2, OP_TYPE_LOWER_EQUAL, TSDB_DATA_TYPE_BOOL, pcol, pval); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode1, OP_TYPE_GREATER_EQUAL, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode2, OP_TYPE_LOWER_EQUAL, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); SNode *list[2] = {0}; list[0] = opNode1; list[1] = opNode2; - flttMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = flttMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, 0); // SFilterInfo *filter = NULL; // int32_t code = filterInitFromNode(logicNode, &filter, FLT_OPTION_NO_REWRITE|FLT_OPTION_TIMESTAMP); // ASSERT_EQ(code, 0); STimeWindow win = {0}; bool isStrict = false; - int32_t code = filterGetTimeRange(logicNode, &win, &isStrict); + code = filterGetTimeRange(logicNode, &win, &isStrict); ASSERT_EQ(isStrict, true); ASSERT_EQ(code, 0); ASSERT_EQ(win.skey, tsmall); @@ -301,42 +352,58 @@ TEST(timerangeTest, greater_and_lower_not_strict) { bool eRes[5] = {false, false, true, true, true}; SScalarParam res; initScalarParam(&res); + int32_t code = TSDB_CODE_SUCCESS; int64_t tsmall1 = 222, tbig1 = 333; int64_t tsmall2 = 444, tbig2 = 555; SNode *list[2] = {0}; - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall1); - flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig1); - flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall1); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig1); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); list[0] = opNode1; list[1] = opNode2; - flttMakeLogicNode(&logicNode1, LOGIC_COND_TYPE_AND, list, 2); + code = flttMakeLogicNode(&logicNode1, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, 0); - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall2); - flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); - flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); - flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig2); - flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tsmall2); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); + code = flttMakeColumnNode(&pcol, NULL, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, 0); + code = flttMakeValueNode(&pval, TSDB_DATA_TYPE_TIMESTAMP, &tbig2); + ASSERT_EQ(code, 0); + code = flttMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol, pval); + ASSERT_EQ(code, 0); list[0] = opNode1; list[1] = opNode2; - flttMakeLogicNode(&logicNode2, LOGIC_COND_TYPE_AND, list, 2); + code = flttMakeLogicNode(&logicNode2, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, 0); list[0] = logicNode1; list[1] = logicNode2; - flttMakeLogicNode(&logicNode1, LOGIC_COND_TYPE_OR, list, 2); + code = flttMakeLogicNode(&logicNode1, LOGIC_COND_TYPE_OR, list, 2); + ASSERT_EQ(code, 0); // SFilterInfo *filter = NULL; // int32_t code = filterInitFromNode(logicNode, &filter, FLT_OPTION_NO_REWRITE|FLT_OPTION_TIMESTAMP); // ASSERT_EQ(code, 0); STimeWindow win = {0}; bool isStrict = false; - int32_t code = filterGetTimeRange(logicNode1, &win, &isStrict); + code = filterGetTimeRange(logicNode1, &win, &isStrict); ASSERT_EQ(isStrict, false); ASSERT_EQ(code, 0); ASSERT_EQ(win.skey, tsmall1 + 1); From e7c58ff8c8dc98084952f3639ddc3f948ca29b7e Mon Sep 17 00:00:00 2001 From: sima Date: Thu, 18 Jul 2024 15:40:21 +0800 Subject: [PATCH 6/7] enh:[TD-30998] Handling return value in scalarTest.c --- source/libs/scalar/src/filter.c | 14 +- source/libs/scalar/src/scalar.c | 4 +- source/libs/scalar/src/sclvector.c | 4 +- .../libs/scalar/test/filter/filterTests.cpp | 3 + .../libs/scalar/test/scalar/scalarTests.cpp | 1963 +++++++++++------ 5 files changed, 1306 insertions(+), 682 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index c722259361..b100f719a4 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -1172,7 +1172,7 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left, return TSDB_CODE_OUT_OF_MEMORY; } info->units = (SFilterUnit *)tmp; - memset(info->units + psize, 0, sizeof(*info->units) * FILTER_DEFAULT_UNIT_SIZE); + (void)memset(info->units + psize, 0, sizeof(*info->units) * FILTER_DEFAULT_UNIT_SIZE); } SFilterUnit *u = &info->units[info->unitNum]; @@ -1485,7 +1485,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan if (ctx->notnull) { ASSERT(!ctx->isrange); - memset(g, 0, sizeof(*g)); + (void)memset(g, 0, sizeof(*g)); FLT_ERR_RET(filterAddUnit(dst, OP_TYPE_IS_NOT_NULL, &left, NULL, &uidx)); FLT_ERR_RET(filterAddUnitToGroup(g, uidx)); @@ -1503,7 +1503,7 @@ int32_t filterAddGroupUnitFromCtx(SFilterInfo *dst, SFilterInfo *src, SFilterRan SFilterRangeNode *r = ctx->rs; while (r) { - memset(g, 0, sizeof(*g)); + (void)memset(g, 0, sizeof(*g)); if ((!FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_NULL)) && (!FILTER_GET_FLAG(r->ra.eflag, RANGE_FLG_NULL))) { __compar_fn_t func = getComparFunc(type, 0); @@ -2158,7 +2158,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) { return TSDB_CODE_APP_ERROR; } varDataSetLen(newValData, len); - varDataCopy(fi->data, newValData); + (void)varDataCopy(fi->data, newValData); } } @@ -2790,7 +2790,7 @@ int32_t filterRewrite(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gResNum FLT_ERR_JRET(terrno); } - memset(info, 0, sizeof(*info)); + (void)memset(info, 0, sizeof(*info)); info->colRangeNum = oinfo.colRangeNum; info->colRange = oinfo.colRange; @@ -3009,7 +3009,7 @@ int32_t filterUpdateComUnits(SFilterInfo *info) { int32_t filterRmUnitByRange(SFilterInfo *info, SColumnDataAgg *pDataStatis, int32_t numOfCols, int32_t numOfRows) { int32_t rmUnit = 0; - memset(info->blkUnitRes, 0, sizeof(*info->blkUnitRes) * info->unitNum); + (void)memset(info->blkUnitRes, 0, sizeof(*info->blkUnitRes) * info->unitNum); for (uint32_t k = 0; k < info->unitNum; ++k) { int32_t index = -1; @@ -4393,7 +4393,7 @@ int32_t filterConverNcharColumns(SFilterInfo *info, int32_t rows, bool *gotNchar if (k == varSrcLen) { /* NULL */ varDataLen(dst) = (VarDataLenT)varSrcLen; - varDataCopy(dst, src); + (void)varDataCopy(dst, src); continue; } bool ret = taosMbsToUcs4(varDataVal(src), varDataLen(src), (TdUcs4 *)varDataVal(dst), bufSize, &len); diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 4fbce9e5b2..6b28269e30 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -1566,7 +1566,7 @@ EDealRes sclWalkTarget(SNode *pNode, SScalarCtx *ctx) { block->info.rows = res->numOfRows; sclFreeParam(res); - taosHashRemove(ctx->pRes, (void *)&target->pExpr, POINTER_BYTES); + (void)taosHashRemove(ctx->pRes, (void *)&target->pExpr, POINTER_BYTES); return DEAL_RES_CONTINUE; } @@ -1789,7 +1789,7 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) { } sclFreeParam(res); - taosHashRemove(ctx.pRes, (void *)&pNode, POINTER_BYTES); + (void)taosHashRemove(ctx.pRes, (void *)&pNode, POINTER_BYTES); } _return: diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 77c8912671..f841ec6618 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -2117,7 +2117,7 @@ int32_t vectorJsonContains(SScalarParam *pLeft, SScalarParam *pRight, SScalarPar if (NULL == jsonKey) { SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); + (void)memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); for (; i >= 0 && i < pLeft->numOfRows; i += step) { bool isExist = false; @@ -2151,7 +2151,7 @@ int32_t vectorJsonArrow(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam if (NULL == jsonKey) { SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } - memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); + (void)memcpy(jsonKey, varDataVal(pRightData), varDataLen(pRightData)); for (; i >= 0 && i < pLeft->numOfRows; i += step) { if (colDataIsNull_var(pLeft->columnData, i)) { colDataSetNull_var(pOutputCol, i); diff --git a/source/libs/scalar/test/filter/filterTests.cpp b/source/libs/scalar/test/filter/filterTests.cpp index 49e490f9e9..26f9024f3e 100644 --- a/source/libs/scalar/test/filter/filterTests.cpp +++ b/source/libs/scalar/test/filter/filterTests.cpp @@ -64,6 +64,9 @@ void flttInitLogFile() { int32_t flttMakeValueNode(SNode **pNode, int32_t dataType, void *value) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_VALUE); + if (NULL == node) { + FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SValueNode *vnode = (SValueNode *)node; vnode->node.resType.type = dataType; diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp index 2a333cbfd4..41be682a65 100644 --- a/source/libs/scalar/test/scalar/scalarTests.cpp +++ b/source/libs/scalar/test/scalar/scalarTests.cpp @@ -36,6 +36,7 @@ #include "nodes.h" #include "parUtil.h" #include "scalar.h" +#include "sclInt.h" #include "stub.h" #include "taos.h" #include "tdatablock.h" @@ -72,7 +73,7 @@ SColumnInfo createColumnInfo(int32_t colId, int32_t type, int32_t bytes) { int64_t scltLeftV = 21, scltRightV = 10; double scltLeftVd = 21.0, scltRightVd = 10.0; -void scltFreeDataBlock(void *block) { blockDataDestroy(*(SSDataBlock **)block); } +void scltFreeDataBlock(void *block) { (void)blockDataDestroy(*(SSDataBlock **)block); } void scltInitLogFile() { const char *defaultLogFileNamePrefix = "taoslog"; @@ -87,23 +88,34 @@ void scltInitLogFile() { } } -void scltAppendReservedSlot(SArray *pBlockList, int16_t *dataBlockId, int16_t *slotId, bool newBlock, int32_t rows, - SColumnInfo *colInfo) { +int32_t scltAppendReservedSlot(SArray *pBlockList, int16_t *dataBlockId, int16_t *slotId, bool newBlock, int32_t rows, + SColumnInfo *colInfo) { if (newBlock) { SSDataBlock *res = createDataBlock(); + if (NULL == res || NULL == res->pDataBlock) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SColumnInfoData idata = {0}; idata.info = *colInfo; - colInfoDataEnsureCapacity(&idata, rows, true); + int32_t code = colInfoDataEnsureCapacity(&idata, rows, true); + if (code != TSDB_CODE_SUCCESS) { + taosMemoryFree(&idata); + SCL_ERR_RET(code); + } - blockDataAppendColInfo(res, &idata); + code = blockDataAppendColInfo(res, &idata); + if (code != TSDB_CODE_SUCCESS) { + blockDataFreeRes(res); + SCL_ERR_RET(code); + } res->info.capacity = rows; res->info.rows = rows; SColumnInfoData *p = static_cast(taosArrayGet(res->pDataBlock, 0)); ASSERT(p->pData != NULL && p->nullbitmap != NULL); - taosArrayPush(pBlockList, &res); + (void)taosArrayPush(pBlockList, &res); *dataBlockId = taosArrayGetSize(pBlockList) - 1; res->info.id.blockId = *dataBlockId; *slotId = 0; @@ -111,34 +123,55 @@ void scltAppendReservedSlot(SArray *pBlockList, int16_t *dataBlockId, int16_t *s SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(pBlockList); SColumnInfoData idata = {0}; idata.info = *colInfo; - colInfoDataEnsureCapacity(&idata, rows, true); - blockDataAppendColInfo(res, &idata); + int32_t code = colInfoDataEnsureCapacity(&idata, rows, true); + if (code != TSDB_CODE_SUCCESS) { + taosMemoryFree(&idata); + SCL_ERR_RET(code); + } + + code = blockDataAppendColInfo(res, &idata); + if (code != TSDB_CODE_SUCCESS) { + blockDataFreeRes(res); + SCL_ERR_RET(code); + } *dataBlockId = taosArrayGetSize(pBlockList) - 1; *slotId = taosArrayGetSize(res->pDataBlock) - 1; } + SCL_RET(TSDB_CODE_SUCCESS); + } -void scltMakeValueNode(SNode **pNode, int32_t dataType, void *value) { +int32_t scltMakeValueNode(SNode **pNode, int32_t dataType, void *value) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_VALUE); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SValueNode *vnode = (SValueNode *)node; vnode->node.resType.type = dataType; if (IS_VAR_DATA_TYPE(dataType)) { vnode->datum.p = (char *)taosMemoryMalloc(varDataTLen(value)); - varDataCopy(vnode->datum.p, value); + if (NULL == vnode->datum.p) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } + (void)varDataCopy(vnode->datum.p, value); vnode->node.resType.bytes = varDataTLen(value); } else { vnode->node.resType.bytes = tDataTypes[dataType].bytes; - assignVal((char *)nodesGetValueFromNode(vnode), (const char *)value, 0, dataType); + (void)assignVal((char *)nodesGetValueFromNode(vnode), (const char *)value, 0, dataType); } *pNode = (SNode *)vnode; + SCL_RET(TSDB_CODE_SUCCESS); } -void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, - void *value) { +int32_t scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, + void *value) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_COLUMN); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SColumnNode *rnode = (SColumnNode *)node; rnode->node.resType.type = dataType; rnode->node.resType.bytes = dataBytes; @@ -146,26 +179,43 @@ void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in if (NULL == block) { *pNode = (SNode *)rnode; - return; + SCL_RET(TSDB_CODE_SUCCESS); } + int32_t code = TSDB_CODE_SUCCESS; if (NULL == *block) { SSDataBlock *res = createDataBlock(); for (int32_t i = 0; i < 2; ++i) { SColumnInfoData idata = createColumnInfoData(TSDB_DATA_TYPE_INT, 10, i + 1); - colInfoDataEnsureCapacity(&idata, rowNum, true); - blockDataAppendColInfo(res, &idata); + code = colInfoDataEnsureCapacity(&idata, rowNum, true); + if (code != TSDB_CODE_SUCCESS) { + taosMemoryFree(&idata); + SCL_ERR_RET(code); + } + code = blockDataAppendColInfo(res, &idata); + if (code != TSDB_CODE_SUCCESS) { + blockDataFreeRes(res); + SCL_ERR_RET(code); + } } SColumnInfoData idata = createColumnInfoData(dataType, dataBytes, 3); - colInfoDataEnsureCapacity(&idata, rowNum, true); - blockDataAppendColInfo(res, &idata); + code = colInfoDataEnsureCapacity(&idata, rowNum, true); + if (code != TSDB_CODE_SUCCESS) { + taosMemoryFree(&idata); + SCL_ERR_RET(code); + } + code = blockDataAppendColInfo(res, &idata); + if (code != TSDB_CODE_SUCCESS) { + blockDataFreeRes(res); + SCL_ERR_RET(code); + } res->info.capacity = rowNum; res->info.rows = rowNum; SColumnInfoData *pColumn = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pColumn, i, (const char *)value, false); + SCL_ERR_RET(colDataSetVal(pColumn, i, (const char *)value, false)); if (IS_VAR_DATA_TYPE(dataType)) { value = (char *)value + varDataTLen(value); } else { @@ -182,15 +232,23 @@ void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in int32_t idx = taosArrayGetSize(res->pDataBlock); SColumnInfoData idata = createColumnInfoData(dataType, dataBytes, 1 + idx); - colInfoDataEnsureCapacity(&idata, rowNum, true); + code = colInfoDataEnsureCapacity(&idata, rowNum, true); + if (code != TSDB_CODE_SUCCESS) { + taosMemoryFree(&idata); + SCL_ERR_RET(code); + } res->info.capacity = rowNum; - blockDataAppendColInfo(res, &idata); + code = blockDataAppendColInfo(res, &idata); + if (code != TSDB_CODE_SUCCESS) { + blockDataFreeRes(res); + SCL_ERR_RET(code); + } SColumnInfoData *pColumn = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pColumn, i, (const char *)value, false); + SCL_ERR_RET(colDataSetVal(pColumn, i, (const char *)value, false)); if (IS_VAR_DATA_TYPE(dataType)) { value = (char *)value + varDataTLen(value); } else { @@ -203,11 +261,15 @@ void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in } *pNode = (SNode *)rnode; + SCL_RET(code); } -void scltMakeOpNode2(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight, +int32_t scltMakeOpNode2(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight, bool isReverse) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_OPERATOR); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SOperatorNode *onode = (SOperatorNode *)node; onode->node.resType.type = resType; onode->node.resType.bytes = tDataTypes[resType].bytes; @@ -222,10 +284,14 @@ void scltMakeOpNode2(SNode **pNode, EOperatorType opType, int32_t resType, SNode } *pNode = (SNode *)onode; + SCL_RET(TSDB_CODE_SUCCESS); } -void scltMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight) { +int32_t scltMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode *pLeft, SNode *pRight) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_OPERATOR); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SOperatorNode *onode = (SOperatorNode *)node; onode->node.resType.type = resType; onode->node.resType.bytes = tDataTypes[resType].bytes; @@ -235,19 +301,27 @@ void scltMakeOpNode(SNode **pNode, EOperatorType opType, int32_t resType, SNode onode->pRight = pRight; *pNode = (SNode *)onode; + SCL_RET(TSDB_CODE_SUCCESS); } -void scltMakeListNode(SNode **pNode, SNodeList *list, int32_t resType) { +int32_t scltMakeListNode(SNode **pNode, SNodeList *list, int32_t resType) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_NODE_LIST); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SNodeListNode *lnode = (SNodeListNode *)node; lnode->node.resType.type = resType; lnode->pNodeList = list; *pNode = (SNode *)lnode; + SCL_RET(TSDB_CODE_SUCCESS); } -void scltMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeList, int32_t nodeNum) { +int32_t scltMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeList, int32_t nodeNum) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_LOGIC_CONDITION); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } SLogicConditionNode *onode = (SLogicConditionNode *)node; onode->condType = opType; onode->node.resType.type = TSDB_DATA_TYPE_BOOL; @@ -255,31 +329,40 @@ void scltMakeLogicNode(SNode **pNode, ELogicConditionType opType, SNode **nodeLi onode->pParameterList = nodesMakeList(); for (int32_t i = 0; i < nodeNum; ++i) { - nodesListAppend(onode->pParameterList, nodeList[i]); + SCL_ERR_RET(nodesListAppend(onode->pParameterList, nodeList[i])); } *pNode = (SNode *)onode; + SCL_RET(TSDB_CODE_SUCCESS); } -void scltMakeTargetNode(SNode **pNode, int16_t dataBlockId, int16_t slotId, SNode *snode) { +int32_t scltMakeTargetNode(SNode **pNode, int16_t dataBlockId, int16_t slotId, SNode *snode) { SNode *node = (SNode *)nodesMakeNode(QUERY_NODE_TARGET); + if (NULL == node) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } STargetNode *onode = (STargetNode *)node; onode->pExpr = snode; onode->dataBlockId = dataBlockId; onode->slotId = slotId; *pNode = (SNode *)onode; + SCL_RET(TSDB_CODE_SUCCESS); } } // namespace TEST(constantTest, bigint_add_bigint) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BIGINT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BIGINT, &scltRightV); - scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BIGINT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BIGINT, &scltRightV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -290,12 +373,16 @@ TEST(constantTest, bigint_add_bigint) { TEST(constantTest, double_sub_bigint) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_DOUBLE, &scltLeftVd); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BIGINT, &scltRightV); - scltMakeOpNode(&opNode, OP_TYPE_SUB, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_DOUBLE, &scltLeftVd); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BIGINT, &scltRightV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_SUB, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -306,12 +393,16 @@ TEST(constantTest, double_sub_bigint) { TEST(constantTest, tinyint_and_smallint) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_TINYINT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &scltRightV); - scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_TINYINT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &scltRightV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -322,12 +413,16 @@ TEST(constantTest, tinyint_and_smallint) { TEST(constantTest, bigint_or_double) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BIGINT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &scltRightVd); - scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BIGINT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &scltRightVd); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -339,14 +434,18 @@ TEST(constantTest, bigint_or_double) { TEST(constantTest, int_or_binary) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char binaryStr[64] = {0}; - sprintf(&binaryStr[2], "%d", scltRightV); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&binaryStr[2], "%d", scltRightV); varDataSetLen(binaryStr, strlen(&binaryStr[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, binaryStr); - scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, binaryStr); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -357,12 +456,16 @@ TEST(constantTest, int_or_binary) { TEST(constantTest, int_greater_double) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &scltRightVd); - scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &scltRightVd); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -374,14 +477,18 @@ TEST(constantTest, int_greater_double) { TEST(constantTest, int_greater_equal_binary) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char binaryStr[64] = {0}; - sprintf(&binaryStr[2], "%d", scltRightV); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&binaryStr[2], "%d", scltRightV); varDataSetLen(binaryStr, strlen(&binaryStr[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, binaryStr); - scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, binaryStr); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -392,12 +499,16 @@ TEST(constantTest, int_greater_equal_binary) { TEST(constantTest, tinyint_lower_ubigint) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_TINYINT, &scltLeftV); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UBIGINT, &scltRightV); - scltMakeOpNode(&opNode, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_TINYINT, &scltLeftV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UBIGINT, &scltRightV); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -410,12 +521,16 @@ TEST(constantTest, usmallint_lower_equal_ubigint) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1; int64_t rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_USMALLINT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UBIGINT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_LOWER_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_USMALLINT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UBIGINT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_LOWER_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -428,12 +543,16 @@ TEST(constantTest, int_equal_smallint1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1; int16_t rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -445,12 +564,16 @@ TEST(constantTest, int_equal_smallint1) { TEST(constantTest, int_equal_smallint2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 0, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -462,12 +585,16 @@ TEST(constantTest, int_equal_smallint2) { TEST(constantTest, int_not_equal_smallint1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_NOT_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -479,12 +606,16 @@ TEST(constantTest, int_not_equal_smallint1) { TEST(constantTest, int_not_equal_smallint2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 0, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_NOT_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -498,19 +629,30 @@ TEST(constantTest, int_in_smallint1) { SNode *pLeft = NULL, *pRight = NULL, *listNode = NULL, *res = NULL, *opNode = NULL; int32_t leftv = 1, rightv1 = 1, rightv2 = 2, rightv3 = 3; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); - scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -524,19 +666,30 @@ TEST(constantTest, int_in_smallint2) { SNode *pLeft = NULL, *pRight = NULL, *listNode = NULL, *res = NULL, *opNode = NULL; int32_t leftv = 4, rightv1 = 1, rightv2 = 2, rightv3 = 3; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); - scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -548,19 +701,30 @@ TEST(constantTest, int_in_smallint2) { TEST(constantTest, int_not_in_smallint1) { SNode *pLeft = NULL, *pRight = NULL, *listNode = NULL, *res = NULL, *opNode = NULL; int32_t leftv = 1, rightv1 = 1, rightv2 = 2, rightv3 = 3; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); - scltMakeOpNode(&opNode, OP_TYPE_NOT_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -574,19 +738,30 @@ TEST(constantTest, int_not_in_smallint2) { SNode *pLeft = NULL, *pRight = NULL, *listNode = NULL, *res = NULL, *opNode = NULL; int32_t leftv = 4, rightv1 = 1, rightv2 = 2, rightv3 = 3; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); - scltMakeOpNode(&opNode, OP_TYPE_NOT_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_SMALLINT, &rightv3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -598,16 +773,20 @@ TEST(constantTest, int_not_in_smallint2) { TEST(constantTest, binary_like_binary1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "a_c"); + (void)sprintf(&rightv[2], "%s", "a_c"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -619,16 +798,20 @@ TEST(constantTest, binary_like_binary1) { TEST(constantTest, binary_like_binary2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "ac"); + (void)sprintf(&rightv[2], "%s", "ac"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -640,16 +823,20 @@ TEST(constantTest, binary_like_binary2) { TEST(constantTest, binary_not_like_binary1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "a%c"); + (void)sprintf(&rightv[2], "%s", "a%c"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_NOT_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -661,16 +848,20 @@ TEST(constantTest, binary_not_like_binary1) { TEST(constantTest, binary_not_like_binary2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "ac"); + (void)sprintf(&rightv[2], "%s", "ac"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_NOT_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NOT_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -682,16 +873,20 @@ TEST(constantTest, binary_not_like_binary2) { TEST(constantTest, binary_match_binary1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", ".*"); + (void)sprintf(&rightv[2], "%s", ".*"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_MATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_MATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -703,16 +898,20 @@ TEST(constantTest, binary_match_binary1) { TEST(constantTest, binary_match_binary2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "abc.+"); + (void)sprintf(&rightv[2], "%s", "abc.+"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_MATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_MATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -724,16 +923,20 @@ TEST(constantTest, binary_match_binary2) { TEST(constantTest, binary_not_match_binary1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "a[1-9]c"); + (void)sprintf(&rightv[2], "%s", "a[1-9]c"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_NMATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NMATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -745,16 +948,20 @@ TEST(constantTest, binary_not_match_binary1) { TEST(constantTest, binary_not_match_binary2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; char leftv[64] = {0}, rightv[64] = {0}; - sprintf(&leftv[2], "%s", "abc"); + int32_t code = TSDB_CODE_SUCCESS; + (void)sprintf(&leftv[2], "%s", "abc"); varDataSetLen(leftv, strlen(&leftv[2])); - sprintf(&rightv[2], "%s", "a[ab]c"); + (void)sprintf(&rightv[2], "%s", "a[ab]c"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_NMATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_BINARY, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_NMATCH, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -766,11 +973,14 @@ TEST(constantTest, binary_not_match_binary2) { TEST(constantTest, int_is_null1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -782,11 +992,14 @@ TEST(constantTest, int_is_null1) { TEST(constantTest, int_is_null2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = TSDB_DATA_INT_NULL, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_NULL, &leftv); - scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_NULL, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -798,11 +1011,14 @@ TEST(constantTest, int_is_null2) { TEST(constantTest, int_is_not_null1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -814,11 +1030,14 @@ TEST(constantTest, int_is_not_null1) { TEST(constantTest, int_is_not_null2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_NULL, &leftv); - scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_NULL, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -830,13 +1049,18 @@ TEST(constantTest, int_is_not_null2) { TEST(constantTest, int_add_int_is_true1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); - scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -848,13 +1072,18 @@ TEST(constantTest, int_add_int_is_true1) { TEST(constantTest, int_add_int_is_true2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = -1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); - scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -866,13 +1095,18 @@ TEST(constantTest, int_add_int_is_true2) { TEST(constantTest, int_greater_int_is_true1) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 1; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); - scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -884,13 +1118,18 @@ TEST(constantTest, int_greater_int_is_true1) { TEST(constantTest, int_greater_int_is_true2) { SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL; int32_t leftv = 1, rightv = 0; - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); - scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_INT, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, opNode, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(opNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(opNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -906,18 +1145,26 @@ TEST(constantTest, greater_and_lower) { bool eRes[5] = {false, false, true, true, true}; int64_t v1 = 333, v2 = 222, v3 = -10, v4 = 20; SNode *list[2] = {0}; - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); - scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v4); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v4); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(logicNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(logicNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -933,18 +1180,26 @@ TEST(constantTest, column_and_value1) { bool eRes[5] = {false, false, true, true, true}; int64_t v1 = 333, v2 = 222, v3 = -10, v4 = 20; SNode *list[2] = {0}; - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); - scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); - scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(logicNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(logicNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_LOGIC_CONDITION); SLogicConditionNode *v = (SLogicConditionNode *)res; @@ -960,18 +1215,26 @@ TEST(constantTest, column_and_value2) { bool eRes[5] = {false, false, true, true, true}; int64_t v1 = 333, v2 = 222, v3 = -10, v4 = 20; SNode *list[2] = {0}; - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); - scltMakeOpNode(&opNode1, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); - scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(logicNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(logicNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -987,18 +1250,26 @@ TEST(constantTest, column_and_value3) { bool eRes[5] = {false, false, true, true, true}; int64_t v1 = 333, v2 = 222, v3 = -10, v4 = 20; SNode *list[2] = {0}; - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); - scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); - scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_OR, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_OR, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(logicNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(logicNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; @@ -1014,18 +1285,25 @@ TEST(constantTest, column_and_value4) { bool eRes[5] = {false, false, true, true, true}; int64_t v1 = 333, v2 = 222, v3 = -10, v4 = 20; SNode *list[2] = {0}; - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); - scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); - scltMakeOpNode(&opNode1, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); - scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); - scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval2, TSDB_DATA_TYPE_BIGINT, &v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pval1, TSDB_DATA_TYPE_BIGINT, &v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pval2, NULL, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pval1, pval2); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_OR, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_OR, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculateConstants(logicNode, &res); - ASSERT_EQ(code, 0); + code = scalarCalculateConstants(logicNode, &res); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); ASSERT_TRUE(res); ASSERT_EQ(nodeType(res), QUERY_NODE_LOGIC_CONDITION); SLogicConditionNode *v = (SLogicConditionNode *)res; @@ -1034,19 +1312,21 @@ TEST(constantTest, column_and_value4) { nodesDestroyNode(res); } -void makeJsonArrow(SSDataBlock **src, SNode **opNode, void *json, char *key) { +int32_t makeJsonArrow(SSDataBlock **src, SNode **opNode, void *json, char *key) { char keyVar[32] = {0}; - memcpy(varDataVal(keyVar), key, strlen(key)); + (void)memcpy(varDataVal(keyVar), key, strlen(key)); varDataLen(keyVar) = strlen(key); SNode *pLeft = NULL, *pRight = NULL; - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, keyVar); - scltMakeColumnNode(&pLeft, src, TSDB_DATA_TYPE_JSON, ((STag *)json)->len, 1, json); - scltMakeOpNode(opNode, OP_TYPE_JSON_GET_VALUE, TSDB_DATA_TYPE_JSON, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + SCL_ERR_RET(scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, keyVar)); + SCL_ERR_RET(scltMakeColumnNode(&pLeft, src, TSDB_DATA_TYPE_JSON, ((STag *)json)->len, 1, json)); + SCL_ERR_RET(scltMakeOpNode(opNode, OP_TYPE_JSON_GET_VALUE, TSDB_DATA_TYPE_JSON, pLeft, pRight)); + SCL_RET(code); } -void makeOperator(SNode **opNode, SArray *blockList, EOperatorType opType, int32_t rightType, void *rightData, - bool isReverse) { +int32_t makeOperator(SNode **opNode, SArray *blockList, EOperatorType opType, int32_t rightType, void *rightData, + bool isReverse) { int32_t resType = TSDB_DATA_TYPE_NULL; if (opType == OP_TYPE_ADD || opType == OP_TYPE_SUB || opType == OP_TYPE_MULTI || opType == OP_TYPE_DIV || opType == OP_TYPE_REM || opType == OP_TYPE_MINUS) { @@ -1062,58 +1342,73 @@ void makeOperator(SNode **opNode, SArray *blockList, EOperatorType opType, int32 } SNode *right = NULL; - scltMakeValueNode(&right, rightType, rightData); - scltMakeOpNode2(opNode, opType, resType, *opNode, right, isReverse); + int32_t code = TSDB_CODE_SUCCESS; + SCL_ERR_RET(scltMakeValueNode(&right, rightType, rightData)); + SCL_ERR_RET(scltMakeOpNode2(opNode, opType, resType, *opNode, right, isReverse)); SColumnInfo colInfo = createColumnInfo(1, resType, tDataTypes[resType].bytes); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, 1, &colInfo); - scltMakeTargetNode(opNode, dataBlockId, slotId, *opNode); + SCL_ERR_RET(scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, 1, &colInfo)); + SCL_ERR_RET(scltMakeTargetNode(opNode, dataBlockId, slotId, *opNode)); + SCL_RET(code); } -void makeCalculate(void *json, void *key, int32_t rightType, void *rightData, double exceptValue, EOperatorType opType, - bool isReverse) { +int32_t makeCalculate(void *json, void *key, int32_t rightType, void *rightData, double exceptValue, + EOperatorType opType, bool isReverse) { SArray *blockList = taosArrayInit(2, POINTER_BYTES); SSDataBlock *src = NULL; SNode *opNode = NULL; - makeJsonArrow(&src, &opNode, json, (char *)key); - taosArrayPush(blockList, &src); + SCL_ERR_RET(makeJsonArrow(&src, &opNode, json, (char *)key)); + (void)taosArrayPush(blockList, &src); - makeOperator(&opNode, blockList, opType, rightType, rightData, isReverse); + SCL_ERR_RET(makeOperator(&opNode, blockList, opType, rightType, rightData, isReverse)); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + SCL_ERR_RET(scalarCalculate(opNode, blockList, NULL)); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); - ASSERT_EQ(res->info.rows, 1); + if (res->info.rows != 1) { + (void)printf("expect 1 row, but got %d\n", res->info.rows); + SCL_ERR_RET(TSDB_CODE_FAILED); + } SColumnInfoData *column = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock); if (colDataIsNull_f(column->nullbitmap, 0)) { - ASSERT_EQ(DBL_MAX, exceptValue); - printf("result:NULL\n"); + if (DBL_MAX != exceptValue) { + (void)printf("expect value = DBL_MAX, but got %d\n", exceptValue); + SCL_ERR_RET(TSDB_CODE_FAILED); + } + (void)printf("result:NULL\n"); } else if (opType == OP_TYPE_ADD || opType == OP_TYPE_SUB || opType == OP_TYPE_MULTI || opType == OP_TYPE_DIV || opType == OP_TYPE_REM || opType == OP_TYPE_MINUS) { - printf("op:%s,1result:%f,except:%f\n", operatorTypeStr(opType), *((double *)colDataGetData(column, 0)), - exceptValue); - ASSERT_TRUE(fabs(*((double *)colDataGetData(column, 0)) - exceptValue) < 0.0001); + (void)printf("op:%s,1result:%f,except:%f\n", operatorTypeStr(opType), *((double *)colDataGetData(column, 0)), + exceptValue); + if (fabs(*((double *)colDataGetData(column, 0)) - exceptValue) >= 0.0001) { + (void)printf("expect value %d, but got %d\n", *((double *)colDataGetData(column, 0)), exceptValue); + SCL_ERR_RET(TSDB_CODE_FAILED); + } } else if (opType == OP_TYPE_BIT_AND || opType == OP_TYPE_BIT_OR) { - printf("op:%s,2result:%" PRId64 ",except:%f\n", operatorTypeStr(opType), *((int64_t *)colDataGetData(column, 0)), - exceptValue); - ASSERT_EQ(*((int64_t *)colDataGetData(column, 0)), exceptValue); + (void)printf("op:%s,2result:%" PRId64 ",except:%f\n", operatorTypeStr(opType), + *((int64_t *)colDataGetData(column, 0)), exceptValue); + if (*((int64_t *)colDataGetData(column, 0)) != exceptValue) { + (void)printf("expect value %d, but got %d\n", *((int64_t *)colDataGetData(column, 0)), exceptValue); + SCL_ERR_RET(TSDB_CODE_FAILED); + } } else if (opType == OP_TYPE_GREATER_THAN || opType == OP_TYPE_GREATER_EQUAL || opType == OP_TYPE_LOWER_THAN || opType == OP_TYPE_LOWER_EQUAL || opType == OP_TYPE_EQUAL || opType == OP_TYPE_NOT_EQUAL || opType == OP_TYPE_IS_NULL || opType == OP_TYPE_IS_NOT_NULL || opType == OP_TYPE_IS_TRUE || opType == OP_TYPE_LIKE || opType == OP_TYPE_NOT_LIKE || opType == OP_TYPE_MATCH || opType == OP_TYPE_NMATCH) { - printf("op:%s,3result:%d,except:%f\n", operatorTypeStr(opType), *((bool *)colDataGetData(column, 0)), exceptValue); + (void)printf("op:%s,3result:%d,except:%f\n", operatorTypeStr(opType), *((bool *)colDataGetData(column, 0)), + exceptValue); assert(*(bool *)colDataGetData(column, 0) == exceptValue); // ASSERT_EQ((int) *((bool *)colDataGetData(column, 0)), (int)exceptValue); } taosArrayDestroyEx(blockList, scltFreeDataBlock); nodesDestroyNode(opNode); + SCL_RET(TSDB_CODE_SUCCESS); } TEST(columnTest, json_column_arith_op) { @@ -1123,10 +1418,12 @@ TEST(columnTest, json_column_arith_op) { "\"8hel\"}"; char rightv[256] = {0}; - memcpy(rightv, rightvTmp, strlen(rightvTmp)); + (void)memcpy(rightv, rightvTmp, strlen(rightvTmp)); SArray *tags = taosArrayInit(1, sizeof(STagVal)); + ASSERT_NE(tags, nullptr); STag *row = NULL; - parseJsontoTagData(rightv, tags, &row, NULL); + int32_t code = parseJsontoTagData(rightv, tags, &row, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); const int32_t len = 8; EOperatorType op[len] = {OP_TYPE_ADD, OP_TYPE_SUB, OP_TYPE_MULTI, OP_TYPE_DIV, @@ -1138,10 +1435,12 @@ TEST(columnTest, json_column_arith_op) { double eRes00[len] = {5.0, -4, 8.0, 2.0, 1.0, -4, 4 & -4, 4 | 9}; double eRes01[len] = {5.0, 4, 8.0, 0.5, 3, 0, 4 & -4, 4 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes00[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes00[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes01[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes01[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("--------------------json string- 0 op {1, 8, 2, 2, 3, 0, -4, 9}--------------------\n"); @@ -1150,10 +1449,12 @@ TEST(columnTest, json_column_arith_op) { double eRes10[len] = {1.0, -8, 0, 0, 0, 0, 0, 9}; double eRes11[len] = {1.0, 8, 0, DBL_MAX, DBL_MAX, 0, 0, 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes10[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes10[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes11[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes11[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("---------------------json null- null op {1, 8, 2, 2, 3, 0, -4, 9}-------------------\n"); @@ -1162,10 +1463,12 @@ TEST(columnTest, json_column_arith_op) { double eRes20[len] = {DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX}; double eRes21[len] = {DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, 0, DBL_MAX, DBL_MAX}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes20[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes20[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes21[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes21[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("---------------------json bool- true op {1, 8, 2, 2, 3, 0, -4, 9}-------------------\n"); @@ -1174,10 +1477,12 @@ TEST(columnTest, json_column_arith_op) { double eRes30[len] = {2.0, -7, 2, 0.5, 1, -1, 1 & -4, 1 | 9}; double eRes31[len] = {2.0, 7, 2, 2, 0, 0, 1 & -4, 1 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes30[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes30[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes31[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes31[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("----------------------json double-- 5.44 op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1186,10 +1491,12 @@ TEST(columnTest, json_column_arith_op) { double eRes40[len] = {6.44, -2.56, 10.88, 2.72, 2.44, -5.44, 5 & -4, 5 | 9}; double eRes41[len] = {6.44, 2.56, 10.88, 0.3676470588235294, 3, 0, 5 & -4, 5 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes40[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes40[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes41[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes41[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("----------------------json int-- -10 op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1198,10 +1505,12 @@ TEST(columnTest, json_column_arith_op) { double eRes50[len] = {-9, -18, -20, -5, -10 % 3, 10, -10 & -4, -10 | 9}; double eRes51[len] = {-9, 18, -20, -0.2, 3 % -10, 0, -10 & -4, -10 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes50[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes50[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes51[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes51[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("----------------------json double-- -9.8 op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1210,10 +1519,12 @@ TEST(columnTest, json_column_arith_op) { double eRes60[len] = {-8.8, -17.8, -19.6, -4.9, -0.8, 9.8, -9 & -4, -9 | 9}; double eRes61[len] = {-8.8, 17.8, -19.6, -0.2040816326530612, 3, 0, -9 & -4, -9 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes60[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes60[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes61[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes61[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("----------------------json bool-- 0 op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1222,10 +1533,12 @@ TEST(columnTest, json_column_arith_op) { double eRes70[len] = {1.0, -8, 0, 0, 0, 0, 0, 9}; double eRes71[len] = {1.0, 8, 0, DBL_MAX, DBL_MAX, 0, 0, 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes70[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes70[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes71[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes71[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("----------------------json string-- 8 op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1234,10 +1547,12 @@ TEST(columnTest, json_column_arith_op) { double eRes80[len] = {9, 0, 16, 4, 8 % 3, -8, 8 & -4, 8 | 9}; double eRes81[len] = {9, 0, 16, 0.25, 3 % 8, 0, 8 & -4, 8 | 9}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes80[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes80[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes81[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes81[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } printf("---------------------json not exist-- NULL op {1, 8, 2, 2, 3, 0, -4, 9}------------------\n"); @@ -1246,10 +1561,12 @@ TEST(columnTest, json_column_arith_op) { double eRes90[len] = {DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX}; double eRes91[len] = {DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, DBL_MAX, 0, DBL_MAX, DBL_MAX}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes90[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes90[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes91[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes91[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } taosArrayDestroy(tags); @@ -1273,10 +1590,13 @@ TEST(columnTest, json_column_logic_op) { "6hello\"}"; char rightv[256] = {0}; - memcpy(rightv, rightvTmp, strlen(rightvTmp)); + int32_t code = TSDB_CODE_SUCCESS; + (void)memcpy(rightv, rightvTmp, strlen(rightvTmp)); SArray *tags = taosArrayInit(1, sizeof(STagVal)); + ASSERT_NE(tags, nullptr); STag *row = NULL; - parseJsontoTagData(rightv, tags, &row, NULL); + code = parseJsontoTagData(rightv, tags, &row, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); const int32_t len0 = 6; const int32_t len = 9; @@ -1288,20 +1608,22 @@ TEST(columnTest, json_column_logic_op) { int32_t input[len] = {1, 8, 2, 2, 3, 0, 0, 0, 0}; char *inputNchar[len1] = {"hell_", "hel%", "hell", "llll"}; - printf("--------------------json int---4 {1, 8, 2, 2, 3, 0, 0, 0, 0}------------------\n"); char *key = "k1"; bool eRes[len + len1] = {true, false, false, false, false, true, false, true, true, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_0[len0] = {false, true, true, true, false, true}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_0[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_0[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1310,16 +1632,19 @@ TEST(columnTest, json_column_logic_op) { key = "k2"; bool eRes1[len + len1] = {false, false, false, false, false, false, false, true, false, true, false, true, true}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes1[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes1[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_1[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_1[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_1[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes1[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes1[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1328,16 +1653,19 @@ TEST(columnTest, json_column_logic_op) { key = "k3"; // (null is true) return NULL, so use DBL_MAX represent NULL bool eRes2[len + len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes2[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes2[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_2[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_2[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_2[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes2[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes2[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1346,16 +1674,19 @@ TEST(columnTest, json_column_logic_op) { key = "k4"; bool eRes3[len + len1] = {false, false, false, false, false, false, false, true, true, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes3[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes3[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_3[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_3[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_3[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes3[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes3[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1364,16 +1695,19 @@ TEST(columnTest, json_column_logic_op) { key = "k5"; bool eRes4[len + len1] = {true, false, false, false, false, true, false, true, true, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes4[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes4[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_4[len0] = {false, true, true, true, false, true}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_4[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_4[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes4[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes4[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1382,16 +1716,19 @@ TEST(columnTest, json_column_logic_op) { key = "k6"; bool eRes5[len + len1] = {false, false, true, true, false, true, false, true, true, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes5[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes5[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_5[len0] = {true, true, false, false, false, true}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_5[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_5[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes5[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes5[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1400,16 +1737,19 @@ TEST(columnTest, json_column_logic_op) { key = "k7"; bool eRes6[len + len1] = {false, false, true, true, false, true, false, true, true, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes6[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes6[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_6[len0] = {true, true, false, false, false, true}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_6[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_6[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes6[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes6[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1418,16 +1758,19 @@ TEST(columnTest, json_column_logic_op) { key = "k8"; bool eRes7[len + len1] = {false, false, false, false, false, false, false, true, false, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes7[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes7[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_7[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_7[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_7[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes7[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes7[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1436,11 +1779,13 @@ TEST(columnTest, json_column_logic_op) { key = "k9"; bool eRes8[len + len1] = {false, false, false, false, false, false, false, true, true, false, true, true, true}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes8[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes8[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_8[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_8[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_8[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { @@ -1448,7 +1793,8 @@ TEST(columnTest, json_column_logic_op) { if (i == 11) { printf("abc\n"); } - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes8[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes8[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1457,16 +1803,19 @@ TEST(columnTest, json_column_logic_op) { key = "k10"; // (NULL is true) return NULL, so use DBL_MAX represent NULL bool eRes9[len + len1] = {false, false, false, false, false, false, true, false, false, false, false, false, false}; for (int i = 0; i < len; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes9[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes9[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } bool eRes_9[len0] = {false, false, false, false, false, false}; for (int i = 0; i < len0; i++) { - makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_9[i], op[i], true); + code = makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes_9[i], op[i], true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); - makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes9[i], op[i], false); + code = makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes9[i], op[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); taosMemoryFree(rightData); } @@ -1483,19 +1832,26 @@ TEST(columnTest, smallint_value_add_int_column) { double eRes[5] = {1.0, -4, -3, 24, 101}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(rightv) / sizeof(rightv[0]); - scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); - scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, rightv); - scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_INT, &leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(2, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_DOUBLE, sizeof(double)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1522,20 +1878,24 @@ TEST(columnTest, bigint_column_multi_binary_column) { double eRes[5] = {0, 2, 6, 12, 20}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(rightv) / sizeof(rightv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), rowNum, leftv); - scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, rightv); - scltMakeOpNode(&opNode, OP_TYPE_MULTI, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), rowNum, leftv); + code = scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, rightv); + code = scltMakeOpNode(&opNode, OP_TYPE_MULTI, TSDB_DATA_TYPE_DOUBLE, pLeft, pRight); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + (void)taosArrayPush(blockList, &src); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_DOUBLE, sizeof(double)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1561,19 +1921,26 @@ TEST(columnTest, smallint_column_and_binary_column) { int64_t eRes[5] = {0, 0, 2, 0, 4}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(rightv) / sizeof(rightv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); - scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, rightv); - scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1594,19 +1961,26 @@ TEST(columnTest, smallint_column_or_float_column) { int64_t eRes[5] = {3, 3, 7, 5, 7}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(rightv) / sizeof(rightv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); - scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_FLOAT, sizeof(float), rowNum, rightv); - scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pRight, &src, TSDB_DATA_TYPE_FLOAT, sizeof(float), rowNum, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1627,19 +2001,26 @@ TEST(columnTest, smallint_column_or_double_value) { int64_t eRes[5] = {11, 10, 11, 14, 15}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_BIT_OR, TSDB_DATA_TYPE_BIGINT, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1660,19 +2041,26 @@ TEST(columnTest, smallint_column_greater_double_value) { bool eRes[5] = {false, false, true, true, true}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv); - scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1693,26 +2081,40 @@ TEST(columnTest, int_column_in_double_list) { bool eRes[5] = {true, true, true, false, false}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv1); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv2); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv3); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); - scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_DOUBLE, &rightv3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_INT); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, true, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1752,26 +2154,40 @@ TEST(columnTest, binary_column_in_binary_list) { } int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SNodeList *list = nodesMakeList(); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[0]); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[1]); - nodesListAppend(list, pRight); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[2]); - nodesListAppend(list, pRight); - scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_BINARY); - scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_NE(list, nullptr); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[0]); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[1]); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv[2]); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = nodesListAppend(list, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeListNode(&listNode, list, TSDB_DATA_TYPE_BINARY); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IN, TSDB_DATA_TYPE_BOOL, pLeft, listNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1800,22 +2216,29 @@ TEST(columnTest, binary_column_like_binary) { } int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - sprintf(&rightv[2], "%s", "__0"); + (void)sprintf(&rightv[2], "%s", "__0"); varDataSetLen(rightv, strlen(&rightv[2])); - scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); - scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, rightv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_LIKE, TSDB_DATA_TYPE_BOOL, pLeft, pRight); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1844,19 +2267,22 @@ TEST(columnTest, binary_column_is_true) { } int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, leftv); - - scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 5, rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_TRUE, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1884,23 +2310,30 @@ TEST(columnTest, binary_column_is_null) { } int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SColumnInfoData *pcolumn = (SColumnInfoData *)taosArrayGetLast(src->pDataBlock); - colDataSetVal(pcolumn, 2, NULL, true); - colDataSetVal(pcolumn, 4, NULL, true); + code = colDataSetVal(pcolumn, 2, NULL, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = colDataSetVal(pcolumn, 4, NULL, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NULL, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); - - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1928,22 +2361,29 @@ TEST(columnTest, binary_column_is_not_null) { } int32_t rowNum = sizeof(leftv) / sizeof(leftv[0]); - scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pLeft, &src, TSDB_DATA_TYPE_BINARY, 3, rowNum, leftv); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SColumnInfoData *pcolumn = (SColumnInfoData *)taosArrayGetLast(src->pDataBlock); - colDataSetVal(pcolumn, 4, NULL, true); + code = colDataSetVal(pcolumn, 4, NULL, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + code = scltMakeOpNode(&opNode, OP_TYPE_IS_NOT_NULL, TSDB_DATA_TYPE_BOOL, pLeft, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&opNode, dataBlockId, slotId, opNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(opNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(opNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1967,25 +2407,36 @@ TEST(columnTest, greater_and_lower) { bool eRes[5] = {false, true, false, false, false}; SSDataBlock *src = NULL; int32_t rowNum = sizeof(v1) / sizeof(v1[0]); - scltMakeColumnNode(&pcol1, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, v1); - scltMakeColumnNode(&pcol2, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, v2); - scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol1, pcol2); - scltMakeColumnNode(&pcol1, &src, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), rowNum, v3); - scltMakeColumnNode(&pcol2, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, v4); - scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol1, pcol2); + int32_t code = TSDB_CODE_SUCCESS; + code = scltMakeColumnNode(&pcol1, &src, TSDB_DATA_TYPE_SMALLINT, sizeof(int16_t), rowNum, v1); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pcol2, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, v2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode1, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pcol1, pcol2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pcol1, &src, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), rowNum, v3); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeColumnNode(&pcol2, &src, TSDB_DATA_TYPE_INT, sizeof(int32_t), rowNum, v4); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeOpNode(&opNode2, OP_TYPE_LOWER_THAN, TSDB_DATA_TYPE_BOOL, pcol1, pcol2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); list[0] = opNode1; list[1] = opNode2; - scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + code = scltMakeLogicNode(&logicNode, LOGIC_COND_TYPE_AND, list, 2); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SArray *blockList = taosArrayInit(1, POINTER_BYTES); - taosArrayPush(blockList, &src); + ASSERT_NE(blockList, nullptr); + ASSERT_NE(taosArrayPush(blockList, &src), nullptr); SColumnInfo colInfo = createColumnInfo(1, TSDB_DATA_TYPE_BOOL, sizeof(bool)); int16_t dataBlockId = 0, slotId = 0; - scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); - scltMakeTargetNode(&logicNode, dataBlockId, slotId, logicNode); + code = scltAppendReservedSlot(blockList, &dataBlockId, &slotId, false, rowNum, &colInfo); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeTargetNode(&logicNode, dataBlockId, slotId, logicNode); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); - int32_t code = scalarCalculate(logicNode, blockList, NULL); - ASSERT_EQ(code, 0); + code = scalarCalculate(logicNode, blockList, NULL); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); SSDataBlock *res = *(SSDataBlock **)taosArrayGetLast(blockList); ASSERT_EQ(res->info.rows, rowNum); @@ -1999,8 +2450,11 @@ TEST(columnTest, greater_and_lower) { nodesDestroyNode(logicNode); } -void scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t num, bool setVal) { +int32_t scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t num, bool setVal) { SScalarParam *input = (SScalarParam *)taosMemoryCalloc(1, sizeof(SScalarParam)); + if (NULL == input) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } int32_t bytes; switch (type) { case TSDB_DATA_TYPE_TINYINT: { @@ -2030,20 +2484,24 @@ void scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t } input->columnData = (SColumnInfoData *)taosMemoryCalloc(1, sizeof(SColumnInfoData)); + if (NULL == input->columnData) { + SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + } input->numOfRows = num; input->columnData->info = createColumnInfo(0, type, bytes); - colInfoDataEnsureCapacity(input->columnData, num, true); + SCL_ERR_RET(colInfoDataEnsureCapacity(input->columnData, num, true)); if (setVal) { for (int32_t i = 0; i < num; ++i) { - colDataSetVal(input->columnData, i, (const char *)pVal, false); + SCL_ERR_RET(colDataSetVal(input->columnData, i, (const char *)pVal, false)); } } else { // memset(input->data, 0, num * bytes); } *pInput = input; + SCL_RET(TSDB_CODE_SUCCESS); } void scltDestroyDataBlock(SScalarParam *pInput) { @@ -2061,8 +2519,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // TINYINT int8_t val_tinyint = 10; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2073,8 +2533,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_tinyint = -10; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2087,8 +2549,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // SMALLINT int16_t val_smallint = 10; type = TSDB_DATA_TYPE_SMALLINT; - scltMakeDataBlock(&pInput, type, &val_smallint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_smallint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2099,8 +2563,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_smallint = -10; - scltMakeDataBlock(&pInput, type, &val_smallint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_smallint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2113,8 +2579,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // INT int32_t val_int = 10; type = TSDB_DATA_TYPE_INT; - scltMakeDataBlock(&pInput, type, &val_int, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_int, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2125,8 +2593,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_int = -10; - scltMakeDataBlock(&pInput, type, &val_int, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_int, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2139,8 +2609,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // BIGINT int64_t val_bigint = 10; type = TSDB_DATA_TYPE_BIGINT; - scltMakeDataBlock(&pInput, type, &val_bigint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_bigint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2151,8 +2623,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_bigint = -10; - scltMakeDataBlock(&pInput, type, &val_bigint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_bigint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2165,8 +2639,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // FLOAT float val_float = 10.15; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ABS:%f\n", *(float *)pInput->data); code = absFunction(pInput, 1, pOutput); @@ -2179,8 +2655,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_float = -10.15; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ABS:%f\n", *(float *)pInput->data); code = absFunction(pInput, 1, pOutput); @@ -2195,8 +2673,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { // DOUBLE double val_double = 10.15; type = TSDB_DATA_TYPE_DOUBLE; - scltMakeDataBlock(&pInput, type, &val_double, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_double, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2207,8 +2687,10 @@ TEST(ScalarFunctionTest, absFunction_constant) { scltDestroyDataBlock(pOutput); val_double = -10.15; - scltMakeDataBlock(&pInput, type, &val_double, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_double, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = absFunction(pInput, 1, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); @@ -2228,8 +2710,10 @@ TEST(ScalarFunctionTest, absFunction_column) { // TINYINT int8_t val_tinyint = 10; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { int8_t v = val_tinyint + i; colDataSetVal(pInput->columnData, i, (const char *)&v, false); @@ -2246,8 +2730,10 @@ TEST(ScalarFunctionTest, absFunction_column) { scltDestroyDataBlock(pOutput); val_tinyint = -10; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { int8_t v = val_tinyint + i; colDataSetVal(pInput->columnData, i, (const char *)&v, false); @@ -2266,8 +2752,10 @@ TEST(ScalarFunctionTest, absFunction_column) { // SMALLINT int16_t val_smallint = 10; type = TSDB_DATA_TYPE_SMALLINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { int16_t v = val_smallint + i; colDataSetVal(pInput->columnData, i, (const char *)&v, false); @@ -2284,11 +2772,13 @@ TEST(ScalarFunctionTest, absFunction_column) { scltDestroyDataBlock(pOutput); val_smallint = -10; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { int16_t v = val_smallint + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); PRINTF("small_int before ABS:%d\n", v); } @@ -2304,11 +2794,12 @@ TEST(ScalarFunctionTest, absFunction_column) { // INT int32_t val_int = 10; type = TSDB_DATA_TYPE_INT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); for (int32_t i = 0; i < rowNum; ++i) { int32_t v = val_int + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("int before ABS:%d\n", v); } @@ -2322,11 +2813,14 @@ TEST(ScalarFunctionTest, absFunction_column) { scltDestroyDataBlock(pOutput); val_int = -10; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { int32_t v = val_int + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("int before ABS:%d\n", v); } @@ -2342,11 +2836,14 @@ TEST(ScalarFunctionTest, absFunction_column) { // FLOAT float val_float = 10.15; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { float v = val_float + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ABS:%f\n", v); } @@ -2360,11 +2857,14 @@ TEST(ScalarFunctionTest, absFunction_column) { scltDestroyDataBlock(pOutput); val_float = -10.15; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { float v = val_float + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ABS:%f\n", v); } @@ -2380,11 +2880,14 @@ TEST(ScalarFunctionTest, absFunction_column) { // DOUBLE double val_double = 10.15; type = TSDB_DATA_TYPE_DOUBLE; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { double v = val_double + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("double before ABS:%f\n", v); } @@ -2398,11 +2901,14 @@ TEST(ScalarFunctionTest, absFunction_column) { scltDestroyDataBlock(pOutput); val_double = -10.15; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { double v = val_double + i; - colDataSetVal(pInput->columnData, i, (const char *)&v, false); + code = colDataSetVal(pInput->columnData, i, (const char *)&v, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("double before ABS:%f\n", v); } @@ -2428,8 +2934,10 @@ TEST(ScalarFunctionTest, sinFunction_constant) { // TINYINT int8_t val_tinyint = 13; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before SIN:%d\n", *((int8_t *)pInput->data)); code = sinFunction(pInput, 1, pOutput); @@ -2444,8 +2952,10 @@ TEST(ScalarFunctionTest, sinFunction_constant) { // FLOAT float val_float = 13.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before SIN:%f\n", *((float *)pInput->data)); code = sinFunction(pInput, 1, pOutput); @@ -2470,10 +2980,13 @@ TEST(ScalarFunctionTest, sinFunction_column) { // TINYINT int8_t val_tinyint[] = {13, 14, 15}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before SIN:%d\n", *(int8_t *)colDataGetData(pInput->columnData, i)); } @@ -2489,10 +3002,13 @@ TEST(ScalarFunctionTest, sinFunction_column) { // FLOAT float val_float[] = {13.00, 14.00, 15.00}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before SIN:%f\n", *((float *)colDataGetData(pInput->columnData, i))); } @@ -2518,8 +3034,10 @@ TEST(ScalarFunctionTest, cosFunction_constant) { // TINYINT int8_t val_tinyint = 13; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before COS:%d\n", *((int8_t *)pInput->data)); code = cosFunction(pInput, 1, pOutput); @@ -2534,8 +3052,10 @@ TEST(ScalarFunctionTest, cosFunction_constant) { // FLOAT float val_float = 13.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before COS:%f\n", *((float *)pInput->data)); code = cosFunction(pInput, 1, pOutput); @@ -2560,10 +3080,13 @@ TEST(ScalarFunctionTest, cosFunction_column) { // TINYINT int8_t val_tinyint[] = {13, 14, 15}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before COS:%d\n", *(int8_t *)colDataGetData(pInput->columnData, i)); } @@ -2579,10 +3102,13 @@ TEST(ScalarFunctionTest, cosFunction_column) { // FLOAT float val_float[] = {13.00, 14.00, 15.00}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before COS:%f\n", *(float *)colDataGetData(pInput->columnData, i)); } @@ -2608,8 +3134,10 @@ TEST(ScalarFunctionTest, tanFunction_constant) { // TINYINT int8_t val_tinyint = 13; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before TAN:%d\n", *((int8_t *)pInput->data)); code = tanFunction(pInput, 1, pOutput); @@ -2624,8 +3152,10 @@ TEST(ScalarFunctionTest, tanFunction_constant) { // FLOAT float val_float = 13.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before TAN:%f\n", *((float *)pInput->data)); code = tanFunction(pInput, 1, pOutput); @@ -2650,10 +3180,13 @@ TEST(ScalarFunctionTest, tanFunction_column) { // TINYINT int8_t val_tinyint[] = {13, 14, 15}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before TAN:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); } @@ -2669,10 +3202,13 @@ TEST(ScalarFunctionTest, tanFunction_column) { // FLOAT float val_float[] = {13.00, 14.00, 15.00}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_float[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before TAN:%f\n", *((float *)colDataGetData(pInput->columnData, i))); } @@ -2698,8 +3234,10 @@ TEST(ScalarFunctionTest, asinFunction_constant) { // TINYINT int8_t val_tinyint = 1; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before ASIN:%d\n", *((int8_t *)pInput->data)); code = asinFunction(pInput, 1, pOutput); @@ -2714,8 +3252,10 @@ TEST(ScalarFunctionTest, asinFunction_constant) { // FLOAT float val_float = 1.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ASIN:%f\n", *((float *)pInput->data)); code = asinFunction(pInput, 1, pOutput); @@ -2740,10 +3280,13 @@ TEST(ScalarFunctionTest, asinFunction_column) { // TINYINT int8_t val_tinyint[] = {-1, 0, 1}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + code = colDataSetVal(pInput->columnData, i, (const char *)&val_tinyint[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before ASIN:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); } @@ -2759,8 +3302,10 @@ TEST(ScalarFunctionTest, asinFunction_column) { // FLOAT float val_float[] = {-1.0, 0.0, 1.0}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before ASIN:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -2788,8 +3333,10 @@ TEST(ScalarFunctionTest, acosFunction_constant) { // TINYINT int8_t val_tinyint = 1; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before ACOS:%d\n", *((int8_t *)pInput->data)); code = acosFunction(pInput, 1, pOutput); @@ -2804,8 +3351,10 @@ TEST(ScalarFunctionTest, acosFunction_constant) { // FLOAT float val_float = 1.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ACOS:%f\n", *((float *)pInput->data)); code = acosFunction(pInput, 1, pOutput); @@ -2830,8 +3379,10 @@ TEST(ScalarFunctionTest, acosFunction_column) { // TINYINT int8_t val_tinyint[] = {-1, 0, 1}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before ACOS:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -2849,8 +3400,10 @@ TEST(ScalarFunctionTest, acosFunction_column) { // FLOAT float val_float[] = {-1.0, 0.0, 1.0}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before ACOS:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -2878,8 +3431,10 @@ TEST(ScalarFunctionTest, atanFunction_constant) { // TINYINT int8_t val_tinyint = 1; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before ATAN:%d\n", *((int8_t *)pInput->data)); code = atanFunction(pInput, 1, pOutput); @@ -2894,8 +3449,10 @@ TEST(ScalarFunctionTest, atanFunction_constant) { // FLOAT float val_float = 1.00; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ATAN:%f\n", *((float *)pInput->data)); code = atanFunction(pInput, 1, pOutput); @@ -2920,8 +3477,10 @@ TEST(ScalarFunctionTest, atanFunction_column) { // TINYINT int8_t val_tinyint[] = {-1, 0, 1}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before ATAN:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -2939,8 +3498,10 @@ TEST(ScalarFunctionTest, atanFunction_column) { // FLOAT float val_float[] = {-1.0, 0.0, 1.0}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before ATAN:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -2967,8 +3528,10 @@ TEST(ScalarFunctionTest, ceilFunction_constant) { // TINYINT int8_t val_tinyint = 10; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before CEIL:%d\n", *((int8_t *)pInput->data)); code = ceilFunction(pInput, 1, pOutput); @@ -2983,8 +3546,10 @@ TEST(ScalarFunctionTest, ceilFunction_constant) { // FLOAT float val_float = 9.5; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before CEIL:%f\n", *((float *)pInput->data)); code = ceilFunction(pInput, 1, pOutput); @@ -3008,8 +3573,10 @@ TEST(ScalarFunctionTest, ceilFunction_column) { // TINYINT int8_t val_tinyint[] = {-10, 0, 10}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before CEIL:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -3027,8 +3594,10 @@ TEST(ScalarFunctionTest, ceilFunction_column) { // FLOAT float val_float[] = {-10.5, 0.0, 9.5}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before CEIL:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -3055,8 +3624,10 @@ TEST(ScalarFunctionTest, floorFunction_constant) { // TINYINT int8_t val_tinyint = 10; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before FLOOR:%d\n", *((int8_t *)pInput->data)); code = floorFunction(pInput, 1, pOutput); @@ -3071,8 +3642,10 @@ TEST(ScalarFunctionTest, floorFunction_constant) { // FLOAT float val_float = 10.5; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before FLOOR:%f\n", *((float *)pInput->data)); code = floorFunction(pInput, 1, pOutput); @@ -3096,8 +3669,10 @@ TEST(ScalarFunctionTest, floorFunction_column) { // TINYINT int8_t val_tinyint[] = {-10, 0, 10}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before FLOOR:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -3115,8 +3690,10 @@ TEST(ScalarFunctionTest, floorFunction_column) { // FLOAT float val_float[] = {-9.5, 0.0, 10.5}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before FLOOR:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -3143,8 +3720,10 @@ TEST(ScalarFunctionTest, roundFunction_constant) { // TINYINT int8_t val_tinyint = 10; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before ROUND:%d\n", *((int8_t *)pInput->data)); code = roundFunction(pInput, 1, pOutput); @@ -3159,8 +3738,10 @@ TEST(ScalarFunctionTest, roundFunction_constant) { // FLOAT float val_float = 9.5; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before ROUND:%f\n", *((float *)pInput->data)); code = roundFunction(pInput, 1, pOutput); @@ -3184,8 +3765,10 @@ TEST(ScalarFunctionTest, roundFunction_column) { // TINYINT int8_t val_tinyint[] = {-10, 0, 10}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before ROUND:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -3203,8 +3786,10 @@ TEST(ScalarFunctionTest, roundFunction_column) { // FLOAT float val_float[] = {-9.5, 0.0, 9.5}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before ROUND:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -3232,8 +3817,10 @@ TEST(ScalarFunctionTest, sqrtFunction_constant) { // TINYINT int8_t val_tinyint = 25; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_tinyint, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before SQRT:%d\n", *((int8_t *)pInput->data)); code = sqrtFunction(pInput, 1, pOutput); @@ -3248,8 +3835,10 @@ TEST(ScalarFunctionTest, sqrtFunction_constant) { // FLOAT float val_float = 25.0; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, &val_float, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before SQRT:%f\n", *((float *)pInput->data)); code = sqrtFunction(pInput, 1, pOutput); @@ -3274,8 +3863,10 @@ TEST(ScalarFunctionTest, sqrtFunction_column) { // TINYINT int8_t val_tinyint[] = {25, 81, 100}; type = TSDB_DATA_TYPE_TINYINT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((int8_t *)colDataGetData(pInput->columnData, i)) = val_tinyint[i]; PRINTF("tiny_int before SQRT:%d\n", *((int8_t *)colDataGetData(pInput->columnData, i))); @@ -3293,8 +3884,10 @@ TEST(ScalarFunctionTest, sqrtFunction_column) { // FLOAT float val_float[] = {25.0, 81.0, 100.0}; type = TSDB_DATA_TYPE_FLOAT; - scltMakeDataBlock(&pInput, type, 0, rowNum, false); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pInput, type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { *((float *)colDataGetData(pInput->columnData, i)) = val_float[i]; PRINTF("float before SQRT:%f\n", *((float *)colDataGetData(pInput->columnData, i))); @@ -3325,10 +3918,12 @@ TEST(ScalarFunctionTest, logFunction_constant) { int8_t val_tinyint[] = {27, 3}; type = TSDB_DATA_TYPE_TINYINT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, &val_tinyint[i], rowNum, true); + code = scltMakeDataBlock(&input[i], type, &val_tinyint[i], rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before LOG: %d,%d\n", *((int8_t *)pInput[0].data), *((int8_t *)pInput[1].data)); code = logFunction(pInput, 2, pOutput); @@ -3345,10 +3940,12 @@ TEST(ScalarFunctionTest, logFunction_constant) { float val_float[] = {64.0, 4.0}; type = TSDB_DATA_TYPE_FLOAT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, &val_float[i], rowNum, true); + code = scltMakeDataBlock(&input[i], type, &val_float[i], rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before LOG: %f,%f\n", *((float *)pInput[0].data), *((float *)pInput[1].data)); code = logFunction(pInput, 2, pOutput); @@ -3364,12 +3961,14 @@ TEST(ScalarFunctionTest, logFunction_constant) { // TINYINT AND FLOAT int8_t param0 = 64; float param1 = 4.0; - scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, ¶m0, rowNum, true); + code = scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, ¶m0, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[0] = *input[0]; - scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, ¶m1, rowNum, true); + code = scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, ¶m1, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[1] = *input[1]; - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int,float before LOG: %d,%f\n", *((int8_t *)pInput[0].data), *((float *)pInput[1].data)); code = logFunction(pInput, 2, pOutput); @@ -3399,16 +3998,18 @@ TEST(ScalarFunctionTest, logFunction_column) { int8_t val_tinyint[2][3] = {{9, 27, 81}, {3, 3, 3}}; type = TSDB_DATA_TYPE_TINYINT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, 0, rowNum, false); + code = scltMakeDataBlock(&input[i], type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; for (int32_t j = 0; j < rowNum; ++j) { - colDataSetVal(pInput[i].columnData, j, (const char *)&val_tinyint[i][j], false); + code = colDataSetVal(pInput[i].columnData, j, (const char *)&val_tinyint[i][j], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("tiny_int before LOG:%d,%d,%d\n", *((int8_t *)pInput[i].data + 0), *((int8_t *)pInput[i].data + 1), *((int8_t *)pInput[i].data + 2)); } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = logFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { @@ -3423,16 +4024,18 @@ TEST(ScalarFunctionTest, logFunction_column) { float val_float[2][3] = {{9.0, 27.0, 81.0}, {3.0, 3.0, 3.0}}; type = TSDB_DATA_TYPE_FLOAT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, 0, rowNum, false); + code = scltMakeDataBlock(&input[i], type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; for (int32_t j = 0; j < rowNum; ++j) { - colDataSetVal(pInput[i].columnData, j, (const char *)&val_float[i][j], false); + code = colDataSetVal(pInput[i].columnData, j, (const char *)&val_float[i][j], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("float before LOG:%f,%f,%f\n", *((float *)colDataGetData(pInput[i], 0)), *((float *)colDataGetData(pInput[i], 1)), *((float *)colDataGetData(pInput[i], 2))); } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = logFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { @@ -3446,21 +4049,25 @@ TEST(ScalarFunctionTest, logFunction_column) { // TINYINT AND FLOAT int8_t param0[] = {9, 27, 81}; float param1[] = {3.0, 3.0, 3.0}; - scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, 0, rowNum, false); + code = scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[0] = *input[0]; for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput[0].columnData, i, (const char *)¶m0[i], false); + code = colDataSetVal(pInput[0].columnData, i, (const char *)¶m0[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } - scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, 0, rowNum, false); + code = scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[1] = *input[1]; for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput[1].columnData, i, (const char *)¶m1[i], false); + code = colDataSetVal(pInput[1].columnData, i, (const char *)¶m1[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("tiny_int, float before LOG:{%d,%f}, {%d,%f}, {%d,%f}\n", *((int8_t *)pInput[0].data + 0), *((float *)pInput[1].data + 0), *((int8_t *)pInput[0].data + 1), *((float *)pInput[1].data + 1), *((int8_t *)pInput[0].data + 2), *((float *)pInput[1].data + 2)); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = logFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { @@ -3488,10 +4095,12 @@ TEST(ScalarFunctionTest, powFunction_constant) { int8_t val_tinyint[] = {2, 4}; type = TSDB_DATA_TYPE_TINYINT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, &val_tinyint[i], rowNum, true); + code = scltMakeDataBlock(&input[i], type, &val_tinyint[i], rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int before POW: %d,%d\n", *((int8_t *)pInput[0].data), *((int8_t *)pInput[1].data)); code = powFunction(pInput, 2, pOutput); @@ -3508,10 +4117,12 @@ TEST(ScalarFunctionTest, powFunction_constant) { float val_float[] = {2.0, 4.0}; type = TSDB_DATA_TYPE_FLOAT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, &val_float[i], rowNum, true); + code = scltMakeDataBlock(&input[i], type, &val_float[i], rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("float before POW: %f,%f\n", *((float *)pInput[0].data), *((float *)pInput[1].data)); code = powFunction(pInput, 2, pOutput); @@ -3527,12 +4138,14 @@ TEST(ScalarFunctionTest, powFunction_constant) { // TINYINT AND FLOAT int8_t param0 = 2; float param1 = 4.0; - scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, ¶m0, rowNum, true); + code = scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, ¶m0, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[0] = *input[0]; - scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, ¶m1, rowNum, true); + code = scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, ¶m1, rowNum, true); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[1] = *input[1]; - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); PRINTF("tiny_int,float before POW: %d,%f\n", *((int8_t *)pInput[0].data), *((float *)pInput[1].data)); code = powFunction(pInput, 2, pOutput); @@ -3562,16 +4175,18 @@ TEST(ScalarFunctionTest, powFunction_column) { int8_t val_tinyint[2][3] = {{2, 3, 4}, {3, 3, 3}}; type = TSDB_DATA_TYPE_TINYINT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, 0, rowNum, false); + code = scltMakeDataBlock(&input[i], type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; for (int32_t j = 0; j < rowNum; ++j) { - colDataSetVal(pInput[i].columnData, j, (const char *)&val_tinyint[i][j], false); + code = colDataSetVal(pInput[i].columnData, j, (const char *)&val_tinyint[i][j], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("tiny_int before POW:%d,%d,%d\n", *((int8_t *)pInput[i].data + 0), *((int8_t *)pInput[i].data + 1), *((int8_t *)pInput[i].data + 2)); } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = powFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { @@ -3587,16 +4202,18 @@ TEST(ScalarFunctionTest, powFunction_column) { float val_float[2][3] = {{2.0, 3.0, 4.0}, {3.0, 3.0, 3.0}}; type = TSDB_DATA_TYPE_FLOAT; for (int32_t i = 0; i < 2; ++i) { - scltMakeDataBlock(&input[i], type, 0, rowNum, false); + code = scltMakeDataBlock(&input[i], type, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[i] = *input[i]; for (int32_t j = 0; j < rowNum; ++j) { - colDataSetVal(pInput[i].columnData, j, (const char *)&val_float[i][j], false); + code = colDataSetVal(pInput[i].columnData, j, (const char *)&val_float[i][j], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("float before POW:%f,%f,%f\n", *((float *)pInput[i].data + 0), *((float *)pInput[i].data + 1), *((float *)pInput[i].data + 2)); } - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = powFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { @@ -3610,21 +4227,25 @@ TEST(ScalarFunctionTest, powFunction_column) { // TINYINT AND FLOAT int8_t param0[] = {2, 3, 4}; float param1[] = {3.0, 3.0, 3.0}; - scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, 0, rowNum, false); + code = scltMakeDataBlock(&input[0], TSDB_DATA_TYPE_TINYINT, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[0] = *input[0]; for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput[0].columnData, i, (const char *)¶m0[i], false); + code = colDataSetVal(pInput[0].columnData, i, (const char *)¶m0[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } - scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, 0, rowNum, false); + code = scltMakeDataBlock(&input[1], TSDB_DATA_TYPE_FLOAT, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); pInput[1] = *input[1]; for (int32_t i = 0; i < rowNum; ++i) { - colDataSetVal(pInput[1].columnData, i, (const char *)¶m1[i], false); + code = colDataSetVal(pInput[1].columnData, i, (const char *)¶m1[i], false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); } PRINTF("tiny_int, float before POW:{%d,%f}, {%d,%f}, {%d,%f}\n", *((int8_t *)pInput[0].data + 0), *((float *)pInput[1].data + 0), *((int8_t *)pInput[0].data + 1), *((float *)pInput[1].data + 1), *((int8_t *)pInput[0].data + 2), *((float *)pInput[1].data + 2)); - scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); - + code = scltMakeDataBlock(&pOutput, otype, 0, rowNum, false); + ASSERT_EQ(code, TSDB_CODE_SUCCESS); code = powFunction(pInput, 2, pOutput); ASSERT_EQ(code, TSDB_CODE_SUCCESS); for (int32_t i = 0; i < rowNum; ++i) { From e1bcd844261fe163e3a134c19a272436adf06bcc Mon Sep 17 00:00:00 2001 From: sima Date: Fri, 19 Jul 2024 11:16:37 +0800 Subject: [PATCH 7/7] enh:[TD-30998] Handling memory release when error occurred. --- source/libs/scalar/src/filter.c | 33 ++++++++++++++++---------------- source/libs/scalar/src/scalar.c | 5 +++++ source/libs/scalar/src/sclfunc.c | 2 ++ 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index b100f719a4..105243608e 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -957,6 +957,7 @@ int32_t filterDetachCnfGroup(SFilterGroup *gp1, SFilterGroup *gp2, SArray *group gp.unitFlags = NULL; if (NULL == taosArrayPush(group, &gp)) { + taosMemoryFreeClear(gp.unitIdxs); FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } @@ -1267,9 +1268,9 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { if (valueNode->node.resType.type != type) { int32_t overflow = 0; code = sclConvertValueToSclParam(valueNode, &out, &overflow); - if (code) { + if (TSDB_CODE_SUCCESS != code) { // fltError("convert from %d to %d failed", in.type, out.type); - FLT_ERR_RET(code); + break; } if (overflow) { @@ -1306,7 +1307,8 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) { break; } if (NULL == taosArrayPush(group, &fgroup)) { - FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + code = TSDB_CODE_OUT_OF_MEMORY; + break; } cell = cell->pNext; @@ -2337,6 +2339,7 @@ _return: int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gResNum) { bool empty = false; + int32_t code = TSDB_CODE_SUCCESS; uint32_t colIdxi = 0; uint32_t gResIdx = 0; uint32_t *colIdx = taosMemoryMalloc(info->fields[FLD_TYPE_COLUMN].num * sizeof(uint32_t)); @@ -2348,11 +2351,11 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t gRes[gResIdx] = taosMemoryCalloc(1, sizeof(SFilterGroupCtx)); if (gRes[gResIdx] == NULL) { - FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); } gRes[gResIdx]->colInfo = taosMemoryCalloc(info->fields[FLD_TYPE_COLUMN].num, sizeof(SFilterColInfo)); if (gRes[gResIdx]->colInfo == NULL) { - FLT_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); + FLT_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY); } colIdxi = 0; empty = false; @@ -2364,7 +2367,7 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t if (gRes[gResIdx]->colInfo[cidx].info == NULL) { gRes[gResIdx]->colInfo[cidx].info = (SArray *)taosArrayInit(4, POINTER_BYTES); if (gRes[gResIdx]->colInfo[cidx].info == NULL) { - FLT_ERR_RET(terrno); + FLT_ERR_JRET(terrno); } colIdx[colIdxi++] = cidx; ++gRes[gResIdx]->colNum; @@ -2388,7 +2391,7 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t continue; } - FLT_ERR_RET(filterMergeUnits(info, gRes[gResIdx], colIdx[l], &empty)); + FLT_ERR_JRET(filterMergeUnits(info, gRes[gResIdx], colIdx[l], &empty)); if (empty) { break; @@ -2408,15 +2411,15 @@ int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t ++gResIdx; } - taosMemoryFreeClear(colIdx); - *gResNum = gResIdx; if (gResIdx == 0) { FILTER_SET_FLAG(info->status, FI_STATUS_EMPTY); } - return TSDB_CODE_SUCCESS; +_return: + taosMemoryFreeClear(colIdx); + FLT_RET(code); } bool filterIsSameUnits(SFilterColInfo *pCol1, SFilterColInfo *pCol2) { @@ -2956,15 +2959,9 @@ int32_t filterPostProcessRange(SFilterInfo *info) { int32_t filterGenerateComInfo(SFilterInfo *info) { info->cunits = taosMemoryMalloc(info->unitNum * sizeof(*info->cunits)); - if (NULL == info->cunits) { - return TSDB_CODE_OUT_OF_MEMORY; - } info->blkUnitRes = taosMemoryMalloc(sizeof(*info->blkUnitRes) * info->unitNum); - if (NULL == info->blkUnitRes) { - return TSDB_CODE_OUT_OF_MEMORY; - } info->blkUnits = taosMemoryMalloc(sizeof(*info->blkUnits) * (info->unitNum + 1) * info->groupNum); - if (NULL == info->blkUnits) { + if (NULL == info->cunits || NULL == info->blkUnitRes || NULL == info->blkUnits) { return TSDB_CODE_OUT_OF_MEMORY; } @@ -3427,6 +3424,7 @@ int32_t filterExecuteImplMisc(void *pinfo, int32_t numOfRows, SColumnInfoData *p int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); + taosMemoryFreeClear(newColData); FLT_ERR_RET(TSDB_CODE_APP_ERROR); } else { varDataSetLen(newColData, len); @@ -3501,6 +3499,7 @@ int32_t filterExecuteImpl(void *pinfo, int32_t numOfRows, SColumnInfoData *pRes, int32_t len = taosUcs4ToMbs((TdUcs4 *)varDataVal(colData), varDataLen(colData), varDataVal(newColData)); if (len < 0) { qError("castConvert1 taosUcs4ToMbs error"); + taosMemoryFreeClear(newColData); FLT_ERR_RET(TSDB_CODE_APP_ERROR); } else { varDataSetLen(newColData, len); diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 6b28269e30..346bbb2811 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -1234,6 +1234,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { if (NULL == res->datum.p) { sclError("calloc %d failed", len); sclFreeParam(&output); + nodesDestroyNode((SNode *)res); ctx->code = TSDB_CODE_OUT_OF_MEMORY; return DEAL_RES_ERROR; } @@ -1244,6 +1245,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { if (NULL == res->datum.p) { sclError("calloc %d failed", (int)(varDataTLen(output.columnData->pData) + 1)); sclFreeParam(&output); + nodesDestroyNode((SNode *)res); ctx->code = TSDB_CODE_OUT_OF_MEMORY; return DEAL_RES_ERROR; } @@ -1253,6 +1255,7 @@ EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) { ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); if (ctx->code) { sclFreeParam(&output); + nodesDestroyNode((SNode *)res); return DEAL_RES_ERROR; } } @@ -1415,6 +1418,7 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { if (NULL == res->datum.p) { sclError("calloc %d failed", (int)(varDataTLen(output.columnData->pData) + 1)); sclFreeParam(&output); + nodesDestroyNode((SNode *)res); ctx->code = TSDB_CODE_OUT_OF_MEMORY; return DEAL_RES_ERROR; } @@ -1423,6 +1427,7 @@ EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) { ctx->code = nodesSetValueNodeValue(res, output.columnData->pData); if (ctx->code) { sclFreeParam(&output); + nodesDestroyNode((SNode *)res); return DEAL_RES_ERROR; } } diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index db3a5d8537..5baaa57b1d 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -2731,6 +2731,7 @@ static int32_t getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char * intervals = taosMemoryCalloc(numOfBins, sizeof(double)); if (NULL == intervals) { + cJSON_Delete(binDesc); SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } if (cJSON_IsNumber(width) && factor == NULL && binType == LINEAR_BIN) { @@ -2795,6 +2796,7 @@ static int32_t getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char * numOfBins = cJSON_GetArraySize(binDesc); intervals = taosMemoryCalloc(numOfBins, sizeof(double)); if (NULL == intervals) { + cJSON_Delete(binDesc); SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY); } cJSON *bin = binDesc->child;