You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/10/27 08:03:33 UTC
[shardingsphere] branch master updated: Change DistSQL keyword RESOURCES to STORAGE_UNITS in DB_DISCOVERY (#21791)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2052b7b3dcb Change DistSQL keyword RESOURCES to STORAGE_UNITS in DB_DISCOVERY (#21791)
2052b7b3dcb is described below
commit 2052b7b3dcb8c70c28e240fc1f3e58390c60b95b
Author: ChenJiaHao <37...@users.noreply.github.com>
AuthorDate: Thu Oct 27 16:03:27 2022 +0800
Change DistSQL keyword RESOURCES to STORAGE_UNITS in DB_DISCOVERY (#21791)
* Change DistSQL keyword RESOURCES to STORAGE_UNITS in DB_DISCOVERY
* Revise test cases
* Change variable name storageUnit to storageUnitName
---
.../db-discovery/create-db-discovery-rule.cn.md | 12 ++++-----
.../db-discovery/create-db-discovery-rule.en.md | 12 ++++-----
.../syntax/rdl/rule-definition/db-discovery.cn.md | 30 +++++++++++-----------
.../syntax/rdl/rule-definition/db-discovery.en.md | 18 ++++++-------
.../distsql/usage/db-discovery.cn.md | 4 +--
.../distsql/usage/db-discovery.en.md | 4 +--
.../main/antlr4/imports/db-discovery/Keyword.g4 | 4 +--
.../antlr4/imports/db-discovery/RDLStatement.g4 | 8 +++---
.../DatabaseDiscoveryDistSQLStatementVisitor.java | 8 +++---
.../parser/DatabaseDiscoveryDistSQLTest.java | 4 +--
.../common/constant/DistSQLScriptConstants.java | 2 +-
.../expected/convert-database-discovery.yaml | 2 +-
test/parser/src/main/resources/case/rdl/alter.xml | 8 +++---
test/parser/src/main/resources/case/rdl/create.xml | 16 ++++++------
.../src/main/resources/sql/supported/rdl/alter.xml | 2 +-
.../main/resources/sql/supported/rdl/create.xml | 4 +--
16 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.cn.md b/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.cn.md
index cabca069f89..19c0130c454 100644
--- a/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.cn.md
+++ b/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.cn.md
@@ -14,15 +14,15 @@ CreateDatabaseDiscoveryRule ::=
'CREATE' 'DB_DISCOVERY' 'RULE' ( databaseDiscoveryDefinition | databaseDiscoveryConstruction ) ( ',' ( databaseDiscoveryDefinition | databaseDiscoveryConstruction ) )*
databaseDiscoveryDefinition ::=
- ruleName '(' 'RESOURCES' '(' resourceName ( ',' resourceName )* ')' ',' 'TYPE' '(' 'NAME' '=' typeName ( ',' 'PROPERTIES' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* )? ',' 'HEARTBEAT' '(' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* ')' ')'
+ ruleName '(' 'STORAGE_UNITS' '(' storageUnitName ( ',' storageUnitName )* ')' ',' 'TYPE' '(' 'NAME' '=' typeName ( ',' 'PROPERTIES' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* )? ',' 'HEARTBEAT' '(' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* ')' ')'
databaseDiscoveryConstruction ::=
- ruleName '(' 'RESOURCES' '(' resourceName ( ',' resourceName )* ')' ',' 'TYPE' '=' discoveryTypeName ',' 'HEARTBEAT' '=' discoveryHeartbeatName ')'
+ ruleName '(' 'STORAGE_UNITS' '(' storageUnitName ( ',' storageUnitName )* ')' ',' 'TYPE' '=' discoveryTypeName ',' 'HEARTBEAT' '=' discoveryHeartbeatName ')'
ruleName ::=
identifier
-resourceName ::=
+storageUnitName ::=
identifier
typeName ::=
@@ -43,7 +43,7 @@ discoveryHeartbeatName ::=
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_0 (
- RESOURCES(ds_0, ds_1, ds_2),
+ STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -53,7 +53,7 @@ CREATE DB_DISCOVERY RULE db_discovery_group_0 (
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_1 (
- RESOURCES(ds_0, ds_1, ds_2),
+ STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
@@ -61,7 +61,7 @@ CREATE DB_DISCOVERY RULE db_discovery_group_1 (
### 保留字
-`CREATE`、`DB_DISCOVERY`、`RULE`、`RESOURCES`、`TYPE`、`NAME`、`PROPERTIES`、`HEARTBEAT`
+`CREATE`、`DB_DISCOVERY`、`RULE`、`STORAGE_UNITS`、`TYPE`、`NAME`、`PROPERTIES`、`HEARTBEAT`
### 相关链接
diff --git a/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.en.md b/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.en.md
index 3d735fca887..f0529a237eb 100644
--- a/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.en.md
+++ b/docs/document/content/reference/distsql/syntax/rdl/rule-definition/db-discovery/create-db-discovery-rule.en.md
@@ -14,15 +14,15 @@ CreateDatabaseDiscoveryRule ::=
'CREATE' 'DB_DISCOVERY' 'RULE' ( databaseDiscoveryDefinition | databaseDiscoveryConstruction ) ( ',' ( databaseDiscoveryDefinition | databaseDiscoveryConstruction ) )*
databaseDiscoveryDefinition ::=
- ruleName '(' 'RESOURCES' '(' resourceName ( ',' resourceName )* ')' ',' 'TYPE' '(' 'NAME' '=' typeName ( ',' 'PROPERTIES' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* )? ',' 'HEARTBEAT' '(' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* ')' ')'
+ ruleName '(' 'STORAGE_UNITS' '(' storageUnitName ( ',' storageUnitName )* ')' ',' 'TYPE' '(' 'NAME' '=' typeName ( ',' 'PROPERTIES' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* )? ',' 'HEARTBEAT' '(' 'key' '=' 'value' ( ',' 'key' '=' 'value' )* ')' ')'
databaseDiscoveryConstruction ::=
- ruleName '(' 'RESOURCES' '(' resourceName ( ',' resourceName )* ')' ',' 'TYPE' '=' discoveryTypeName ',' 'HEARTBEAT' '=' discoveryHeartbeatName ')'
+ ruleName '(' 'STORAGE_UNITS' '(' storageUnitName ( ',' storageUnitName )* ')' ',' 'TYPE' '=' discoveryTypeName ',' 'HEARTBEAT' '=' discoveryHeartbeatName ')'
ruleName ::=
identifier
-resourceName ::=
+storageUnitName ::=
identifier
typeName ::=
@@ -44,7 +44,7 @@ discoveryHeartbeatName ::=
```sql
CREATE
DB_DISCOVERY RULE db_discovery_group_0 (
- RESOURCES(ds_0, ds_1, ds_2),
+ STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -55,7 +55,7 @@ DB_DISCOVERY RULE db_discovery_group_0 (
```sql
CREATE
DB_DISCOVERY RULE db_discovery_group_1 (
- RESOURCES(ds_0, ds_1, ds_2),
+ STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
@@ -64,7 +64,7 @@ DB_DISCOVERY RULE db_discovery_group_1 (
### Reserved word
-`CREATE`, `DB_DISCOVERY`, `RULE`, `RESOURCES`, `TYPE`, `NAME`, `PROPERTIES`, `HEARTBEAT`
+`CREATE`, `DB_DISCOVERY`, `RULE`, `STORAGE_UNITS`, `TYPE`, `NAME`, `PROPERTIES`, `HEARTBEAT`
### Related links
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.cn.md
index 5d3d4d51963..ebbe8f1c273 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.cn.md
@@ -28,10 +28,10 @@ ruleDefinition:
(databaseDiscoveryRuleDefinition | databaseDiscoveryRuleConstruction)
databaseDiscoveryRuleDefinition
- ruleName (resources, typeDefinition, heartbeatDefinition)
+ ruleName (storageUnits, typeDefinition, heartbeatDefinition)
databaseDiscoveryRuleConstruction
- ruleName (resources, TYPE = discoveryTypeName, HEARTBEAT = discoveryHeartbeatName)
+ ruleName (storageUnits, TYPE = discoveryTypeName, HEARTBEAT = discoveryHeartbeatName)
databaseDiscoveryTypeDefinition
discoveryTypeName (typeDefinition)
@@ -39,8 +39,8 @@ databaseDiscoveryTypeDefinition
databaseDiscoveryHeartbaetDefinition
discoveryHeartbeatName (PROPERTIES (properties))
-resources:
- RESOURCES(resourceName [, resourceName] ...)
+storageUnits:
+ STORAGE_UNITS(storageUnitName [, storageUnitName] ...)
typeDefinition:
TYPE(NAME=typeName [, PROPERTIES([properties] )] )
@@ -56,13 +56,13 @@ property:
```
### 参数解释
-| 名称 | 数据类型 | 说明 |
-|:-----------------------|:-----------|:--------------------|
-| discoveryTypeName | IDENTIFIER | 数据库发现类型名 |
-| ruleName | IDENTIFIER | 规则名称 |
-| discoveryHeartbeatName | IDENTIFIER | 监听心跳名称 |
-| typeName | STRING | 数据库发现类型，如：MySQL.MGR |
-| resourceName | IDENTIFIER | 资源名称 |
+| 名称 | 数据类型 | 说明 |
+|:-----------------------|:-----------|:-----------------------------|
+| discoveryTypeName | IDENTIFIER | 数据库发现类型名 |
+| ruleName | IDENTIFIER | 规则名称 |
+| discoveryHeartbeatName | IDENTIFIER | 监听心跳名称 |
+| typeName | STRING | 数据库发现类型，如：MySQL.MGR |
+| storageUnitName | IDENTIFIER | 资源名称 |
### 注意事项
@@ -78,13 +78,13 @@ property:
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
ALTER DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='246e9612-aaf1')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -109,7 +109,7 @@ CREATE DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
);
CREATE DB_DISCOVERY RULE db_discovery_group_1 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
@@ -123,7 +123,7 @@ ALTER DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
);
ALTER DB_DISCOVERY RULE db_discovery_group_1 (
-RESOURCES(ds_0, ds_1),
+STORAGE_UNITS(ds_0, ds_1),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.en.md
index 0d5c1c5dbce..1cbea9474dd 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/db-discovery.en.md
@@ -28,10 +28,10 @@ ruleDefinition:
(databaseDiscoveryRuleDefinition | databaseDiscoveryRuleConstruction)
databaseDiscoveryRuleDefinition
- ruleName (resources, typeDefinition, heartbeatDefinition)
+ ruleName (storageUnits, typeDefinition, heartbeatDefinition)
databaseDiscoveryRuleConstruction
- ruleName (resources, TYPE = discoveryTypeName, HEARTBEAT = discoveryHeartbeatName)
+ ruleName (storageUnits, TYPE = discoveryTypeName, HEARTBEAT = discoveryHeartbeatName)
databaseDiscoveryTypeDefinition
discoveryTypeName (typeDefinition)
@@ -39,8 +39,8 @@ databaseDiscoveryTypeDefinition
databaseDiscoveryHeartbaetDefinition
discoveryHeartbeatName (PROPERTIES (properties))
-resources:
- RESOURCES(resourceName [, resourceName] ...)
+storageUnits:
+ STORAGE_UNITS(storageUnitName [, storageUnitName] ...)
typeDefinition:
TYPE(NAME=typeName [, PROPERTIES([properties] )] )
@@ -63,7 +63,7 @@ property:
| ruleName | IDENTIFIER | Rule name |
| discoveryHeartbeatName | IDENTIFIER | Detect heartbeat name |
| typeName | STRING | Database discovery type, such as: MySQL.MGR |
-| resourceName | IDENTIFIER | Resource name |
+| storageUnitName | IDENTIFIER | Storage unit name |
### Notes
@@ -80,13 +80,13 @@ property:
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
ALTER DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='246e9612-aaf1')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -111,7 +111,7 @@ CREATE DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
);
CREATE DB_DISCOVERY RULE db_discovery_group_1 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
@@ -125,7 +125,7 @@ ALTER DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
);
ALTER DB_DISCOVERY RULE db_discovery_group_1 (
-RESOURCES(ds_0, ds_1),
+STORAGE_UNITS(ds_0, ds_1),
TYPE=db_discovery_group_1_mgr,
HEARTBEAT=db_discovery_group_1_heartbeat
);
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.cn.md
index f7d40b8ff3e..c776e7a37c6 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.cn.md
@@ -33,7 +33,7 @@ REGISTER STORAGE UNIT ds_0 (
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1),
+STORAGE_UNITS(ds_0, ds_1),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -43,7 +43,7 @@ HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
```sql
ALTER DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.en.md
index be07e221bf9..fb8ea798e45 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/usage/db-discovery.en.md
@@ -33,7 +33,7 @@ REGISTER STORAGE UNIT ds_0 (
```sql
CREATE DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1),
+STORAGE_UNITS(ds_0, ds_1),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
@@ -43,7 +43,7 @@ HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
```sql
ALTER DB_DISCOVERY RULE db_discovery_group_0 (
-RESOURCES(ds_0, ds_1, ds_2),
+STORAGE_UNITS(ds_0, ds_1, ds_2),
TYPE(NAME='MySQL.MGR',PROPERTIES('group-name'='92504d5b-6dec')),
HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
);
diff --git a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4 b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
index cf018ae6945..0d2279ee477 100644
--- a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
+++ b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/Keyword.g4
@@ -39,8 +39,8 @@ SHOW
: S H O W
;
-RESOURCES
- : R E S O U R C E S
+STORAGE_UNITS
+ : S T O R A G E UL_ U N I T S
;
RULE
diff --git a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4 b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
index dad23be25bd..9228a8e186c 100644
--- a/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
+++ b/features/db-discovery/distsql/parser/src/main/antlr4/imports/db-discovery/RDLStatement.g4
@@ -40,7 +40,7 @@ dropDatabaseDiscoveryHeartbeat
;
databaseDiscoveryRule
- : ruleName LP resources COMMA typeDefinition COMMA discoveryHeartbeat RP
+ : ruleName LP storageUnits COMMA typeDefinition COMMA discoveryHeartbeat RP
;
databaseDiscoveryTypeDefinition
@@ -55,11 +55,11 @@ ruleName
: IDENTIFIER
;
-resources
- : RESOURCES LP resourceName (COMMA resourceName)* RP
+storageUnits
+ : STORAGE_UNITS LP storageUnitName (COMMA storageUnitName)* RP
;
-resourceName
+storageUnitName
: IDENTIFIER
;
diff --git a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
index 6c7e475fd06..791680d3978 100644
--- a/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
+++ b/features/db-discovery/distsql/parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
@@ -42,10 +42,10 @@ import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQL
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.DropDatabaseDiscoveryTypeContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.PropertiesContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.PropertyContext;
-import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ResourcesContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryHeartbeatsContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryRulesContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.ShowDatabaseDiscoveryTypesContext;
+import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.StorageUnitsContext;
import org.apache.shardingsphere.distsql.parser.autogen.DatabaseDiscoveryDistSQLStatementParser.TypeDefinitionContext;
import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
@@ -76,11 +76,11 @@ public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDisc
@Override
public ASTNode visitDatabaseDiscoveryRule(final DatabaseDiscoveryRuleContext ctx) {
return new DatabaseDiscoveryDefinitionSegment(
- getIdentifierValue(ctx.ruleName()), buildResources(ctx.resources()), (AlgorithmSegment) visit(ctx.typeDefinition()), getProperties(ctx.discoveryHeartbeat().properties()));
+ getIdentifierValue(ctx.ruleName()), buildResources(ctx.storageUnits()), (AlgorithmSegment) visit(ctx.typeDefinition()), getProperties(ctx.discoveryHeartbeat().properties()));
}
- private List<String> buildResources(final ResourcesContext ctx) {
- return ctx.resourceName().stream().map(each -> new IdentifierValue(each.getText()).getValue()).collect(Collectors.toList());
+ private List<String> buildResources(final StorageUnitsContext ctx) {
+ return ctx.storageUnitName().stream().map(each -> new IdentifierValue(each.getText()).getValue()).collect(Collectors.toList());
}
@Override
diff --git a/features/db-discovery/distsql/parser/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/DatabaseDiscoveryDistSQLTest.java b/features/db-discovery/distsql/parser/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/DatabaseDiscoveryDistSQLTest.java
index d65e304e120..89abdd33902 100644
--- a/features/db-discovery/distsql/parser/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/DatabaseDiscoveryDistSQLTest.java
+++ b/features/db-discovery/distsql/parser/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/DatabaseDiscoveryDistSQLTest.java
@@ -42,7 +42,7 @@ public class DatabaseDiscoveryDistSQLTest {
@Test
public void assertCreateDatabaseDiscoveryRule() {
String sql = "CREATE DB_DISCOVERY RULE db_discovery_group_0 ("
- + "RESOURCES(ds_0, ds_1), TYPE(NAME='mgr',PROPERTIES('group-name'='92504d5b')),"
+ + "STORAGE_UNITS(ds_0, ds_1), TYPE(NAME='mgr',PROPERTIES('group-name'='92504d5b')),"
+ "HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?')))";
CreateDatabaseDiscoveryRuleStatement distSQLStatement = (CreateDatabaseDiscoveryRuleStatement) getDistSQLStatement(sql);
assertThat(distSQLStatement.getRules().size(), is(1));
@@ -52,7 +52,7 @@ public class DatabaseDiscoveryDistSQLTest {
@Test
public void assertAlterDatabaseDiscoveryRule() {
String sql = "ALTER DB_DISCOVERY RULE db_discovery_group_0 ("
- + "RESOURCES(ds_0, ds_1), TYPE(NAME='mgr',PROPERTIES('group-name'='92504d5b')),"
+ + "STORAGE_UNITS(ds_0, ds_1), TYPE(NAME='mgr',PROPERTIES('group-name'='92504d5b')),"
+ "HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?')))";
AlterDatabaseDiscoveryRuleStatement distSQLStatement = (AlterDatabaseDiscoveryRuleStatement) getDistSQLStatement(sql);
assertThat(distSQLStatement.getRules().size(), is(1));
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
index 6ffc35e37d0..934ea6a3368 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/constant/DistSQLScriptConstants.java
@@ -153,7 +153,7 @@ public final class DistSQLScriptConstants {
public static final String DB_DISCOVERY = " %s ("
+ System.lineSeparator()
- + "RESOURCES(%s),"
+ + "STORAGE_UNITS(%s),"
+ System.lineSeparator()
+ "%s,"
+ System.lineSeparator()
diff --git a/proxy/backend/src/test/resources/expected/convert-database-discovery.yaml b/proxy/backend/src/test/resources/expected/convert-database-discovery.yaml
index 026418d5710..18fc5ab531e 100644
--- a/proxy/backend/src/test/resources/expected/convert-database-discovery.yaml
+++ b/proxy/backend/src/test/resources/expected/convert-database-discovery.yaml
@@ -34,7 +34,7 @@ PASSWORD="12345678",
PROPERTIES("minPoolSize"="1","connectionTimeoutMilliseconds"="3000","maxLifetimeMilliseconds"="1800000","idleTimeoutMilliseconds"="60000","maxPoolSize"="50")
);
CREATE DB_DISCOVERY RULE readwrite_ds (
-RESOURCES(ds_0,ds_1,ds_2),
+STORAGE_UNITS(ds_0,ds_1,ds_2),
TYPE(NAME='MySQL.MGR', PROPERTIES("group-name"="92504d5b-6dec-11e8-91ea-246e9612aaf1")),
HEARTBEAT(PROPERTIES("keep-alive-cron"="0/5 * * * * ?"))
);
diff --git a/test/parser/src/main/resources/case/rdl/alter.xml b/test/parser/src/main/resources/case/rdl/alter.xml
index c6837c3bfb2..cdf7c07281a 100644
--- a/test/parser/src/main/resources/case/rdl/alter.xml
+++ b/test/parser/src/main/resources/case/rdl/alter.xml
@@ -133,8 +133,8 @@
<alter-database-discovery-definition-rule sql-case-id="alter-database-discovery-definition-rule">
<rule rule-name="ha_group_0" type="mgr">
- <data-source>resource0</data-source>
- <data-source>resource1</data-source>
+ <data-source>ds0</data-source>
+ <data-source>ds1</data-source>
<discovery-type algorithm-name="mgr">
<properties>
<property key="groupName" value="92504d5b-6dec" />
@@ -145,8 +145,8 @@
</heartbeat>
</rule>
<rule rule-name="ha_group_1" type="mgr2">
- <data-source>resource2</data-source>
- <data-source>resource3</data-source>
+ <data-source>ds2</data-source>
+ <data-source>ds3</data-source>
<discovery-type algorithm-name="mgr2">
<properties>
<property key="groupName" value="92504d5b-6dec-2" />
diff --git a/test/parser/src/main/resources/case/rdl/create.xml b/test/parser/src/main/resources/case/rdl/create.xml
index ac9096992aa..142fa2e93c2 100644
--- a/test/parser/src/main/resources/case/rdl/create.xml
+++ b/test/parser/src/main/resources/case/rdl/create.xml
@@ -236,8 +236,8 @@
<create-database-discovery-definition-rule sql-case-id="create-database-discovery-definition-rule">
<rule rule-name="ha_group_0" type="mgr">
- <data-source>resource0</data-source>
- <data-source>resource1</data-source>
+ <data-source>ds0</data-source>
+ <data-source>ds1</data-source>
<discovery-type algorithm-name="mgr">
<properties>
<property key="groupName" value="92504d5b-6dec" />
@@ -248,8 +248,8 @@
</heartbeat>
</rule>
<rule rule-name="ha_group_1" type="mgr2">
- <data-source>resource2</data-source>
- <data-source>resource3</data-source>
+ <data-source>ds2</data-source>
+ <data-source>ds3</data-source>
<discovery-type algorithm-name="mgr2">
<properties>
<property key="groupName" value="92504d5b-6dec-2" />
@@ -263,8 +263,8 @@
<create-database-discovery-definition-rule sql-case-id="create-database-discovery-rule-with-quota">
<rule rule-name="ha_group_0" type="mgr">
- <data-source>resource0</data-source>
- <data-source>resource1</data-source>
+ <data-source>ds0</data-source>
+ <data-source>ds1</data-source>
<discovery-type algorithm-name="mgr">
<properties>
<property key="groupName" value="92504d5b-6dec"/>
@@ -275,8 +275,8 @@
</heartbeat>
</rule>
<rule rule-name="ha_group_1" type="mgr2">
- <data-source>resource2</data-source>
- <data-source>resource3</data-source>
+ <data-source>ds2</data-source>
+ <data-source>ds3</data-source>
<discovery-type algorithm-name="mgr2">
<properties>
<property key="groupName" value="92504d5b-6dec-2"/>
diff --git a/test/parser/src/main/resources/sql/supported/rdl/alter.xml b/test/parser/src/main/resources/sql/supported/rdl/alter.xml
index 7124378c49b..888d52a0799 100644
--- a/test/parser/src/main/resources/sql/supported/rdl/alter.xml
+++ b/test/parser/src/main/resources/sql/supported/rdl/alter.xml
@@ -30,7 +30,7 @@
<distsql-case id="alter-sharding-auto-table-rule-with-inline-expression" value="ALTER SHARDING TABLE RULE t_order (STORAGE_UNITS('ms_group_${0..1}'), SHARDING_COLUMN=order_id, TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')),KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))" />
<distsql-case id="alter-sharding-table-reference-rule" value="ALTER SHARDING TABLE REFERENCE RULE (t_order,t_order_item), (t_1,t_2)" />
<distsql-case id="alter-readwrite-splitting-rule" value="ALTER READWRITE_SPLITTING RULE ms_group_0 (AUTO_AWARE_RESOURCE=group_0, TYPE(NAME='random',PROPERTIES('read_weight'='2:1'))), ms_group_1 (WRITE_STORAGE_UNIT=primary_ds, READ_STORAGE_UNITS(replica_ds_0,replica_ds_1),TYPE(NAME='random'))" />
- <distsql-case id="alter-database-discovery-definition-rule" value="ALTER DB_DISCOVERY RULE ha_group_0 (RESOURCES(resource0,resource1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (RESOURCES(resource2,resource3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
+ <distsql-case id="alter-database-discovery-definition-rule" value="ALTER DB_DISCOVERY RULE ha_group_0 (STORAGE_UNITS(ds0,ds1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (STORAGE_UNITS(ds2,ds3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
<distsql-case id="alter-encrypt-rule" value="ALTER ENCRYPT RULE t_encrypt (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
<distsql-case id="alter-encrypt-rule-with-assisted-query-column" value="ALTER ENCRYPT RULE t_encrypt (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=assisted_column, TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')), TYPE(NAME='MD5')), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
<distsql-case id="alter-encrypt-rule-with-query-with-cipher-column" value="ALTER ENCRYPT RULE t_encrypt (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher, TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))), QUERY_WITH_CIPHER_COLUMN=false)" />
diff --git a/test/parser/src/main/resources/sql/supported/rdl/create.xml b/test/parser/src/main/resources/sql/supported/rdl/create.xml
index b2e266c7e55..5318d715feb 100644
--- a/test/parser/src/main/resources/sql/supported/rdl/create.xml
+++ b/test/parser/src/main/resources/sql/supported/rdl/create.xml
@@ -33,7 +33,7 @@
<distsql-case id="create-broadcast-table-rule" value="CREATE BROADCAST TABLE RULE t_1,t_2" />
<distsql-case id="create-static-readwrite-splitting-rule" value="CREATE READWRITE_SPLITTING RULE ms_group_0 (WRITE_STORAGE_UNIT=primary_ds, READ_STORAGE_UNITS(replica_ds_0,replica_ds_1), TYPE(NAME='random')))" />
<distsql-case id="create-dynamic-readwrite-splitting-rule" value="CREATE READWRITE_SPLITTING RULE ms_group_1(AUTO_AWARE_RESOURCE=group_0, TYPE(NAME='random',PROPERTIES('read_weight'='2:1')))" />
- <distsql-case id="create-database-discovery-definition-rule" value="CREATE DB_DISCOVERY RULE ha_group_0 (RESOURCES(resource0,resource1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (RESOURCES(resource2,resource3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
+ <distsql-case id="create-database-discovery-definition-rule" value="CREATE DB_DISCOVERY RULE ha_group_0 (STORAGE_UNITS(ds0,ds1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (STORAGE_UNITS(ds2,ds3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
<distsql-case id="create-encrypt-rule" value="CREATE ENCRYPT RULE t_encrypt (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
<distsql-case id="create-encrypt-rule-with-assisted-query-column" value="CREATE ENCRYPT RULE t_encrypt (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=assisted_column, TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')), TYPE(NAME='MD5')), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
<distsql-case id="create-shadow-rule" value="CREATE SHADOW RULE shadow_rule(SOURCE=demo_ds,SHADOW=demo_ds_shadow,t_order(TYPE(NAME='REGEX_MATCH',PROPERTIES('operation'='insert','column'='user_id','regex'='[1]')),TYPE(NAME='SIMPLE_HINT',PROPERTIES('shadow'='true','foo'='bar'))))" />
@@ -51,7 +51,7 @@
<distsql-case id="create-sharding-auto-table-rule-with-quota" value="CREATE SHARDING TABLE RULE `t_order` (STORAGE_UNITS(ms_group_0,ms_group_1), SHARDING_COLUMN=order_id,TYPE(NAME='hash_mod',PROPERTIES('sharding-count'='4')), KEY_GENERATE_STRATEGY(COLUMN=another_id,TYPE(NAME='snowflake')))" />
<distsql-case id="create-broadcast-table-rule-with-quota" value="CREATE BROADCAST TABLE RULE `t_1`,`t_2` " />
<distsql-case id="create-readwrite-splitting-rule-with-quota" value="CREATE READWRITE_SPLITTING RULE `ms_group_0` (WRITE_STORAGE_UNIT=primary_ds, READ_STORAGE_UNITS(replica_ds_0,replica_ds_1), TYPE(NAME='random')))" />
- <distsql-case id="create-database-discovery-rule-with-quota" value="CREATE DB_DISCOVERY RULE ha_group_0 (RESOURCES(resource0,resource1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (RESOURCES(resource2,resource3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
+ <distsql-case id="create-database-discovery-rule-with-quota" value="CREATE DB_DISCOVERY RULE ha_group_0 (STORAGE_UNITS(ds0,ds1), TYPE(NAME='mgr',PROPERTIES('groupName'='92504d5b-6dec')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/5 * * * * ?'))), ha_group_1 (STORAGE_UNITS(ds2,ds3), TYPE(NAME='mgr2',PROPERTIES('groupName'='92504d5b-6dec-2')),HEARTBEAT(PROPERTIES('keepAliveCron'='0/6 * * * * ?')))" />
<distsql-case id="create-encrypt-rule-with-quota" value="CREATE ENCRYPT RULE `encrypt` (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))), (NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))))" />
<distsql-case id="create-encrypt-rule-with-query-with-cipher-column" value="CREATE ENCRYPT RULE `encrypt` (RESOURCE=ds_1, COLUMNS((NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),QUERY_WITH_CIPHER_COLUMN=false)" />
<distsql-case id="create-shadow-rule-with-quota" value="CREATE SHADOW RULE `shadow_rule`(SOURCE=demo_ds,SHADOW=demo_ds_shadow,t_order(TYPE(NAME='REGEX_MATCH',PROPERTIES('operation'='insert','column'='user_id','regex'='[1]')),TYPE(NAME='SIMPLE_HINT',PROPERTIES('shadow'='true','foo'='bar'))))" />