From dc23446d6bbe0e478759afa11f6a8d2cf80aa463 Mon Sep 17 00:00:00 2001 From: sima Date: Tue, 23 Jul 2024 15:37:08 +0800 Subject: [PATCH] enh:[TD-31063] use properer errcode. --- source/libs/function/src/builtinsimpl.c | 4 ++-- source/libs/function/src/functionMgt.c | 4 ++-- source/libs/function/src/tpercentile.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index 945c1ac9cd..1197891cab 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -3566,7 +3566,7 @@ int32_t diffFunctionByRow(SArray* pCtxArray) { SArray* pRows = taosArrayInit_s(sizeof(SFuncInputRow), diffColNum); if (NULL == pRows) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } bool keepNull = false; @@ -5958,7 +5958,7 @@ int32_t modeFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo) { } else { pInfo->pHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); if (NULL == pInfo->pHash) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } } pInfo->nullTupleSaved = false; diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c index 9e06a36e11..0424b2f179 100644 --- a/source/libs/function/src/functionMgt.c +++ b/source/libs/function/src/functionMgt.c @@ -35,14 +35,14 @@ static void doInitFunctionTable() { gFunMgtService.pFuncNameHashTable = taosHashInit(funcMgtBuiltinsNum, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); if (NULL == gFunMgtService.pFuncNameHashTable) { - initFunctionCode = TSDB_CODE_FAILED; + initFunctionCode = terrno; return; } for (int32_t i = 0; i < funcMgtBuiltinsNum; ++i) { if (TSDB_CODE_SUCCESS != taosHashPut(gFunMgtService.pFuncNameHashTable, funcMgtBuiltins[i].name, strlen(funcMgtBuiltins[i].name), &i, sizeof(int32_t))) { - initFunctionCode = TSDB_CODE_FAILED; + initFunctionCode = terrno; return; } } diff --git a/source/libs/function/src/tpercentile.c b/source/libs/function/src/tpercentile.c index 89959d32b6..40e0407a54 100644 --- a/source/libs/function/src/tpercentile.c +++ b/source/libs/function/src/tpercentile.c @@ -273,7 +273,7 @@ int32_t tMemBucketCreate(int32_t nElemSize, int16_t dataType, double minval, dou (*pBucket)->groupPagesMap = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK); if ((*pBucket)->groupPagesMap == NULL) { tMemBucketDestroy(*pBucket); - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } if (setBoundingBox(&(*pBucket)->range, (*pBucket)->type, minval, maxval) != 0) { // qError("MemBucket:%p, invalid value range: %f-%f", pBucket, minval, maxval); @@ -409,7 +409,7 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) { if (p == NULL) { pPageIdList = taosArrayInit(4, sizeof(int32_t)); if (NULL == pPageIdList) { - return TSDB_CODE_OUT_OF_MEMORY; + return terrno; } int32_t code = taosHashPut(pBucket->groupPagesMap, &groupId, sizeof(groupId), &pPageIdList, POINTER_BYTES); if (TSDB_CODE_SUCCESS != code) {