xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: handle mac/win compile warn

This commit is contained in:
Shungang Li 2024-06-25 14:10:34 +08:00
parent 41021285a1
commit 586f8094c2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/libs/parser/src/parTranslater.c
View File

@ -12675,8 +12675,8 @@ static int32_t buildTagIndexForBindTags(SMsgBuf* pMsgBuf, SCreateSubTableFromFil
FOREACH(pTagNode, pStmt->pSpecificTags) { FOREACH(pTagNode, pStmt->pSpecificTags) {
int32_t idx = -1; int32_t idx = -1;
switch (nodeType(pTagNode)) { do {
case QUERY_NODE_COLUMN: { if (QUERY_NODE_COLUMN == nodeType(pTagNode)) {
SColumnNode* pColNode = (SColumnNode*)pTagNode; SColumnNode* pColNode = (SColumnNode*)pTagNode;
for (int32_t index = 0; index < numOfTags; index++) { for (int32_t index = 0; index < numOfTags; index++) {
if (strlen(pSchema[index].name) == strlen(pColNode->colName) && if (strlen(pSchema[index].name) == strlen(pColNode->colName) &&
@ -12695,9 +12695,7 @@ static int32_t buildTagIndexForBindTags(SMsgBuf* pMsgBuf, SCreateSubTableFromFil
code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TAG_NAME_DUPLICATED, pColNode->colName); code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TAG_NAME_DUPLICATED, pColNode->colName);
break; break;
} }
break; } else if (QUERY_NODE_FUNCTION == nodeType(pTagNode)) {
}
case QUERY_NODE_FUNCTION: {
SFunctionNode* funcNode = (SFunctionNode*)pTagNode; SFunctionNode* funcNode = (SFunctionNode*)pTagNode;
if (strlen("tbname") != strlen(funcNode->functionName) || strcmp("tbname", funcNode->functionName) != 0) { if (strlen("tbname") != strlen(funcNode->functionName) || strcmp("tbname", funcNode->functionName) != 0) {
code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_INVALID_TAG_NAME, funcNode->functionName); code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_INVALID_TAG_NAME, funcNode->functionName);
@ -12710,24 +12708,20 @@ static int32_t buildTagIndexForBindTags(SMsgBuf* pMsgBuf, SCreateSubTableFromFil
code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TAG_NAME_DUPLICATED, funcNode->functionName); code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_TAG_NAME_DUPLICATED, funcNode->functionName);
break; break;
} }
break; } else {
}
defalut: {
code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_INVALID_TAG_NAME, "invalid node type"); code = generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_INVALID_TAG_NAME, "invalid node type");
break; break;
} }
} } while (0);
if (code) break; if (code) break;
if (taosHashPut(pIdxHash, &idx, sizeof(idx), NULL, 0) < 0) { if (taosHashPut(pIdxHash, &idx, sizeof(idx), NULL, 0) < 0) {
parserError("buildTagIndexForBindTags error, failed to put idx");
code = terrno; code = terrno;
goto _OUT; goto _OUT;
} }
if (NULL == taosArrayPush(pStmt->aTagIndexs, &idx)) { if (NULL == taosArrayPush(pStmt->aTagIndexs, &idx)) {
parserError("buildTagIndexForBindTags error, failed to push idx");
code = TSDB_CODE_OUT_OF_MEMORY; code = TSDB_CODE_OUT_OF_MEMORY;
goto _OUT; goto _OUT;
} }