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

fix: modify show_kind enum value from none to all

This commit is contained in:
slzhou 2023-09-20 08:39:57 +08:00
parent d667c49cc4
commit 951786669d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libs/nodes/querynodes.h
View File

@ -278,7 +278,7 @@ typedef enum ETimeLineMode {
} ETimeLineMode;
typedef enum EShowKind {
SHOW_KIND_NONE = 1,
SHOW_KIND_ALL = 1,
SHOW_KIND_TABLES_NORMAL,
SHOW_KIND_TABLES_CHILD,
SHOW_KIND_DATABASES_USER,

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

@ -509,9 +509,9 @@ cmd ::= SHOW CLUSTER ALIVE.
%type table_kind_db_name_cond_opt { SShowTablesOption }
%destructor table_kind_db_name_cond_opt { }
table_kind_db_name_cond_opt(A) ::= . { A.kind = SHOW_KIND_NONE; A.pDbName = createDefaultDatabaseCondValue(pCxt); }
table_kind_db_name_cond_opt(A) ::= . { A.kind = SHOW_KIND_ALL; A.pDbName = createDefaultDatabaseCondValue(pCxt); }
table_kind_db_name_cond_opt(A) ::= table_kind(B). { A.kind = B; A.pDbName = createDefaultDatabaseCondValue(pCxt); }
table_kind_db_name_cond_opt(A) ::= db_name_cond(C). { A.kind = SHOW_KIND_NONE; 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; }
%type table_kind { EShowKind }
@ -546,7 +546,7 @@ tag_item(A) ::= column_name(B) AS column_alias(C).
%type db_kind_opt { EShowKind }
%destructor db_kind_opt { }
db_kind_opt(A) ::= . { A = SHOW_KIND_NONE; }
db_kind_opt(A) ::= . { A = SHOW_KIND_ALL; }
db_kind_opt(A) ::= USER. { A = SHOW_KIND_DATABASES_USER; }
db_kind_opt(A) ::= SYSTEM. { A = SHOW_KIND_DATABASES_SYSTEM; }

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

@ -8079,7 +8079,7 @@ static int32_t addShowChildTablesCond(SSelectStmt* pSelect) {
static int32_t addShowKindCond(const SShowStmt* pShow, SSelectStmt* pSelect) {
if (pShow->type != QUERY_NODE_SHOW_DATABASES_STMT && pShow->type != QUERY_NODE_SHOW_TABLES_STMT ||
pShow->showKind == SHOW_KIND_NONE) {
pShow->showKind == SHOW_KIND_ALL) {
return TSDB_CODE_SUCCESS;
}
if (pShow->type == QUERY_NODE_SHOW_DATABASES_STMT) {

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

@ -6389,7 +6389,7 @@ static YYACTIONTYPE yy_reduce(
break;
case 281: /* table_kind_db_name_cond_opt ::= */
#line 512 "sql.y"
{ yymsp[1].minor.yy343.kind = SHOW_KIND_NONE; yymsp[1].minor.yy343.pDbName = createDefaultDatabaseCondValue(pCxt); }
{ yymsp[1].minor.yy343.kind = SHOW_KIND_ALL; yymsp[1].minor.yy343.pDbName = createDefaultDatabaseCondValue(pCxt); }
#line 6393 "sql.c"
break;
case 282: /* table_kind_db_name_cond_opt ::= table_kind */
@ -6400,7 +6400,7 @@ static YYACTIONTYPE yy_reduce(
break;
case 283: /* table_kind_db_name_cond_opt ::= db_name_cond */
#line 514 "sql.y"
{ yylhsminor.yy343.kind = SHOW_KIND_NONE; yylhsminor.yy343.pDbName = yymsp[0].minor.yy122; }
{ yylhsminor.yy343.kind = SHOW_KIND_ALL; yylhsminor.yy343.pDbName = yymsp[0].minor.yy122; }
#line 6404 "sql.c"
yymsp[0].minor.yy343 = yylhsminor.yy343;
break;
@ -6469,7 +6469,7 @@ static YYACTIONTYPE yy_reduce(
break;
case 303: /* db_kind_opt ::= */
#line 549 "sql.y"
{ yymsp[1].minor.yy579 = SHOW_KIND_NONE; }
{ yymsp[1].minor.yy579 = SHOW_KIND_ALL; }
#line 6473 "sql.c"
break;
case 304: /* db_kind_opt ::= USER */