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

fix: unknow error

This commit is contained in:
slzhou 2023-08-30 16:33:19 +08:00
parent 402a4c3d60
commit 25262c0dea
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/parser/src/parAstCreater.c
View File

@ -1689,14 +1689,14 @@ static int32_t fillIpRangesFromWhiteList(SAstCreateContext* pCxt, SNodeList* pIp
SNode* pNode = NULL; SNode* pNode = NULL;
FOREACH(pNode, pIpRangesNodeList) { FOREACH(pNode, pIpRangesNodeList) {
if (QUERY_NODE_VALUE != nodeType(pNode)) { if (QUERY_NODE_VALUE != nodeType(pNode)) {
pCxt->errCode = TSDB_CODE_PAR_INVALID_IP_RANGE; pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_IP_RANGE);
return TSDB_CODE_PAR_INVALID_IP_RANGE; return TSDB_CODE_PAR_INVALID_IP_RANGE;
} }
SValueNode* pValNode = (SValueNode*)(pNode); SValueNode* pValNode = (SValueNode*)(pNode);
code = getIpV4RangeFromWhitelistItem(pValNode->literal, pIpRanges + i); code = getIpV4RangeFromWhitelistItem(pValNode->literal, pIpRanges + i);
++i; ++i;
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, code, pValNode->literal); pCxt->errCode = generateSyntaxErrMsgExt(&pCxt->msgBuf, code, "Invalid IP range %s", pValNode->literal);
return code; return code;
} }
} }

2
source/libs/parser/src/parUtil.c
View File

@ -182,6 +182,8 @@ static char* getSyntaxErrFormat(int32_t errCode) {
return "No valid function in window query"; return "No valid function in window query";
case TSDB_CODE_PAR_INVALID_OPTR_USAGE: case TSDB_CODE_PAR_INVALID_OPTR_USAGE:
return "Invalid usage of expr: %s"; return "Invalid usage of expr: %s";
case TSDB_CODE_PAR_INVALID_IP_RANGE:
return "invalid ip range";
case TSDB_CODE_OUT_OF_MEMORY: case TSDB_CODE_OUT_OF_MEMORY:
return "Out of memory"; return "Out of memory";
default: default: