From 951786669d0be2195b3f1811851a9279c0e90f81 Mon Sep 17 00:00:00 2001 From: slzhou Date: Wed, 20 Sep 2023 08:39:57 +0800 Subject: [PATCH] fix: modify show_kind enum value from none to all --- include/libs/nodes/querynodes.h | 2 +- source/libs/parser/inc/sql.y | 6 +++--- source/libs/parser/src/parTranslater.c | 2 +- source/libs/parser/src/sql.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h index 065c29a5da..972421b1e7 100644 --- a/include/libs/nodes/querynodes.h +++ b/include/libs/nodes/querynodes.h @@ -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, diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 0b4d6bc53a..667b21893e 100755 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -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; } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 68d3772b2a..c702400526 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -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) { diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 9d0828a7bc..ff1d834791 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -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 */