From 4aaaf2098820f47124bef6e32015db2de1373f33 Mon Sep 17 00:00:00 2001 From: wshao08 Date: Mon, 24 Aug 2020 14:36:20 +0800 Subject: [PATCH] Fix 0.10 doc issues --- docs/UserGuide/Operation Manual/SQL Reference.md | 10 +++++----- .../DML Data Manipulation Language.md | 2 +- docs/zh/UserGuide/Operation Manual/SQL Reference.md | 12 ++++++------ .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 6 +++--- .../iotdb/db/qp/strategy/LogicalGenerator.java | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/UserGuide/Operation Manual/SQL Reference.md b/docs/UserGuide/Operation Manual/SQL Reference.md index bd42b56e497e5..0704ecb56146d 100644 --- a/docs/UserGuide/Operation Manual/SQL Reference.md +++ b/docs/UserGuide/Operation Manual/SQL Reference.md @@ -701,7 +701,7 @@ Eg: IoTDB > REVOKE ROLE temprole PRIVILEGES 'DELETE_TIMESERIES' ON root.ln; REVOKE FROM ; roleName:=identifier userName:=identifier -Eg: IoTDB > REVOKE temproleFROM tempuser; +Eg: IoTDB > REVOKE temprole FROM tempuser; ``` * List Users @@ -724,7 +724,7 @@ Eg: IoTDB > LIST ROLE LIST PRIVILEGES USER ON ; username:=identifier path=‘root’ (DOT identifier)* -Eg: IoTDB > LIST PRIVIEGES USER sgcc_wirte_user ON root.sgcc; +Eg: IoTDB > LIST PRIVILEGES USER sgcc_wirte_user ON root.sgcc; ``` * List Privileges of Roles(On Specific Path) @@ -733,7 +733,7 @@ Eg: IoTDB > LIST PRIVIEGES USER sgcc_wirte_user ON root.sgcc; LIST PRIVILEGES ROLE ON ; roleName:=identifier path=‘root’ (DOT identifier)* -Eg: IoTDB > LIST PRIVIEGES ROLE wirte_role ON root.sgcc; +Eg: IoTDB > LIST PRIVILEGES ROLE wirte_role ON root.sgcc; ``` * List Privileges of Users @@ -741,7 +741,7 @@ Eg: IoTDB > LIST PRIVIEGES ROLE wirte_role ON root.sgcc; ``` LIST USER PRIVILEGES ; username:=identifier -Eg: IoTDB > LIST USER PRIVIEGES tempuser; +Eg: IoTDB > LIST USER PRIVILEGES tempuser; ``` * List Privileges of Roles @@ -749,7 +749,7 @@ Eg: IoTDB > LIST USER PRIVIEGES tempuser; ``` LIST ROLE PRIVILEGES roleName:=identifier -Eg: IoTDB > LIST ROLE PRIVIEGES actor; +Eg: IoTDB > LIST ROLE PRIVILEGES actor; ``` * List Roles of Users diff --git a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md index a4929f7a10780..ac7f703e31541 100644 --- a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md +++ b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md @@ -651,7 +651,7 @@ SQL语句将不会执行，并且相应的错误提示如下：
-#### Row and Column Control over Query Results +#### 控制查询结果的行和列 除了对查询结果进行行或列控制之外，IoTDB还允许用户控制查询结果的行和列。 这是同时包含LIMIT子句和SLIMIT子句的完整示例。 diff --git a/docs/zh/UserGuide/Operation Manual/SQL Reference.md b/docs/zh/UserGuide/Operation Manual/SQL Reference.md index e3645945b781a..f4f9485d98a84 100644 --- a/docs/zh/UserGuide/Operation Manual/SQL Reference.md +++ b/docs/zh/UserGuide/Operation Manual/SQL Reference.md @@ -690,7 +690,7 @@ Eg: IoTDB > REVOKE ROLE temprole PRIVILEGES 'DELETE_TIMESERIES' ON root.ln; REVOKE FROM ; roleName:=identifier userName:=identifier -Eg: IoTDB > REVOKE temproleFROM tempuser; +Eg: IoTDB > REVOKE temprole FROM tempuser; ``` * 列出用户 @@ -713,7 +713,7 @@ Eg: IoTDB > LIST ROLE LIST PRIVILEGES USER ON ; username:=identifier path=‘root’ (DOT identifier)* -Eg: IoTDB > LIST PRIVIEGES USER sgcc_wirte_user ON root.sgcc; +Eg: IoTDB > LIST PRIVILEGES USER sgcc_wirte_user ON root.sgcc; ``` * 列出角色权限 @@ -722,7 +722,7 @@ Eg: IoTDB > LIST PRIVIEGES USER sgcc_wirte_user ON root.sgcc; LIST PRIVILEGES ROLE ON ; roleName:=identifier path=‘root’ (DOT identifier)* -Eg: IoTDB > LIST PRIVIEGES ROLE wirte_role ON root.sgcc; +Eg: IoTDB > LIST PRIVILEGES ROLE wirte_role ON root.sgcc; ``` * 列出用户权限 @@ -730,7 +730,7 @@ Eg: IoTDB > LIST PRIVIEGES ROLE wirte_role ON root.sgcc; ``` LIST USER PRIVILEGES ; username:=identifier -Eg: IoTDB > LIST USER PRIVIEGES tempuser; +Eg: IoTDB > LIST USER PRIVILEGES tempuser; ``` * 列出角色权限 @@ -738,7 +738,7 @@ Eg: IoTDB > LIST USER PRIVIEGES tempuser; ``` LIST ROLE PRIVILEGES roleName:=identifier -Eg: IoTDB > LIST ROLE PRIVIEGES actor; +Eg: IoTDB > LIST ROLE PRIVILEGES actor; ``` * 列出用户角色 @@ -763,7 +763,7 @@ Eg: IoTDB > LIST ALL USER OF ROLE roleuser; ALTER USER SET PASSWORD ; roleName:=identifier password:=string -Eg: IoTDB > ALTER USER tempuser SET PASSWORD newpwd; +Eg: IoTDB > ALTER USER tempuser SET PASSWORD 'newpwd'; ``` ## 功能 diff --git a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 index 8b03d95c4f2f1..9fc6508937a5e 100644 --- a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 +++ b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 @@ -56,11 +56,11 @@ statement | REVOKE WATERMARK_EMBEDDING FROM rootOrId (COMMA rootOrId)* #revokeWatermarkEmbedding | LIST USER #listUser | LIST ROLE #listRole - | LIST PRIVILEGES USER username=ID ON prefixPath #listPrivilegesUser + | LIST PRIVILEGES USER username=rootOrId ON prefixPath #listPrivilegesUser | LIST PRIVILEGES ROLE roleName=ID ON prefixPath #listPrivilegesRole - | LIST USER PRIVILEGES username = ID #listUserPrivileges + | LIST USER PRIVILEGES username = rootOrId #listUserPrivileges | LIST ROLE PRIVILEGES roleName = ID #listRolePrivileges - | LIST ALL ROLE OF USER username = ID #listAllRoleOfUser + | LIST ALL ROLE OF USER username = rootOrId #listAllRoleOfUser | LIST ALL USER OF ROLE roleName = ID #listAllUserOfRole | SET TTL TO path=prefixPath time=INT #setTTLStatement | UNSET TTL TO path=prefixPath #unsetTTLStatement diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java index ff0acc2578df4..410200421a053 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java @@ -609,7 +609,7 @@ public void enterListPrivilegesUser(ListPrivilegesUserContext ctx) { super.enterListPrivilegesUser(ctx); AuthorOperator operator = new AuthorOperator(SQLConstant.TOK_LIST, AuthorOperator.AuthorType.LIST_USER_PRIVILEGE); - operator.setUserName(ctx.ID().getText()); + operator.setUserName(ctx.rootOrId().getText()); operator.setNodeNameList(parsePrefixPath(ctx.prefixPath())); initializedOperator = operator; operatorType = SQLConstant.TOK_LIST; @@ -631,7 +631,7 @@ public void enterListUserPrivileges(ListUserPrivilegesContext ctx) { super.enterListUserPrivileges(ctx); AuthorOperator operator = new AuthorOperator(SQLConstant.TOK_LIST, AuthorOperator.AuthorType.LIST_USER_PRIVILEGE); - operator.setUserName(ctx.ID().getText()); + operator.setUserName(ctx.rootOrId().getText()); initializedOperator = operator; operatorType = SQLConstant.TOK_LIST; } @@ -652,7 +652,7 @@ public void enterListAllRoleOfUser(ListAllRoleOfUserContext ctx) { AuthorOperator operator = new AuthorOperator(SQLConstant.TOK_LIST, AuthorOperator.AuthorType.LIST_USER_ROLES); initializedOperator = operator; - operator.setUserName(ctx.ID().getText()); + operator.setUserName(ctx.rootOrId().getText()); operatorType = SQLConstant.TOK_LIST; }