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

fix: fix address sanitizer error

This commit is contained in:
slzhou 2023-09-20 11:50:32 +08:00
parent ef1e91a6be
commit 1f1657a160
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/parser/inc/sql.y
View File

@ -509,8 +509,8 @@ cmd ::= SHOW CLUSTER ALIVE.
%type table_kind_db_name_cond_opt { SShowTablesOption } %type table_kind_db_name_cond_opt { SShowTablesOption }
%destructor table_kind_db_name_cond_opt { } %destructor table_kind_db_name_cond_opt { }
table_kind_db_name_cond_opt(A) ::= . { A.kind = SHOW_KIND_ALL; A.pDbName = createDefaultDatabaseCondValue(pCxt); } table_kind_db_name_cond_opt(A) ::= . { A.kind = SHOW_KIND_ALL; A.pDbName = NULL; }
table_kind_db_name_cond_opt(A) ::= table_kind(B). { A.kind = B; A.pDbName = createDefaultDatabaseCondValue(pCxt); } table_kind_db_name_cond_opt(A) ::= table_kind(B). { A.kind = B; A.pDbName = NULL; }
table_kind_db_name_cond_opt(A) ::= db_name_cond(C). { A.kind = SHOW_KIND_ALL; A.pDbName = C; } table_kind_db_name_cond_opt(A) ::= db_name_cond(C). { A.kind = SHOW_KIND_ALL; A.pDbName = C; }
table_kind_db_name_cond_opt(A) ::= table_kind(B) db_name_cond(C). { A.kind = B; A.pDbName = C; } table_kind_db_name_cond_opt(A) ::= table_kind(B) db_name_cond(C). { A.kind = B; A.pDbName = C; }

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

@ -1564,6 +1564,9 @@ SNode* setShowKind(SAstCreateContext* pCxt, SNode* pStmt, EShowKind showKind) {
SNode* createShowStmtWithCond(SAstCreateContext* pCxt, ENodeType type, SNode* pDbName, SNode* pTbName, SNode* createShowStmtWithCond(SAstCreateContext* pCxt, ENodeType type, SNode* pDbName, SNode* pTbName,
EOperatorType tableCondType) { EOperatorType tableCondType) {
CHECK_PARSER_STATUS(pCxt); CHECK_PARSER_STATUS(pCxt);
if (NULL == pDbName) {
pDbName = createDefaultDatabaseCondValue(pCxt);
}
if (needDbShowStmt(type) && NULL == pDbName) { if (needDbShowStmt(type) && NULL == pDbName) {
snprintf(pCxt->pQueryCxt->pMsg, pCxt->pQueryCxt->msgLen, "database not specified"); snprintf(pCxt->pQueryCxt->pMsg, pCxt->pQueryCxt->msgLen, "database not specified");
pCxt->errCode = TSDB_CODE_PAR_SYNTAX_ERROR; pCxt->errCode = TSDB_CODE_PAR_SYNTAX_ERROR;

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

@ -6389,12 +6389,12 @@ static YYACTIONTYPE yy_reduce(
break; break;
case 281: /* table_kind_db_name_cond_opt ::= */ case 281: /* table_kind_db_name_cond_opt ::= */
#line 512 "sql.y" #line 512 "sql.y"
{ yymsp[1].minor.yy343.kind = SHOW_KIND_ALL; yymsp[1].minor.yy343.pDbName = createDefaultDatabaseCondValue(pCxt); } { yymsp[1].minor.yy343.kind = SHOW_KIND_ALL; yymsp[1].minor.yy343.pDbName = NULL; }
#line 6393 "sql.c" #line 6393 "sql.c"
break; break;
case 282: /* table_kind_db_name_cond_opt ::= table_kind */ case 282: /* table_kind_db_name_cond_opt ::= table_kind */
#line 513 "sql.y" #line 513 "sql.y"
{ yylhsminor.yy343.kind = yymsp[0].minor.yy579; yylhsminor.yy343.pDbName = createDefaultDatabaseCondValue(pCxt); } { yylhsminor.yy343.kind = yymsp[0].minor.yy579; yylhsminor.yy343.pDbName = NULL; }
#line 6398 "sql.c" #line 6398 "sql.c"
yymsp[0].minor.yy343 = yylhsminor.yy343; yymsp[0].minor.yy343 = yylhsminor.yy343;
break; break;