enh:modify error code passing

This commit is contained in:
lyh250-666 2024-09-20 17:58:13 +08:00
parent 69d62454d7
commit 651a94d747
1 changed files with 101 additions and 101 deletions

View File

@ -396,7 +396,7 @@ static int32_t addNamespace(STranslateContext* pCxt, void* pTable) {
if (currTotalLevel > pCxt->currLevel) { if (currTotalLevel > pCxt->currLevel) {
SArray* pTables = taosArrayGetP(pCxt->pNsLevel, pCxt->currLevel); SArray* pTables = taosArrayGetP(pCxt->pNsLevel, pCxt->currLevel);
if (NULL == taosArrayPush(pTables, &pTable)) { if (NULL == taosArrayPush(pTables, &pTable)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (hasSameTableAlias(pTables)) { if (hasSameTableAlias(pTables)) {
return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_UNIQUE_TABLE_ALIAS, return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_UNIQUE_TABLE_ALIAS,
@ -406,7 +406,7 @@ static int32_t addNamespace(STranslateContext* pCxt, void* pTable) {
do { do {
SArray* pTables = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES); SArray* pTables = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES);
if (NULL == pTables) { if (NULL == pTables) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (pCxt->currLevel == currTotalLevel) { if (pCxt->currLevel == currTotalLevel) {
if (NULL == taosArrayPush(pTables, &pTable)) { if (NULL == taosArrayPush(pTables, &pTable)) {
@ -420,7 +420,7 @@ static int32_t addNamespace(STranslateContext* pCxt, void* pTable) {
} }
} }
if (NULL == taosArrayPush(pCxt->pNsLevel, &pTables)) { if (NULL == taosArrayPush(pCxt->pNsLevel, &pTables)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
taosArrayDestroy(pTables); taosArrayDestroy(pTables);
break; break;
} }
@ -811,7 +811,7 @@ static int32_t initTranslateContext(SParseContext* pParseCxt, SParseMetaCache* p
pCxt->pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); pCxt->pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
pCxt->pTargetTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); pCxt->pTargetTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
if (NULL == pCxt->pNsLevel || NULL == pCxt->pDbs || NULL == pCxt->pTables || NULL == pCxt->pTargetTables) { if (NULL == pCxt->pNsLevel || NULL == pCxt->pDbs || NULL == pCxt->pTables || NULL == pCxt->pTargetTables) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -833,7 +833,7 @@ static int32_t resetHighLevelTranslateNamespace(STranslateContext* pCxt) {
} }
pCxt->pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES); pCxt->pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES);
if (NULL == pCxt->pNsLevel) { if (NULL == pCxt->pNsLevel) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -848,7 +848,7 @@ static int32_t resetTranslateNamespace(STranslateContext* pCxt) {
} }
pCxt->pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES); pCxt->pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES);
if (NULL == pCxt->pNsLevel) { if (NULL == pCxt->pNsLevel) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -1208,7 +1208,7 @@ static int32_t setColumnInfoByExpr(STempTableNode* pTable, SExprNode* pExpr, SCo
if (NULL == pExpr->pAssociation) { if (NULL == pExpr->pAssociation) {
pExpr->pAssociation = taosArrayInit(TARRAY_MIN_SIZE, sizeof(SAssociationNode)); pExpr->pAssociation = taosArrayInit(TARRAY_MIN_SIZE, sizeof(SAssociationNode));
if (!pExpr->pAssociation) return TSDB_CODE_OUT_OF_MEMORY; if (!pExpr->pAssociation) return terrno;
} }
SAssociationNode assNode; SAssociationNode assNode;
assNode.pPlace = (SNode**)pColRef; assNode.pPlace = (SNode**)pColRef;
@ -2700,7 +2700,7 @@ static int32_t rewriteDatabaseFunc(STranslateContext* pCxt, SNode** pNode) {
if (NULL != pCxt->pParseCxt->db) { if (NULL != pCxt->pParseCxt->db) {
pCurrDb = taosStrdup((void*)pCxt->pParseCxt->db); pCurrDb = taosStrdup((void*)pCxt->pParseCxt->db);
if (NULL == pCurrDb) { if (NULL == pCurrDb) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
} }
int32_t code = rewriteFuncToValue(pCxt, &pCurrDb, pNode); int32_t code = rewriteFuncToValue(pCxt, &pCurrDb, pNode);
@ -2711,7 +2711,7 @@ static int32_t rewriteDatabaseFunc(STranslateContext* pCxt, SNode** pNode) {
static int32_t rewriteClentVersionFunc(STranslateContext* pCxt, SNode** pNode) { static int32_t rewriteClentVersionFunc(STranslateContext* pCxt, SNode** pNode) {
char* pVer = taosStrdup((void*)version); char* pVer = taosStrdup((void*)version);
if (NULL == pVer) { if (NULL == pVer) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = rewriteFuncToValue(pCxt, &pVer, pNode); int32_t code = rewriteFuncToValue(pCxt, &pVer, pNode);
if (TSDB_CODE_SUCCESS != code) taosMemoryFree(pVer); if (TSDB_CODE_SUCCESS != code) taosMemoryFree(pVer);
@ -2721,7 +2721,7 @@ static int32_t rewriteClentVersionFunc(STranslateContext* pCxt, SNode** pNode) {
static int32_t rewriteServerVersionFunc(STranslateContext* pCxt, SNode** pNode) { static int32_t rewriteServerVersionFunc(STranslateContext* pCxt, SNode** pNode) {
char* pVer = taosStrdup((void*)pCxt->pParseCxt->svrVer); char* pVer = taosStrdup((void*)pCxt->pParseCxt->svrVer);
if (NULL == pVer) { if (NULL == pVer) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = rewriteFuncToValue(pCxt, &pVer, pNode); int32_t code = rewriteFuncToValue(pCxt, &pVer, pNode);
if (TSDB_CODE_SUCCESS != code) taosMemoryFree(pVer); if (TSDB_CODE_SUCCESS != code) taosMemoryFree(pVer);
@ -2746,7 +2746,7 @@ static int32_t rewriteUserFunc(STranslateContext* pCxt, SNode** pNode) {
} }
char* pUserConn = taosStrdup((void*)userConn); char* pUserConn = taosStrdup((void*)userConn);
if (NULL == pUserConn) { if (NULL == pUserConn) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = rewriteFuncToValue(pCxt, &pUserConn, pNode); int32_t code = rewriteFuncToValue(pCxt, &pUserConn, pNode);
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
@ -3792,13 +3792,13 @@ static int32_t addMnodeToVgroupList(const SEpSet* pEpSet, SArray** pVgroupList)
if (NULL == *pVgroupList) { if (NULL == *pVgroupList) {
*pVgroupList = taosArrayInit(TARRAY_MIN_SIZE, sizeof(SVgroupInfo)); *pVgroupList = taosArrayInit(TARRAY_MIN_SIZE, sizeof(SVgroupInfo));
if (NULL == *pVgroupList) { if (NULL == *pVgroupList) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
} }
SVgroupInfo vg = {.vgId = MNODE_HANDLE}; SVgroupInfo vg = {.vgId = MNODE_HANDLE};
memcpy(&vg.epSet, pEpSet, sizeof(SEpSet)); memcpy(&vg.epSet, pEpSet, sizeof(SEpSet));
if (NULL == taosArrayPush(*pVgroupList, &vg)) { if (NULL == taosArrayPush(*pVgroupList, &vg)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -3850,10 +3850,10 @@ static int32_t getVnodeSysTableVgroupListImpl(STranslateContext* pCxt, SName* pT
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
*pVgroupList = taosArrayInit(1, sizeof(SVgroupInfo)); *pVgroupList = taosArrayInit(1, sizeof(SVgroupInfo));
if (NULL == *pVgroupList) { if (NULL == *pVgroupList) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} else { } else {
if (NULL == taosArrayPush(*pVgroupList, &vgInfo)) { if (NULL == taosArrayPush(*pVgroupList, &vgInfo)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} }
} else if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code || } else if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code ||
@ -4037,7 +4037,7 @@ static int32_t setTableTsmas(STranslateContext* pCxt, SName* pName, SRealTableNo
if (!pRealTable->tsmaTargetTbVgInfo) { if (!pRealTable->tsmaTargetTbVgInfo) {
pRealTable->tsmaTargetTbVgInfo = taosArrayInit(pRealTable->pTsmas->size, POINTER_BYTES); pRealTable->tsmaTargetTbVgInfo = taosArrayInit(pRealTable->pTsmas->size, POINTER_BYTES);
if (!pRealTable->tsmaTargetTbVgInfo) { if (!pRealTable->tsmaTargetTbVgInfo) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} }
@ -4068,7 +4068,7 @@ static int32_t setTableTsmas(STranslateContext* pCxt, SName* pName, SRealTableNo
if (!pRealTable->tsmaTargetTbInfo) { if (!pRealTable->tsmaTargetTbInfo) {
pRealTable->tsmaTargetTbInfo = taosArrayInit(pRealTable->pTsmas->size, sizeof(STsmaTargetTbInfo)); pRealTable->tsmaTargetTbInfo = taosArrayInit(pRealTable->pTsmas->size, sizeof(STsmaTargetTbInfo));
if (!pRealTable->tsmaTargetTbInfo) { if (!pRealTable->tsmaTargetTbInfo) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} }
@ -5176,7 +5176,7 @@ static int32_t rewriteProjectAlias(SNodeList* pProjectionList) {
static int32_t checkProjectAlias(STranslateContext* pCxt, SNodeList* pProjectionList, SHashObj** pOutput) { static int32_t checkProjectAlias(STranslateContext* pCxt, SNodeList* pProjectionList, SHashObj** pOutput) {
SHashObj* pUserAliasSet = taosHashInit(LIST_LENGTH(pProjectionList), SHashObj* pUserAliasSet = taosHashInit(LIST_LENGTH(pProjectionList),
taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK); taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
if (!pUserAliasSet) return TSDB_CODE_OUT_OF_MEMORY; if (!pUserAliasSet) return terrno;
SNode* pProject = NULL; SNode* pProject = NULL;
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
FOREACH(pProject, pProjectionList) { FOREACH(pProject, pProjectionList) {
@ -6063,7 +6063,7 @@ static int32_t isOperatorTbnameInCond(STranslateContext* pCxt, SOperatorNode* pO
} }
SNodeListNode* pValueListNode = (SNodeListNode*)pOperator->pRight; SNodeListNode* pValueListNode = (SNodeListNode*)pOperator->pRight;
*ppTbNames = taosArrayInit(LIST_LENGTH(pValueListNode->pNodeList), sizeof(void*)); *ppTbNames = taosArrayInit(LIST_LENGTH(pValueListNode->pNodeList), sizeof(void*));
if (!*ppTbNames) return TSDB_CODE_OUT_OF_MEMORY; if (!*ppTbNames) return terrno;
SNodeList* pValueNodeList = pValueListNode->pNodeList; SNodeList* pValueNodeList = pValueListNode->pNodeList;
SNode* pValNode = NULL; SNode* pValNode = NULL;
FOREACH(pValNode, pValueNodeList) { FOREACH(pValNode, pValueNodeList) {
@ -6133,7 +6133,7 @@ static int32_t findEqualCondTbnameInLogicCondAnd(STranslateContext* pCxt, SNode*
if (!isTableExistInTableTbnames(aTableTbnames, info.pRealTable)) { if (!isTableExistInTableTbnames(aTableTbnames, info.pRealTable)) {
// TODO: intersect tbNames of same table? speed // TODO: intersect tbNames of same table? speed
if (NULL == taosArrayPush(aTableTbnames, &info)) { if (NULL == taosArrayPush(aTableTbnames, &info)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} else { } else {
@ -6164,7 +6164,7 @@ static int32_t unionEqualCondTbnamesOfSameTable(SArray* aTableTbnames, SEqCondTb
} }
if (TSDB_CODE_SUCCESS == code && !bFoundTable) { if (TSDB_CODE_SUCCESS == code && !bFoundTable) {
if (NULL == taosArrayPush(aTableTbnames, pInfo)) { if (NULL == taosArrayPush(aTableTbnames, pInfo)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} }
return code; return code;
@ -6214,7 +6214,7 @@ static int32_t findEqualCondTbname(STranslateContext* pCxt, SNode* pWhere, SArra
if (TSDB_CODE_SUCCESS != code) return code; if (TSDB_CODE_SUCCESS != code) return code;
if (bIsEqTbnameCond) { if (bIsEqTbnameCond) {
if (NULL == taosArrayPush(aTableTbnames, &info)) { if (NULL == taosArrayPush(aTableTbnames, &info)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
} }
} else if (nodeType(pWhere) == QUERY_NODE_LOGIC_CONDITION) { } else if (nodeType(pWhere) == QUERY_NODE_LOGIC_CONDITION) {
@ -6345,12 +6345,12 @@ static int32_t setEqualTbnameTableVgroups(STranslateContext* pCxt, SSelectStmt*
if (pInfo->pRealTable->pTsmas) { if (pInfo->pRealTable->pTsmas) {
pInfo->pRealTable->tsmaTargetTbVgInfo = taosArrayInit(pInfo->pRealTable->pTsmas->size, POINTER_BYTES); pInfo->pRealTable->tsmaTargetTbVgInfo = taosArrayInit(pInfo->pRealTable->pTsmas->size, POINTER_BYTES);
if (!pInfo->pRealTable->tsmaTargetTbVgInfo) return TSDB_CODE_OUT_OF_MEMORY; if (!pInfo->pRealTable->tsmaTargetTbVgInfo) return terrno;
for (int32_t i = 0; i < pInfo->pRealTable->pTsmas->size; ++i) { for (int32_t i = 0; i < pInfo->pRealTable->pTsmas->size; ++i) {
STableTSMAInfo* pTsma = taosArrayGetP(pInfo->pRealTable->pTsmas, i); STableTSMAInfo* pTsma = taosArrayGetP(pInfo->pRealTable->pTsmas, i);
SArray* pTbNames = taosArrayInit(pInfo->aTbnames->size, POINTER_BYTES); SArray* pTbNames = taosArrayInit(pInfo->aTbnames->size, POINTER_BYTES);
if (!pTbNames) return TSDB_CODE_OUT_OF_MEMORY; if (!pTbNames) return terrno;
for (int32_t k = 0; k < pInfo->aTbnames->size; ++k) { for (int32_t k = 0; k < pInfo->aTbnames->size; ++k) {
const char* pTbName = taosArrayGetP(pInfo->aTbnames, k); const char* pTbName = taosArrayGetP(pInfo->aTbnames, k);
@ -6368,7 +6368,7 @@ static int32_t setEqualTbnameTableVgroups(STranslateContext* pCxt, SSelectStmt*
} }
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
vgsInfo = taosMemoryMalloc(sizeof(SVgroupsInfo) + nTbls * sizeof(SVgroupInfo)); vgsInfo = taosMemoryMalloc(sizeof(SVgroupsInfo) + nTbls * sizeof(SVgroupInfo));
if (!vgsInfo) code = TSDB_CODE_OUT_OF_MEMORY; if (!vgsInfo) code = terrno;
} }
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
findVgroupsFromEqualTbname(pCxt, pTbNames, pInfo->pRealTable->table.dbName, numOfVgs, vgsInfo); findVgroupsFromEqualTbname(pCxt, pTbNames, pInfo->pRealTable->table.dbName, numOfVgs, vgsInfo);
@ -7141,7 +7141,7 @@ static int32_t buildCreateDbRetentions(const SNodeList* pRetentions, SCreateDbRe
if (NULL != pRetentions) { if (NULL != pRetentions) {
pReq->pRetensions = taosArrayInit(LIST_LENGTH(pRetentions), sizeof(SRetention)); pReq->pRetensions = taosArrayInit(LIST_LENGTH(pRetentions), sizeof(SRetention));
if (NULL == pReq->pRetensions) { if (NULL == pReq->pRetensions) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
SValueNode* pFreq = NULL; SValueNode* pFreq = NULL;
SValueNode* pKeep = NULL; SValueNode* pKeep = NULL;
@ -7153,7 +7153,7 @@ static int32_t buildCreateDbRetentions(const SNodeList* pRetentions, SCreateDbRe
SRetention retention = { SRetention retention = {
.freq = pFreq->datum.i, .freqUnit = pFreq->unit, .keep = pKeep->datum.i, .keepUnit = pKeep->unit}; .freq = pFreq->datum.i, .freqUnit = pFreq->unit, .keep = pKeep->datum.i, .keepUnit = pKeep->unit};
if (NULL == taosArrayPush(pReq->pRetensions, &retention)) { if (NULL == taosArrayPush(pReq->pRetensions, &retention)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} }
@ -7698,7 +7698,7 @@ static int32_t checkCreateDatabase(STranslateContext* pCxt, SCreateDatabaseStmt*
CMD_TYPE* pCmdReq = genericCmd; \ CMD_TYPE* pCmdReq = genericCmd; \
char* cmdSql = taosMemoryMalloc(sqlLen); \ char* cmdSql = taosMemoryMalloc(sqlLen); \
if (cmdSql == NULL) { \ if (cmdSql == NULL) { \
return TSDB_CODE_OUT_OF_MEMORY; \ return terrno; \
} \ } \
memcpy(cmdSql, sql, sqlLen); \ memcpy(cmdSql, sql, sqlLen); \
pCmdReq->sqlLen = sqlLen; \ pCmdReq->sqlLen = sqlLen; \
@ -7834,7 +7834,7 @@ static int32_t buildCmdMsg(STranslateContext* pCxt, int16_t msgType, FSerializeF
if (TSDB_CODE_SUCCESS != code) return code; if (TSDB_CODE_SUCCESS != code) return code;
pCxt->pCmdMsg = taosMemoryMalloc(sizeof(SCmdMsgInfo)); pCxt->pCmdMsg = taosMemoryMalloc(sizeof(SCmdMsgInfo));
if (NULL == pCxt->pCmdMsg) { if (NULL == pCxt->pCmdMsg) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet; pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
pCxt->pCmdMsg->msgType = msgType; pCxt->pCmdMsg->msgType = msgType;
@ -7845,7 +7845,7 @@ static int32_t buildCmdMsg(STranslateContext* pCxt, int16_t msgType, FSerializeF
pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen); pCxt->pCmdMsg->pMsg = taosMemoryMalloc(pCxt->pCmdMsg->msgLen);
if (NULL == pCxt->pCmdMsg->pMsg) { if (NULL == pCxt->pCmdMsg->pMsg) {
taosMemoryFreeClear(pCxt->pCmdMsg); taosMemoryFreeClear(pCxt->pCmdMsg);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (-1 == func(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, pReq)) { if (-1 == func(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, pReq)) {
code = TSDB_CODE_INVALID_MSG; code = TSDB_CODE_INVALID_MSG;
@ -7985,7 +7985,7 @@ static int32_t translateS3MigrateDatabase(STranslateContext* pCxt, SS3MigrateDat
static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray, bool calBytes) { static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray, bool calBytes) {
*pArray = taosArrayInit(LIST_LENGTH(pList), sizeof(SFieldWithOptions)); *pArray = taosArrayInit(LIST_LENGTH(pList), sizeof(SFieldWithOptions));
if (!pArray) return TSDB_CODE_OUT_OF_MEMORY; if (!pArray) return terrno;
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
SNode* pNode; SNode* pNode;
@ -8011,7 +8011,7 @@ static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray, bool calB
field.flags |= COL_IS_KEY; field.flags |= COL_IS_KEY;
} }
if (NULL == taosArrayPush(*pArray, &field)) { if (NULL == taosArrayPush(*pArray, &field)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} }
@ -8024,7 +8024,7 @@ static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray, bool calB
static int32_t tagDefNodeToField(SNodeList* pList, SArray** pArray, bool calBytes) { static int32_t tagDefNodeToField(SNodeList* pList, SArray** pArray, bool calBytes) {
*pArray = taosArrayInit(LIST_LENGTH(pList), sizeof(SField)); *pArray = taosArrayInit(LIST_LENGTH(pList), sizeof(SField));
if (!*pArray) return TSDB_CODE_OUT_OF_MEMORY; if (!*pArray) return terrno;
SNode* pNode; SNode* pNode;
FOREACH(pNode, pList) { FOREACH(pNode, pList) {
SColumnDefNode* pCol = (SColumnDefNode*)pNode; SColumnDefNode* pCol = (SColumnDefNode*)pNode;
@ -8257,7 +8257,7 @@ static int32_t checkTableSchemaImpl(STranslateContext* pCxt, SNodeList* pTags, S
SHashObj* pHash = taosHashInit(LIST_LENGTH(pTags) + LIST_LENGTH(pCols), SHashObj* pHash = taosHashInit(LIST_LENGTH(pTags) + LIST_LENGTH(pCols),
taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK); taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
if (NULL == pHash) { if (NULL == pHash) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = checkTableTagsSchema(pCxt, pHash, pTags); int32_t code = checkTableTagsSchema(pCxt, pHash, pTags);
@ -8784,7 +8784,7 @@ static int32_t buildRollupFuncs(SNodeList* pFuncs, SArray** pArray) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
*pArray = taosArrayInit(LIST_LENGTH(pFuncs), TSDB_FUNC_NAME_LEN); *pArray = taosArrayInit(LIST_LENGTH(pFuncs), TSDB_FUNC_NAME_LEN);
if (!*pArray) return TSDB_CODE_OUT_OF_MEMORY; if (!*pArray) return terrno;
SNode* pNode; SNode* pNode;
FOREACH(pNode, pFuncs) { FOREACH(pNode, pFuncs) {
if (NULL == taosArrayPush(*pArray, ((SFunctionNode*)pNode)->functionName)) { if (NULL == taosArrayPush(*pArray, ((SFunctionNode*)pNode)->functionName)) {
@ -8820,7 +8820,7 @@ static int32_t buildCreateStbReq(STranslateContext* pCxt, SCreateTableStmt* pStm
if (pStmt->pOptions->commentNull == false) { if (pStmt->pOptions->commentNull == false) {
pReq->pComment = taosStrdup(pStmt->pOptions->comment); pReq->pComment = taosStrdup(pStmt->pOptions->comment);
if (NULL == pReq->pComment) { if (NULL == pReq->pComment) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->commentLen = strlen(pStmt->pOptions->comment); pReq->commentLen = strlen(pStmt->pOptions->comment);
} else { } else {
@ -8897,7 +8897,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
if (pStmt->pOptions->commentNull == false) { if (pStmt->pOptions->commentNull == false) {
pAlterReq->comment = taosStrdup(pStmt->pOptions->comment); pAlterReq->comment = taosStrdup(pStmt->pOptions->comment);
if (NULL == pAlterReq->comment) { if (NULL == pAlterReq->comment) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pAlterReq->commentLen = strlen(pStmt->pOptions->comment); pAlterReq->commentLen = strlen(pStmt->pOptions->comment);
} else { } else {
@ -8909,7 +8909,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
pAlterReq->pFields = taosArrayInit(2, sizeof(TAOS_FIELD)); pAlterReq->pFields = taosArrayInit(2, sizeof(TAOS_FIELD));
if (NULL == pAlterReq->pFields) { if (NULL == pAlterReq->pFields) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
switch (pStmt->alterType) { switch (pStmt->alterType) {
@ -8922,7 +8922,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
TAOS_FIELD field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)}; TAOS_FIELD field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)};
strcpy(field.name, pStmt->colName); strcpy(field.name, pStmt->colName);
if (NULL == taosArrayPush(pAlterReq->pFields, &field)) { if (NULL == taosArrayPush(pAlterReq->pFields, &field)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
break; break;
} }
@ -8931,12 +8931,12 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
TAOS_FIELD oldField = {0}; TAOS_FIELD oldField = {0};
strcpy(oldField.name, pStmt->colName); strcpy(oldField.name, pStmt->colName);
if (NULL == taosArrayPush(pAlterReq->pFields, &oldField)) { if (NULL == taosArrayPush(pAlterReq->pFields, &oldField)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
TAOS_FIELD newField = {0}; TAOS_FIELD newField = {0};
strcpy(newField.name, pStmt->newColName); strcpy(newField.name, pStmt->newColName);
if (NULL == taosArrayPush(pAlterReq->pFields, &newField)) { if (NULL == taosArrayPush(pAlterReq->pFields, &newField)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
break; break;
} }
@ -8954,7 +8954,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
return code; return code;
} }
if (NULL == taosArrayPush(pAlterReq->pFields, &field)) { if (NULL == taosArrayPush(pAlterReq->pFields, &field)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
break; break;
} }
@ -8962,7 +8962,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
taosArrayDestroy(pAlterReq->pFields); taosArrayDestroy(pAlterReq->pFields);
pAlterReq->pFields = taosArrayInit(1, sizeof(SFieldWithOptions)); pAlterReq->pFields = taosArrayInit(1, sizeof(SFieldWithOptions));
if (!pAlterReq->pFields) return TSDB_CODE_OUT_OF_MEMORY; if (!pAlterReq->pFields) return terrno;
SFieldWithOptions field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)}; SFieldWithOptions field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)};
// TAOS_FIELD field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)}; // TAOS_FIELD field = {.type = pStmt->dataType.type, .bytes = calcTypeBytes(pStmt->dataType)};
strcpy(field.name, pStmt->colName); strcpy(field.name, pStmt->colName);
@ -8981,7 +8981,7 @@ static int32_t buildAlterSuperTableReq(STranslateContext* pCxt, SAlterTableStmt*
return code; return code;
} }
} }
if (NULL == taosArrayPush(pAlterReq->pFields, &field)) return TSDB_CODE_OUT_OF_MEMORY; if (NULL == taosArrayPush(pAlterReq->pFields, &field)) return terrno;
break; break;
} }
default: default:
@ -9370,7 +9370,7 @@ static int32_t getSmaIndexDstVgId(STranslateContext* pCxt, const char* pDbName,
static int32_t getSmaIndexSql(STranslateContext* pCxt, char** pSql, int32_t* pLen) { static int32_t getSmaIndexSql(STranslateContext* pCxt, char** pSql, int32_t* pLen) {
*pSql = taosStrdup(pCxt->pParseCxt->pSql); *pSql = taosStrdup(pCxt->pParseCxt->pSql);
if (NULL == *pSql) { if (NULL == *pSql) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
*pLen = pCxt->pParseCxt->sqlLen + 1; *pLen = pCxt->pParseCxt->sqlLen + 1;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
@ -9710,7 +9710,7 @@ static int32_t buildCreateTopicReq(STranslateContext* pCxt, SCreateTopicStmt* pS
pReq->sql = taosStrdup(pCxt->pParseCxt->pSql); pReq->sql = taosStrdup(pCxt->pParseCxt->pSql);
if (NULL == pReq->sql) { if (NULL == pReq->sql) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -10550,7 +10550,7 @@ static int32_t addProjToProjColPos(STranslateContext* pCxt, const SSchema* pSche
} }
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
SProjColPos pos = {.colId = pSchema->colId, .pProj = pNewProj, .flags = pSchema->flags}; SProjColPos pos = {.colId = pSchema->colId, .pProj = pNewProj, .flags = pSchema->flags};
code = (NULL == taosArrayPush(pProjColPos, &pos) ? TSDB_CODE_OUT_OF_MEMORY : TSDB_CODE_SUCCESS); code = (NULL == taosArrayPush(pProjColPos, &pos) ? terrno : TSDB_CODE_SUCCESS);
} }
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
nodesDestroyNode(pNewProj); nodesDestroyNode(pNewProj);
@ -10562,7 +10562,7 @@ static int32_t setFillNullCols(SArray* pProjColPos, const STableMeta* pMeta, SCM
int32_t numOfBoundCols = taosArrayGetSize(pProjColPos); int32_t numOfBoundCols = taosArrayGetSize(pProjColPos);
pReq->fillNullCols = taosArrayInit(pMeta->tableInfo.numOfColumns - numOfBoundCols, sizeof(SColLocation)); pReq->fillNullCols = taosArrayInit(pMeta->tableInfo.numOfColumns - numOfBoundCols, sizeof(SColLocation));
if (NULL == pReq->fillNullCols) { if (NULL == pReq->fillNullCols) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
const SSchema* pSchemas = getTableColumnSchema(pMeta); const SSchema* pSchemas = getTableColumnSchema(pMeta);
int32_t indexOfBoundCols = 0; int32_t indexOfBoundCols = 0;
@ -10578,7 +10578,7 @@ static int32_t setFillNullCols(SArray* pProjColPos, const STableMeta* pMeta, SCM
} }
SColLocation colLoc = {.colId = pSchema->colId, .slotId = i, .type = pSchema->type}; SColLocation colLoc = {.colId = pSchema->colId, .slotId = i, .type = pSchema->type};
if (NULL == taosArrayPush(pReq->fillNullCols, &colLoc)) { if (NULL == taosArrayPush(pReq->fillNullCols, &colLoc)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} }
@ -10593,7 +10593,7 @@ static int32_t adjustOrderOfProjections(STranslateContext* pCxt, SNodeList** ppC
SArray* pProjColPos = taosArrayInit(LIST_LENGTH((*ppCols)), sizeof(SProjColPos)); SArray* pProjColPos = taosArrayInit(LIST_LENGTH((*ppCols)), sizeof(SProjColPos));
if (NULL == pProjColPos) { if (NULL == pProjColPos) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -10720,7 +10720,7 @@ static int32_t adjustOrderOfTags(STranslateContext* pCxt, SNodeList* pTags, cons
SArray* pTagPos = taosArrayInit(LIST_LENGTH(pTags), sizeof(SProjColPos)); SArray* pTagPos = taosArrayInit(LIST_LENGTH(pTags), sizeof(SProjColPos));
if (NULL == pTagPos) { if (NULL == pTagPos) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -11125,7 +11125,7 @@ static int32_t buildCreateStreamReq(STranslateContext* pCxt, SCreateStreamStmt*
if (TSDB_CODE_SUCCESS == code) { if (TSDB_CODE_SUCCESS == code) {
pReq->sql = taosStrdup(pCxt->pParseCxt->pSql); pReq->sql = taosStrdup(pCxt->pParseCxt->pSql);
if (NULL == pReq->sql) { if (NULL == pReq->sql) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} }
@ -11167,7 +11167,7 @@ static int32_t translateCreateStream(STranslateContext* pCxt, SCreateStreamStmt*
} else { } else {
pStmt->pReq = taosMemoryMalloc(sizeof(createReq)); pStmt->pReq = taosMemoryMalloc(sizeof(createReq));
if (NULL == pStmt->pReq) { if (NULL == pStmt->pReq) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} else { } else {
memcpy(pStmt->pReq, &createReq, sizeof(createReq)); memcpy(pStmt->pReq, &createReq, sizeof(createReq));
memset(&createReq, 0, sizeof(createReq)); memset(&createReq, 0, sizeof(createReq));
@ -11206,7 +11206,7 @@ static int32_t buildIntervalForCreateStream(SCreateStreamStmt* pStmt, SInterval*
static int32_t createStreamReqVersionInfo(SSDataBlock* pBlock, SArray** pArray, int64_t* lastTs, SInterval* pInterval) { static int32_t createStreamReqVersionInfo(SSDataBlock* pBlock, SArray** pArray, int64_t* lastTs, SInterval* pInterval) {
*pArray = taosArrayInit(pBlock->info.rows, sizeof(SVgroupVer)); *pArray = taosArrayInit(pBlock->info.rows, sizeof(SVgroupVer));
if (*pArray == NULL) { if (*pArray == NULL) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (pBlock->info.rows > 0) { if (pBlock->info.rows > 0) {
@ -11771,7 +11771,7 @@ static int32_t buildTSMAAstStreamSubTable(SCreateTSMAStmt* pStmt, SMCreateSmaReq
sprintf(pConcatFunc->functionName, "%s", "concat"); sprintf(pConcatFunc->functionName, "%s", "concat");
pVal->literal = taosMemoryMalloc(TSDB_TABLE_FNAME_LEN + 1); pVal->literal = taosMemoryMalloc(TSDB_TABLE_FNAME_LEN + 1);
if (!pVal->literal) { if (!pVal->literal) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _end; goto _end;
} }
sprintf(pVal->literal, "%s_", pReq->name); sprintf(pVal->literal, "%s_", pReq->name);
@ -13287,7 +13287,7 @@ static int32_t buildNormalTableBatchReq(int32_t acctId, const SCreateTableStmt*
req.comment = taosStrdup(pStmt->pOptions->comment); req.comment = taosStrdup(pStmt->pOptions->comment);
if (NULL == req.comment) { if (NULL == req.comment) {
tdDestroySVCreateTbReq(&req); tdDestroySVCreateTbReq(&req);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
req.commentLen = strlen(pStmt->pOptions->comment); req.commentLen = strlen(pStmt->pOptions->comment);
} else { } else {
@ -13332,11 +13332,11 @@ static int32_t buildNormalTableBatchReq(int32_t acctId, const SCreateTableStmt*
pBatch->req.pArray = taosArrayInit(1, sizeof(struct SVCreateTbReq)); pBatch->req.pArray = taosArrayInit(1, sizeof(struct SVCreateTbReq));
if (NULL == pBatch->req.pArray) { if (NULL == pBatch->req.pArray) {
tdDestroySVCreateTbReq(&req); tdDestroySVCreateTbReq(&req);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (NULL == taosArrayPush(pBatch->req.pArray, &req)) { if (NULL == taosArrayPush(pBatch->req.pArray, &req)) {
tdDestroySVCreateTbReq(&req); tdDestroySVCreateTbReq(&req);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
@ -13358,7 +13358,7 @@ static int32_t serializeVgroupCreateTableBatch(SVgroupCreateTableBatch* pTbBatch
tlen += sizeof(SMsgHead); tlen += sizeof(SMsgHead);
void* buf = taosMemoryMalloc(tlen); void* buf = taosMemoryMalloc(tlen);
if (NULL == buf) { if (NULL == buf) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
((SMsgHead*)buf)->vgId = htonl(pTbBatch->info.vgId); ((SMsgHead*)buf)->vgId = htonl(pTbBatch->info.vgId);
((SMsgHead*)buf)->contLen = htonl(tlen); ((SMsgHead*)buf)->contLen = htonl(tlen);
@ -13382,7 +13382,7 @@ static int32_t serializeVgroupCreateTableBatch(SVgroupCreateTableBatch* pTbBatch
pVgData->size = tlen; pVgData->size = tlen;
pVgData->numOfTables = (int32_t)taosArrayGetSize(pTbBatch->req.pArray); pVgData->numOfTables = (int32_t)taosArrayGetSize(pTbBatch->req.pArray);
if (NULL == taosArrayPush(pBufArray, &pVgData)) { if (NULL == taosArrayPush(pBufArray, &pVgData)) {
ret = TSDB_CODE_OUT_OF_MEMORY; ret = terrno;
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
taosMemoryFreeClear(pVgData); taosMemoryFreeClear(pVgData);
} }
@ -13428,7 +13428,7 @@ static int32_t buildCreateTableDataBlock(int32_t acctId, const SCreateTableStmt*
SArray** pBufArray) { SArray** pBufArray) {
*pBufArray = taosArrayInit(1, POINTER_BYTES); *pBufArray = taosArrayInit(1, POINTER_BYTES);
if (NULL == *pBufArray) { if (NULL == *pBufArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
SVgroupCreateTableBatch tbatch = {0}; SVgroupCreateTableBatch tbatch = {0};
@ -13511,7 +13511,7 @@ static int32_t addCreateTbReqIntoVgroup(SHashObj* pVgroupHashmap, const char* db
code = terrno; code = terrno;
} else if (NULL == taosArrayPush(tBatch.req.pArray, &req)) { } else if (NULL == taosArrayPush(tBatch.req.pArray, &req)) {
taosArrayDestroy(tBatch.req.pArray); taosArrayDestroy(tBatch.req.pArray);
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} else { } else {
code = taosHashPut(pVgroupHashmap, &pVgInfo->vgId, sizeof(pVgInfo->vgId), &tBatch, sizeof(tBatch)); code = taosHashPut(pVgroupHashmap, &pVgInfo->vgId, sizeof(pVgInfo->vgId), &tBatch, sizeof(tBatch));
if (TSDB_CODE_SUCCESS != code) { if (TSDB_CODE_SUCCESS != code) {
@ -13520,7 +13520,7 @@ static int32_t addCreateTbReqIntoVgroup(SHashObj* pVgroupHashmap, const char* db
} }
} else { // add to the correct vgroup } else { // add to the correct vgroup
if (NULL == taosArrayPush(pTableBatch->req.pArray, &req)) { if (NULL == taosArrayPush(pTableBatch->req.pArray, &req)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} }
@ -13557,7 +13557,7 @@ static int32_t buildKVRowForBindTags(STranslateContext* pCxt, SCreateSubTableCla
SArray* pTagArray = taosArrayInit(LIST_LENGTH(pStmt->pValsOfTags), sizeof(STagVal)); SArray* pTagArray = taosArrayInit(LIST_LENGTH(pStmt->pValsOfTags), sizeof(STagVal));
if (NULL == pTagArray) { if (NULL == pTagArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -13624,7 +13624,7 @@ static int32_t buildKVRowForAllTags(STranslateContext* pCxt, SCreateSubTableClau
SArray* pTagArray = taosArrayInit(LIST_LENGTH(pStmt->pValsOfTags), sizeof(STagVal)); SArray* pTagArray = taosArrayInit(LIST_LENGTH(pStmt->pValsOfTags), sizeof(STagVal));
if (NULL == pTagArray) { if (NULL == pTagArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
@ -13740,7 +13740,7 @@ static int32_t buildTagIndexForBindTags(SMsgBuf* pMsgBuf, SCreateSubTableFromFil
SHashObj* pIdxHash = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK); SHashObj* pIdxHash = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
if (NULL == pIdxHash) { if (NULL == pIdxHash) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
bool tbnameFound = false; bool tbnameFound = false;
@ -13796,7 +13796,7 @@ static int32_t buildTagIndexForBindTags(SMsgBuf* pMsgBuf, SCreateSubTableFromFil
} }
if (NULL == taosArrayPush(aTagIndexs, &idx)) { if (NULL == taosArrayPush(aTagIndexs, &idx)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _OUT; goto _OUT;
} }
} }
@ -13957,7 +13957,7 @@ static int32_t parseCsvFile(SMsgBuf* pMsgBuf, SParseContext* pParseCxt, SParseFi
if (NULL == taosArrayPush(pParFileCxt->aCreateTbData, &data)) { if (NULL == taosArrayPush(pParFileCxt->aCreateTbData, &data)) {
taosMemoryFreeClear(pParFileCxt->pTag); taosMemoryFreeClear(pParFileCxt->pTag);
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} else { } else {
taosMemoryFreeClear(pParFileCxt->pTag); taosMemoryFreeClear(pParFileCxt->pTag);
@ -14011,7 +14011,7 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S
if (NULL == pParFileCxt->aTagNames) { if (NULL == pParFileCxt->aTagNames) {
pParFileCxt->aTagNames = taosArrayInit(8, TSDB_COL_NAME_LEN); pParFileCxt->aTagNames = taosArrayInit(8, TSDB_COL_NAME_LEN);
if (NULL == pParFileCxt->aTagNames) { if (NULL == pParFileCxt->aTagNames) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _ERR; goto _ERR;
} }
} }
@ -14019,7 +14019,7 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S
if (NULL == pParFileCxt->aCreateTbData) { if (NULL == pParFileCxt->aCreateTbData) {
pParFileCxt->aCreateTbData = taosArrayInit(16, sizeof(SCreateTableData)); pParFileCxt->aCreateTbData = taosArrayInit(16, sizeof(SCreateTableData));
if (NULL == pParFileCxt->aCreateTbData) { if (NULL == pParFileCxt->aCreateTbData) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _ERR; goto _ERR;
} }
} }
@ -14027,7 +14027,7 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S
if (NULL == pParFileCxt->aTagIndexs) { if (NULL == pParFileCxt->aTagIndexs) {
pParFileCxt->aTagIndexs = taosArrayInit(pStmt->pSpecificTags->length, sizeof(int16_t)); pParFileCxt->aTagIndexs = taosArrayInit(pStmt->pSpecificTags->length, sizeof(int16_t));
if (!pParFileCxt->aTagIndexs) { if (!pParFileCxt->aTagIndexs) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _ERR; goto _ERR;
} }
} }
@ -14035,7 +14035,7 @@ static int32_t constructParseFileContext(SCreateSubTableFromFileClause* pStmt, S
if (NULL == pParFileCxt->aTagVals) { if (NULL == pParFileCxt->aTagVals) {
pParFileCxt->aTagVals = taosArrayInit(8, sizeof(STagVal)); pParFileCxt->aTagVals = taosArrayInit(8, sizeof(STagVal));
if (!pParFileCxt->aTagVals) { if (!pParFileCxt->aTagVals) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
goto _ERR; goto _ERR;
} }
} }
@ -14188,7 +14188,7 @@ static int32_t rewriteCreateMultiTable(STranslateContext* pCxt, SQuery* pQuery)
SHashObj* pVgroupHashmap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK); SHashObj* pVgroupHashmap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
if (NULL == pVgroupHashmap) { if (NULL == pVgroupHashmap) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
taosHashSetFreeFp(pVgroupHashmap, destroyCreateTbReqBatch); taosHashSetFreeFp(pVgroupHashmap, destroyCreateTbReqBatch);
@ -14224,7 +14224,7 @@ static int32_t rewriteCreateTableFromFile(STranslateContext* pCxt, SQuery* pQuer
pModifyStmt->destroyParseFileCxt = destructParseFileContext; pModifyStmt->destroyParseFileCxt = destructParseFileContext;
pModifyStmt->pVgroupsHashObj = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_NO_LOCK); pModifyStmt->pVgroupsHashObj = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_NO_LOCK);
if (NULL == pModifyStmt->pVgroupsHashObj) { if (NULL == pModifyStmt->pVgroupsHashObj) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
taosHashSetFreeFp(pModifyStmt->pVgroupsHashObj, destroyCreateTbReqBatch); taosHashSetFreeFp(pModifyStmt->pVgroupsHashObj, destroyCreateTbReqBatch);
@ -14303,7 +14303,7 @@ static int32_t addDropTbReqIntoVgroup(SHashObj* pVgroupHashmap, SVgroupInfo* pVg
if (NULL == taosArrayPush(tBatch.req.pArray, pReq)) { if (NULL == taosArrayPush(tBatch.req.pArray, pReq)) {
taosArrayDestroy(tBatch.req.pArray); taosArrayDestroy(tBatch.req.pArray);
tBatch.req.pArray = NULL; tBatch.req.pArray = NULL;
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
code = taosHashPut(pVgroupHashmap, &pVgInfo->vgId, sizeof(pVgInfo->vgId), &tBatch, sizeof(tBatch)); code = taosHashPut(pVgroupHashmap, &pVgInfo->vgId, sizeof(pVgInfo->vgId), &tBatch, sizeof(tBatch));
@ -14314,7 +14314,7 @@ static int32_t addDropTbReqIntoVgroup(SHashObj* pVgroupHashmap, SVgroupInfo* pVg
} }
} else { // add to the correct vgroup } else { // add to the correct vgroup
if (NULL == taosArrayPush(pTableBatch->req.pArray, pReq)) { if (NULL == taosArrayPush(pTableBatch->req.pArray, pReq)) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
} }
return code; return code;
@ -14368,7 +14368,7 @@ static int32_t serializeVgroupDropTableBatch(SVgroupDropTableBatch* pTbBatch, SA
tlen += sizeof(SMsgHead); tlen += sizeof(SMsgHead);
void* buf = taosMemoryMalloc(tlen); void* buf = taosMemoryMalloc(tlen);
if (NULL == buf) { if (NULL == buf) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
((SMsgHead*)buf)->vgId = htonl(pTbBatch->info.vgId); ((SMsgHead*)buf)->vgId = htonl(pTbBatch->info.vgId);
((SMsgHead*)buf)->contLen = htonl(tlen); ((SMsgHead*)buf)->contLen = htonl(tlen);
@ -14392,7 +14392,7 @@ static int32_t serializeVgroupDropTableBatch(SVgroupDropTableBatch* pTbBatch, SA
pVgData->size = tlen; pVgData->size = tlen;
pVgData->numOfTables = (int32_t)taosArrayGetSize(pTbBatch->req.pArray); pVgData->numOfTables = (int32_t)taosArrayGetSize(pTbBatch->req.pArray);
if (NULL == taosArrayPush(pBufArray, &pVgData)) { if (NULL == taosArrayPush(pBufArray, &pVgData)) {
ret = TSDB_CODE_OUT_OF_MEMORY; ret = terrno;
taosMemoryFreeClear(pVgData); taosMemoryFreeClear(pVgData);
taosMemoryFreeClear(buf); taosMemoryFreeClear(buf);
} }
@ -14434,7 +14434,7 @@ static int32_t rewriteDropTable(STranslateContext* pCxt, SQuery* pQuery) {
SHashObj* pVgroupHashmap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK); SHashObj* pVgroupHashmap = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK);
if (NULL == pVgroupHashmap) { if (NULL == pVgroupHashmap) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
taosHashSetFreeFp(pVgroupHashmap, destroyDropTbReqBatch); taosHashSetFreeFp(pVgroupHashmap, destroyDropTbReqBatch);
@ -14488,7 +14488,7 @@ static int32_t rewriteDropTable(STranslateContext* pCxt, SQuery* pQuery) {
reqOnVg.pTbs = pTbBatch->req.pArray; reqOnVg.pTbs = pTbBatch->req.pArray;
if (NULL == taosArrayPush(req.pVgReqs, &reqOnVg)) { if (NULL == taosArrayPush(req.pVgReqs, &reqOnVg)) {
taosHashCancelIterate(pVgroupHashmap, pTbBatch); taosHashCancelIterate(pVgroupHashmap, pTbBatch);
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
break; break;
} }
} while (true); } while (true);
@ -14530,11 +14530,11 @@ static int32_t buildUpdateTagValReq(STranslateContext* pCxt, SAlterTableStmt* pS
} }
pReq->tagName = taosStrdup(pStmt->colName); pReq->tagName = taosStrdup(pStmt->colName);
if (NULL == pReq->tagName) { if (NULL == pReq->tagName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->pTagArray = taosArrayInit(1, sizeof(STagVal)); pReq->pTagArray = taosArrayInit(1, sizeof(STagVal));
if (NULL == pReq->pTagArray) { if (NULL == pReq->pTagArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->colId = pSchema->colId; pReq->colId = pSchema->colId;
pReq->tagType = pSchema->type; pReq->tagType = pSchema->type;
@ -14617,7 +14617,7 @@ static int32_t buildAddColReq(STranslateContext* pCxt, SAlterTableStmt* pStmt, S
pReq->colName = taosStrdup(pStmt->colName); pReq->colName = taosStrdup(pStmt->colName);
if (NULL == pReq->colName) { if (NULL == pReq->colName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->type = pStmt->dataType.type; pReq->type = pStmt->dataType.type;
@ -14651,7 +14651,7 @@ static int32_t buildDropColReq(STranslateContext* pCxt, SAlterTableStmt* pStmt,
pReq->colName = taosStrdup(pStmt->colName); pReq->colName = taosStrdup(pStmt->colName);
if (NULL == pReq->colName) { if (NULL == pReq->colName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->colId = pSchema->colId; pReq->colId = pSchema->colId;
@ -14682,7 +14682,7 @@ static int32_t buildUpdateColReq(STranslateContext* pCxt, SAlterTableStmt* pStmt
pReq->colName = taosStrdup(pStmt->colName); pReq->colName = taosStrdup(pStmt->colName);
if (NULL == pReq->colName) { if (NULL == pReq->colName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->colId = pSchema->colId; pReq->colId = pSchema->colId;
@ -14712,7 +14712,7 @@ static int32_t buildRenameColReq(STranslateContext* pCxt, SAlterTableStmt* pStmt
pReq->colName = taosStrdup(pStmt->colName); pReq->colName = taosStrdup(pStmt->colName);
pReq->colNewName = taosStrdup(pStmt->newColName); pReq->colNewName = taosStrdup(pStmt->newColName);
if (NULL == pReq->colName || NULL == pReq->colNewName) { if (NULL == pReq->colName || NULL == pReq->colNewName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -14729,7 +14729,7 @@ static int32_t buildUpdateOptionsReq(STranslateContext* pCxt, SAlterTableStmt* p
if (pStmt->pOptions->commentNull == false) { if (pStmt->pOptions->commentNull == false) {
pReq->newComment = taosStrdup(pStmt->pOptions->comment); pReq->newComment = taosStrdup(pStmt->pOptions->comment);
if (NULL == pReq->newComment) { if (NULL == pReq->newComment) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} else { } else {
pReq->newCommentLen = strlen(pReq->newComment); pReq->newCommentLen = strlen(pReq->newComment);
} }
@ -14751,7 +14751,7 @@ static int buildAlterTableColumnCompress(STranslateContext* pCxt, SAlterTableStm
pReq->colName = taosStrdup(pStmt->colName); pReq->colName = taosStrdup(pStmt->colName);
pReq->colId = pSchema->colId; pReq->colId = pSchema->colId;
if (NULL == pReq->colName) { if (NULL == pReq->colName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
if (!checkColumnEncode(pStmt->pColOptions->encode)) return TSDB_CODE_TSC_ENCODE_PARAM_ERROR; if (!checkColumnEncode(pStmt->pColOptions->encode)) return TSDB_CODE_TSC_ENCODE_PARAM_ERROR;
@ -14767,7 +14767,7 @@ static int32_t buildAlterTbReq(STranslateContext* pCxt, SAlterTableStmt* pStmt,
SVAlterTbReq* pReq) { SVAlterTbReq* pReq) {
pReq->tbName = taosStrdup(pStmt->tableName); pReq->tbName = taosStrdup(pStmt->tableName);
if (NULL == pReq->tbName) { if (NULL == pReq->tbName) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pReq->action = pStmt->alterType; pReq->action = pStmt->alterType;
@ -14819,7 +14819,7 @@ static int32_t serializeAlterTbReq(STranslateContext* pCxt, SAlterTableStmt* pSt
tlen += sizeof(SMsgHead); tlen += sizeof(SMsgHead);
void* pMsg = taosMemoryMalloc(tlen); void* pMsg = taosMemoryMalloc(tlen);
if (NULL == pMsg) { if (NULL == pMsg) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
((SMsgHead*)pMsg)->vgId = htonl(vg.vgId); ((SMsgHead*)pMsg)->vgId = htonl(vg.vgId);
((SMsgHead*)pMsg)->contLen = htonl(tlen); ((SMsgHead*)pMsg)->contLen = htonl(tlen);
@ -14842,7 +14842,7 @@ static int32_t serializeAlterTbReq(STranslateContext* pCxt, SAlterTableStmt* pSt
pVgData->size = tlen; pVgData->size = tlen;
pVgData->numOfTables = 1; pVgData->numOfTables = 1;
if (NULL == taosArrayPush(pArray, &pVgData)) { if (NULL == taosArrayPush(pArray, &pVgData)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
} }
@ -14853,7 +14853,7 @@ static int32_t buildModifyVnodeArray(STranslateContext* pCxt, SAlterTableStmt* p
SArray** pArray) { SArray** pArray) {
SArray* pTmpArray = taosArrayInit(1, sizeof(void*)); SArray* pTmpArray = taosArrayInit(1, sizeof(void*));
if (NULL == pTmpArray) { if (NULL == pTmpArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
int32_t code = serializeAlterTbReq(pCxt, pStmt, pReq, pTmpArray); int32_t code = serializeAlterTbReq(pCxt, pStmt, pReq, pTmpArray);
@ -14932,7 +14932,7 @@ static int32_t serializeFlushVgroup(SVgroupInfo* pVg, SArray* pBufArray) {
void* buf = taosMemoryMalloc(len); void* buf = taosMemoryMalloc(len);
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
if (NULL == buf) { if (NULL == buf) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
((SMsgHead*)buf)->vgId = htonl(pVg->vgId); ((SMsgHead*)buf)->vgId = htonl(pVg->vgId);
((SMsgHead*)buf)->contLen = htonl(len); ((SMsgHead*)buf)->contLen = htonl(len);
@ -14946,7 +14946,7 @@ static int32_t serializeFlushVgroup(SVgroupInfo* pVg, SArray* pBufArray) {
pVgData->pData = buf; pVgData->pData = buf;
pVgData->size = len; pVgData->size = len;
if (NULL == taosArrayPush(pBufArray, &pVgData)) { if (NULL == taosArrayPush(pBufArray, &pVgData)) {
code = TSDB_CODE_OUT_OF_MEMORY; code = terrno;
} }
return code; return code;
@ -14957,7 +14957,7 @@ static int32_t serializeFlushDb(SArray* pVgs, SArray** pOutput) {
SArray* pBufArray = taosArrayInit(numOfVgs, sizeof(void*)); SArray* pBufArray = taosArrayInit(numOfVgs, sizeof(void*));
if (NULL == pBufArray) { if (NULL == pBufArray) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
for (int32_t i = 0; i < numOfVgs; ++i) { for (int32_t i = 0; i < numOfVgs; ++i) {
@ -15623,13 +15623,13 @@ static int32_t setRefreshMeta(STranslateContext* pCxt, SQuery* pQuery) {
taosArrayDestroy(pQuery->pDbList); taosArrayDestroy(pQuery->pDbList);
pQuery->pDbList = taosArrayInit(taosHashGetSize(pCxt->pDbs), TSDB_DB_FNAME_LEN); pQuery->pDbList = taosArrayInit(taosHashGetSize(pCxt->pDbs), TSDB_DB_FNAME_LEN);
if (NULL == pQuery->pDbList) { if (NULL == pQuery->pDbList) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
SFullDatabaseName* pDb = taosHashIterate(pCxt->pDbs, NULL); SFullDatabaseName* pDb = taosHashIterate(pCxt->pDbs, NULL);
while (NULL != pDb) { while (NULL != pDb) {
if (NULL == taosArrayPush(pQuery->pDbList, pDb->fullDbName)) { if (NULL == taosArrayPush(pQuery->pDbList, pDb->fullDbName)) {
taosHashCancelIterate(pCxt->pDbs, pDb); taosHashCancelIterate(pCxt->pDbs, pDb);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pDb = taosHashIterate(pCxt->pDbs, pDb); pDb = taosHashIterate(pCxt->pDbs, pDb);
} }
@ -15639,13 +15639,13 @@ static int32_t setRefreshMeta(STranslateContext* pCxt, SQuery* pQuery) {
taosArrayDestroy(pQuery->pTableList); taosArrayDestroy(pQuery->pTableList);
pQuery->pTableList = taosArrayInit(taosHashGetSize(pCxt->pTables), sizeof(SName)); pQuery->pTableList = taosArrayInit(taosHashGetSize(pCxt->pTables), sizeof(SName));
if (NULL == pQuery->pTableList) { if (NULL == pQuery->pTableList) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
SName* pTable = taosHashIterate(pCxt->pTables, NULL); SName* pTable = taosHashIterate(pCxt->pTables, NULL);
while (NULL != pTable) { while (NULL != pTable) {
if (NULL == taosArrayPush(pQuery->pTableList, pTable)) { if (NULL == taosArrayPush(pQuery->pTableList, pTable)) {
taosHashCancelIterate(pCxt->pTables, pTable); taosHashCancelIterate(pCxt->pTables, pTable);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pTable = taosHashIterate(pCxt->pTables, pTable); pTable = taosHashIterate(pCxt->pTables, pTable);
} }
@ -15655,13 +15655,13 @@ static int32_t setRefreshMeta(STranslateContext* pCxt, SQuery* pQuery) {
taosArrayDestroy(pQuery->pTargetTableList); taosArrayDestroy(pQuery->pTargetTableList);
pQuery->pTargetTableList = taosArrayInit(taosHashGetSize(pCxt->pTargetTables), sizeof(SName)); pQuery->pTargetTableList = taosArrayInit(taosHashGetSize(pCxt->pTargetTables), sizeof(SName));
if (NULL == pQuery->pTargetTableList) { if (NULL == pQuery->pTargetTableList) {
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
SName* pTable = taosHashIterate(pCxt->pTargetTables, NULL); SName* pTable = taosHashIterate(pCxt->pTargetTables, NULL);
while (NULL != pTable) { while (NULL != pTable) {
if (NULL == taosArrayPush(pQuery->pTargetTableList, pTable)) { if (NULL == taosArrayPush(pQuery->pTargetTableList, pTable)) {
taosHashCancelIterate(pCxt->pTargetTables, pTable); taosHashCancelIterate(pCxt->pTargetTables, pTable);
return TSDB_CODE_OUT_OF_MEMORY; return terrno;
} }
pTable = taosHashIterate(pCxt->pTargetTables, pTable); pTable = taosHashIterate(pCxt->pTargetTables, pTable);
} }