From e945586ad9e060251e273ce8946ef3cf461e0c05 Mon Sep 17 00:00:00 2001 From: kailixu Date: Wed, 31 Jan 2024 13:44:00 +0800 Subject: [PATCH] feat: support uniq grant --- include/common/ttokendef.h | 2 +- source/libs/parser/inc/sql.y | 2 +- source/libs/parser/src/parTokenizer.c | 2 +- source/libs/parser/src/sql.c | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h index 52d4cf10a4..5f0538ce17 100644 --- a/include/common/ttokendef.h +++ b/include/common/ttokendef.h @@ -176,7 +176,7 @@ #define TK_LICENCES 157 #define TK_GRANTS 158 #define TK_FULL 159 -#define TK_LOG 160 +#define TK_LOGS 160 #define TK_MACHINES 161 #define TK_QUERIES 162 #define TK_SCORES 163 diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 875fe05b11..4256b34c39 100755 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -488,7 +488,7 @@ cmd ::= SHOW CONNECTIONS. cmd ::= SHOW LICENCES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCES_STMT); } cmd ::= SHOW GRANTS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCES_STMT); } cmd ::= SHOW GRANTS FULL. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_GRANTS_FULL_STMT); } -cmd ::= SHOW GRANTS LOG. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_GRANTS_LOG_STMT); } +cmd ::= SHOW GRANTS LOGS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_GRANTS_LOG_STMT); } cmd ::= SHOW CLUSTER MACHINES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CLUSTER_MACHINES_STMT); } cmd ::= SHOW CREATE DATABASE db_name(A). { pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &A); } cmd ::= SHOW CREATE TABLE full_table_name(A). { pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, A); } diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c index 7f486dfc7b..0777835def 100644 --- a/source/libs/parser/src/parTokenizer.c +++ b/source/libs/parser/src/parTokenizer.c @@ -110,7 +110,7 @@ static SKeyword keywordTable[] = { {"GRANT", TK_GRANT}, {"GRANTS", TK_GRANTS}, {"FULL", TK_FULL}, - {"LOG", TK_LOG}, + {"LOGS", TK_LOGS}, {"MACHINES", TK_MACHINES}, {"GROUP", TK_GROUP}, {"HAVING", TK_HAVING}, diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 0b0dc657b1..340e064b5f 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -1272,7 +1272,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* LICENCES => nothing */ 0, /* GRANTS => nothing */ 0, /* FULL => nothing */ - 0, /* LOG => nothing */ + 0, /* LOGS => nothing */ 0, /* MACHINES => nothing */ 0, /* QUERIES => nothing */ 0, /* SCORES => nothing */ @@ -1709,7 +1709,7 @@ static const char *const yyTokenName[] = { /* 157 */ "LICENCES", /* 158 */ "GRANTS", /* 159 */ "FULL", - /* 160 */ "LOG", + /* 160 */ "LOGS", /* 161 */ "MACHINES", /* 162 */ "QUERIES", /* 163 */ "SCORES", @@ -2330,7 +2330,7 @@ static const char *const yyRuleName[] = { /* 260 */ "cmd ::= SHOW LICENCES", /* 261 */ "cmd ::= SHOW GRANTS", /* 262 */ "cmd ::= SHOW GRANTS FULL", - /* 263 */ "cmd ::= SHOW GRANTS LOG", + /* 263 */ "cmd ::= SHOW GRANTS LOGS", /* 264 */ "cmd ::= SHOW CLUSTER MACHINES", /* 265 */ "cmd ::= SHOW CREATE DATABASE db_name", /* 266 */ "cmd ::= SHOW CREATE TABLE full_table_name", @@ -3618,7 +3618,7 @@ static const YYCODETYPE yyRuleInfoLhs[] = { 350, /* (260) cmd ::= SHOW LICENCES */ 350, /* (261) cmd ::= SHOW GRANTS */ 350, /* (262) cmd ::= SHOW GRANTS FULL */ - 350, /* (263) cmd ::= SHOW GRANTS LOG */ + 350, /* (263) cmd ::= SHOW GRANTS LOGS */ 350, /* (264) cmd ::= SHOW CLUSTER MACHINES */ 350, /* (265) cmd ::= SHOW CREATE DATABASE db_name */ 350, /* (266) cmd ::= SHOW CREATE TABLE full_table_name */ @@ -4270,7 +4270,7 @@ static const signed char yyRuleInfoNRhs[] = { -2, /* (260) cmd ::= SHOW LICENCES */ -2, /* (261) cmd ::= SHOW GRANTS */ -3, /* (262) cmd ::= SHOW GRANTS FULL */ - -3, /* (263) cmd ::= SHOW GRANTS LOG */ + -3, /* (263) cmd ::= SHOW GRANTS LOGS */ -3, /* (264) cmd ::= SHOW CLUSTER MACHINES */ -4, /* (265) cmd ::= SHOW CREATE DATABASE db_name */ -4, /* (266) cmd ::= SHOW CREATE TABLE full_table_name */ @@ -5642,7 +5642,7 @@ static YYACTIONTYPE yy_reduce( case 262: /* cmd ::= SHOW GRANTS FULL */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_GRANTS_FULL_STMT); } break; - case 263: /* cmd ::= SHOW GRANTS LOG */ + case 263: /* cmd ::= SHOW GRANTS LOGS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_GRANTS_LOG_STMT); } break; case 264: /* cmd ::= SHOW CLUSTER MACHINES */