You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/04/23 11:38:05 UTC

[shardingsphere] branch master updated: Rename db-discovery type to add database type as prefix (#17033)

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 0633872871c Rename db-discovery type to add database type as prefix (#17033)
0633872871c is described below

commit 0633872871cf89feeb388eb300138b99fb2603d2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Apr 23 19:37:58 2022 +0800

    Rename db-discovery type to add database type as prefix (#17033)
---
 docs/document/content/dev-manual/ha.cn.md          | 16 ++++----
 docs/document/content/dev-manual/ha.en.md          | 16 ++++----
 .../test/performance-test/sysbench-test.en.md      |  2 +-
 .../shardingsphere-jdbc/java-api/rules/ha.cn.md    | 36 ++++++++---------
 .../shardingsphere-jdbc/java-api/rules/ha.en.md    | 34 ++++++++--------
 .../spring-boot-starter/rules/ha.cn.md             |  2 +-
 .../spring-boot-starter/rules/ha.en.md             |  2 +-
 .../spring-namespace/rules/ha.cn.md                |  2 +-
 .../spring-namespace/rules/ha.en.md                |  2 +-
 .../shardingsphere-jdbc/yaml-config/rules/ha.cn.md |  2 +-
 .../shardingsphere-jdbc/yaml-config/rules/ha.en.md |  2 +-
 .../syntax/rdl/rule-definition/db-discovery.cn.md  | 10 ++---
 .../syntax/rdl/rule-definition/db-discovery.en.md  | 10 ++---
 .../syntax/rql/rule-query/db-discovery.cn.md       | 20 +++++-----
 .../syntax/rql/rule-query/db-discovery.en.md       | 20 +++++-----
 .../distsql/usage/db-discovery.en.md               |  4 +-
 .../template/jdbc/java/config/db-discovery.ftl     |  2 +-
 .../jdbc/resources/properties/db-discovery.ftl     |  2 +-
 .../template/jdbc/resources/xml/db-discovery.ftl   |  5 +--
 ...eDiscoveryRuleConfigurationYamlSwapperTest.java |  2 +-
 .../DatabaseDiscoveryRuleStatementConverter.java   | 10 ++---
 ...atabaseDiscoveryRuleStatementConverterTest.java | 14 +++----
 .../DatabaseDiscoveryRuleQueryResultSetTest.java   |  4 +-
 .../DatabaseDiscoveryTypeQueryResultSetTest.java   |  4 +-
 ...rDatabaseDiscoveryRuleStatementUpdaterTest.java |  8 ++--
 ...eDatabaseDiscoveryRuleStatementUpdaterTest.java | 28 ++++++-------
 ...pDatabaseDiscoveryTypeStatementUpdaterTest.java |  4 +-
 .../mysql/type/mgr/MGRDatabaseDiscoveryType.java   |  4 +-
 ...SQLNormalReplicationDatabaseDiscoveryType.java} | 12 +++---
 ...SQLNormalReplicationHighlyAvailableStatus.java} |  6 +--
 ...ingsphere.dbdiscovery.spi.DatabaseDiscoveryType |  2 +-
 ...ormalReplicationDatabaseDiscoveryTypeTest.java} |  8 ++--
 ...ussNormalReplicationDatabaseDiscoveryType.java} | 12 +++---
 ...ussNormalReplicationHighlyAvailableStatus.java} |  6 +--
 ...ingsphere.dbdiscovery.spi.DatabaseDiscoveryType |  2 +-
 ...ormalReplicationDatabaseDiscoveryTypeTest.java} |  6 +--
 .../application-database-discovery.properties      |  2 +-
 .../DatabaseDiscoverySpringNamespaceTest.java      |  5 ---
 .../database-discovery-application-context.xml     |  4 +-
 .../src/main/resources/case/rdl/create.xml         | 46 +++++++++++-----------
 40 files changed, 186 insertions(+), 192 deletions(-)

diff --git a/docs/document/content/dev-manual/ha.cn.md b/docs/document/content/dev-manual/ha.cn.md
index d606fd7c503..53c0235f475 100644
--- a/docs/document/content/dev-manual/ha.cn.md
+++ b/docs/document/content/dev-manual/ha.cn.md
@@ -7,12 +7,12 @@ chapter = true
 
 ## DatabaseDiscoveryType
 
-| *SPI 名称*                        | *详细说明*                  |
-| -------------------------------- | -------------------------- |
-| DatabaseDiscoveryType            | 数据库发现类型                |
+| *SPI 名称*                                       | *详细说明*                     |
+| ----------------------------------------------- | ----------------------------- |
+| DatabaseDiscoveryType                           | 数据库发现类型                   |
 
-| *已知实现类*                       | *详细说明*                   |
-| -------------------------------- | --------------------------- |
-| MGRDatabaseDiscoveryType         | 基于 MySQL MGR 的数据库发现    |
-| MasterSlaveDatabaseDiscoveryType | 基于 MySQL 主从同步的数据库发现 |
-| OpenGaussDatabaseDiscoveryType   | 基于 openGauss 的数据库发现   |
+| *已知实现类*                                      | *详细说明*                      |
+| ----------------------------------------------- | ------------------------------ |
+| MGRDatabaseDiscoveryType                        | 基于 MySQL MGR 的数据库发现       |
+| MySQLNormalReplicationDatabaseDiscoveryType     | 基于 MySQL 主从同步的数据库发现     |
+| OpenGaussNormalReplicationDatabaseDiscoveryType | 基于 openGauss 主从同步的数据库发现 |
diff --git a/docs/document/content/dev-manual/ha.en.md b/docs/document/content/dev-manual/ha.en.md
index d699f036da9..9b9fae23227 100644
--- a/docs/document/content/dev-manual/ha.en.md
+++ b/docs/document/content/dev-manual/ha.en.md
@@ -7,12 +7,12 @@ chapter = true
 
 ## DatabaseDiscoveryType
 
-| *SPI Name*                       | *Description*                                          |
-| -------------------------------- | ------------------------------------------------------ |
-| DatabaseDiscoveryType            | Database discovery type                                |
+| *SPI Name*                                      | *Description*                                 |
+| ----------------------------------------------- | --------------------------------------------- |
+| DatabaseDiscoveryType                           | Database discovery type                       |
 
-| *Implementation Class*           | *Description*                                          |
-| -------------------------------- | ------------------------------------------------------ |
-| MGRDatabaseDiscoveryType         | Database discovery of MySQL's MGR                      |
-| MasterSlaveDatabaseDiscoveryType | Database discovery of MySQL's master-slave replication |
-| OpenGaussDatabaseDiscoveryType   | Database discovery of openGauss                        |
+| *Implementation Class*                          | *Description*                                 |
+| ----------------------------------------------- | --------------------------------------------- |
+| MGRDatabaseDiscoveryType                        | Database discovery of MySQL's MGR             |
+| MySQLNormalReplicationDatabaseDiscoveryType     | Database discovery of MySQL's replication     |
+| OpenGaussNormalReplicationDatabaseDiscoveryType | Database discovery of openGauss's replication |
diff --git a/docs/document/content/reference/test/performance-test/sysbench-test.en.md b/docs/document/content/reference/test/performance-test/sysbench-test.en.md
index 72a88cf2797..dc0d30dbf36 100644
--- a/docs/document/content/reference/test/performance-test/sysbench-test.en.md
+++ b/docs/document/content/reference/test/performance-test/sysbench-test.en.md
@@ -796,7 +796,7 @@ rules:
         keep-alive-cron: '0/5 * * * * ?'
   discoveryTypes:
     mgr:
-      type: MGR
+      type: MySQL.MGR
       props:
         group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1
 ```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.cn.md
index d005cd16608..3db25e52516 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.cn.md
@@ -9,11 +9,11 @@ weight = 3
 
 可配置属性:
 
-| *名称*                      | *数据类型*                                                   | *说明*            |
-| -------------------------  | ----------------------------------------------------------- | ----------------- |
-| dataSources (+)            | Collection\<DatabaseDiscoveryDataSourceRuleConfiguration\>  | 数据源配置          |
-| discoveryHeartbeats (+)    | Map\<String, DatabaseDiscoveryHeartBeatConfiguration\>      | 监听心跳配置        |
-| discoveryTypes (+)         | Map\<String, ShardingSphereAlgorithmConfiguration\>         | 数据库发现类型配置   |
+| *名称*                      | *数据类型*                                                   | *说明*           |
+| -------------------------  | ----------------------------------------------------------- | --------------- |
+| dataSources (+)            | Collection\<DatabaseDiscoveryDataSourceRuleConfiguration\>  | 数据源配置        |
+| discoveryHeartbeats (+)    | Map\<String, DatabaseDiscoveryHeartBeatConfiguration\>      | 监听心跳配置      |
+| discoveryTypes (+)         | Map\<String, ShardingSphereAlgorithmConfiguration\>         | 数据库发现类型配置 |
 
 ## 数据源配置
 
@@ -21,12 +21,12 @@ weight = 3
 
 可配置属性:
 
-| *名称*                     | *数据类型*             | *说明*                                            | *默认值*       |
-| -------------------------- | -------------------- | ------------------------------------------------- | ------------- |
-| groupName (+)              | String               | 数据库发现组名称                                    | -             |
-| dataSourceNames (+)        | Collection\<String\> | 数据源名称,多个数据源用逗号分隔 如:ds_0, ds_1        | -             |
-| discoveryHeartbeatName (+) | String               | 监听心跳名称                                        | -             |
-| discoveryTypeName (+)      | String               | 数据库发现类型名称                                   | -             |
+| *名称*                     | *数据类型*             | *说明*                                     | *默认值* |
+| -------------------------- | -------------------- | ----------------------------------------- | ------- |
+| groupName (+)              | String               | 数据库发现组名称                             | -       |
+| dataSourceNames (+)        | Collection\<String\> | 数据源名称,多个数据源用逗号分隔 如:ds_0, ds_1 | -        |
+| discoveryHeartbeatName (+) | String               | 监听心跳名称                                | -        |
+| discoveryTypeName (+)      | String               | 数据库发现类型名称                           | -        |
 
 ## 监听心跳配置
 
@@ -34,15 +34,15 @@ weight = 3
 
 可配置属性:
 
-| *名称*                     | *数据类型*             | *说明*                                                                 | *默认值*       |
-| -------------------------- | -------------------- | ---------------------------------------------------------------------- | ------------- |
-| props (+)                  | Properties           | 监听心跳属性配置,keep-alive-cron 属性配置 cron 表达式,如:'0/5 * * * * ?'  | -             |
+| *名称*     | *数据类型*  | *说明*                                                                | *默认值* |
+| --------- | ---------- | -------------------------------------------------------------------- | ------- |
+| props (+) | Properties | 监听心跳属性配置,keep-alive-cron 属性配置 cron 表达式,如:'0/5 * * * * ?' | -       |
 
 ## 数据库发现类型配置
 
 类名称:org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration
 
-| *名称*                     | *数据类型*             | *说明*                                                                 | *默认值*       |
-| -------------------------- | -------------------- | ---------------------------------------------------------------------- | ------------- |
-| type (+)                   | String               | 数据库发现类型,如:MGR、openGauss                                       | -             |
-| props (?)                  | Properties           | 数据库发现类型配置,如 MGR 的 group-name 属性配置                          | -             |
+| *名称*     | *数据类型*  | *说明*                                       | *默认值* |
+| --------- | ---------- | ------------------------------------------- | ------- |
+| type (+)  | String     | 数据库发现类型,如:MySQL.MGR                   | -       |
+| props (?) | Properties | 数据库发现类型配置,如 MGR 的 group-name 属性配置 | -       |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.en.md
index f0b8dacd931..8ba76fe10e4 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/java-api/rules/ha.en.md
@@ -9,11 +9,11 @@ Class name:org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryR
 
 Attributes:
 
-| *Name*                      | *DataType*                                                   | *Description*                        |
-| -------------------------  | ------------------------------------------------------------- | ------------------------------------ |
-| dataSources (+)            | Collection\<DatabaseDiscoveryDataSourceRuleConfiguration\>    | Data source configuration            |
-| discoveryHeartbeats (+)    | Map\<String, DatabaseDiscoveryHeartBeatConfiguration\>        | Detect heartbeat configuration       |
-| discoveryTypes (+)         | Map\<String, ShardingSphereAlgorithmConfiguration\>           | Database discovery type configuration  |
+| *Name*                      | *DataType*                                                   | *Description*                         |
+| -------------------------  | ------------------------------------------------------------- | ------------------------------------- |
+| dataSources (+)            | Collection\<DatabaseDiscoveryDataSourceRuleConfiguration\>    | Data source configuration             |
+| discoveryHeartbeats (+)    | Map\<String, DatabaseDiscoveryHeartBeatConfiguration\>        | Detect heartbeat configuration        |
+| discoveryTypes (+)         | Map\<String, ShardingSphereAlgorithmConfiguration\>           | Database discovery type configuration |
 
 ## Data Source Configuration
 
@@ -22,11 +22,11 @@ Class name:org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDisco
 Attributes:
 
 | *Name*                     | *DataType*           | *Description*                                                                            | *Default Value* |
-| -------------------------- | -------------------- | ---------------------------------------------------------------------------------------- | ------------- |
-| groupName (+)              | String               | Database discovery group name                                                            | -             |
-| dataSourceNames (+)        | Collection\<String\> | Data source names, multiple data source names separated with comma. Such as: ds_0, ds_1  | -             |
-| discoveryHeartbeatName (+) | String               | Detect heartbeat name                                                                    | -             |
-| discoveryTypeName (+)      | String               | Database discovery type name                                                             | -             |
+| -------------------------- | -------------------- | ---------------------------------------------------------------------------------------- | -------------- |
+| groupName (+)              | String               | Database discovery group name                                                            | -              |
+| dataSourceNames (+)        | Collection\<String\> | Data source names, multiple data source names separated with comma. Such as: ds_0, ds_1  | -              |
+| discoveryHeartbeatName (+) | String               | Detect heartbeat name                                                                    | -              |
+| discoveryTypeName (+)      | String               | Database discovery type name                                                             | -              |
 
 ## Detect Heartbeat Configuration
 
@@ -34,9 +34,9 @@ Class name:org.apache.shardingsphere.dbdiscovery.api.config.rule.DatabaseDisco
 
 Attributes:
 
-| *Name*                     | *DataType*             | *Description*                                                                                                      | *Default Value*  |
-| -------------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------- |
-| props (+)                  | Properties             | Detect heartbeat attribute configuration, keep-alive-cron configuration, cron expression. Such as: '0/5 * * * * ?'  | -             |
+| *Name*                     | *DataType*             | *Description*                                                                                                      | *Default Value* |
+| -------------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------ | --------------- |
+| props (+)                  | Properties             | Detect heartbeat attribute configuration, keep-alive-cron configuration, cron expression. Such as: '0/5 * * * * ?' | -               |
 
 ## Database Discovery Type Configuration
 
@@ -44,7 +44,7 @@ Class name:org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgo
 
 Attributes:
 
-| *Name*                     | *DataType*             | *Description*                                                                   | *Default Value*       |
-| -------------------------- | ---------------------- | ------------------------------------------------------------------------------- | ------------- |
-| type (+)                   | String                 | Database discovery type, such as: MGR, openGauss                                  | -             |
-| props (?)                  | Properties             | Required parameters for high-availability types, such as MGR's group-name       | -             |
+| *Name*                     | *DataType*             | *Description*                                                                   | *Default Value* |
+| -------------------------- | ---------------------- | ------------------------------------------------------------------------------- | --------------- |
+| type (+)                   | String                 | Database discovery type, such as: MySQL.MGR                                     | -               |
+| props (?)                  | Properties             | Required parameters for high-availability types, such as MGR's group-name       | -               |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.cn.md
index 9a0c655c6fc..144af5e3554 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.cn.md
@@ -14,6 +14,6 @@ spring.shardingsphere.rules.database-discovery.data-sources.<database-discovery-
 
 spring.shardingsphere.rules.database-discovery.discovery-heartbeats.<discovery-heartbeat-name>.props.keep-alive-cron= # cron 表达式,如:'0/5 * * * * ?'
 
-spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.type= # 数据库发现类型,如:MGR、openGauss
+spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.type= # 数据库发现类型,如:MySQL.MGR
 spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.props.group-name= # 数据库发现类型必要参数,如 MGR 的 group-name
 ```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.en.md
index 86410d4861a..24e4e35e1df 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-boot-starter/rules/ha.en.md
@@ -14,7 +14,7 @@ spring.shardingsphere.rules.database-discovery.data-sources.<database-discovery-
 
 spring.shardingsphere.rules.database-discovery.discovery-heartbeats.<discovery-heartbeat-name>.props.keep-alive-cron= # This is cron expression, such as:'0/5 * * * * ?'
 
-spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.type= # Database discovery type, such as: MGR, openGauss
+spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.type= # Database discovery type, such as: MySQL.MGR
 spring.shardingsphere.rules.database-discovery.discovery-types.<discovery-type-name>.props.group-name= # Required parameters for database discovery types, such as MGR's group-name
 
 ```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.cn.md
index bf784b4ef69..af4928b50d8 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.cn.md
@@ -36,5 +36,5 @@ weight = 3
 | *名称*     | *类型* | *说明*                                    |
 | --------- | ----- | ----------------------------------------- |
 | id        | 属性  | 数据库发现类型名称                               |
-| type      | 属性  | 数据库发现类型,如:MGR、openGauss               |
+| type      | 属性  | 数据库发现类型,如:MySQL.MGR               |
 | props (?) | 标签  | 数据库发现类型配置,如 MGR 的 group-name 属性配置   |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.en.md
index 1a20f211c9d..7a358e8ad9f 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/spring-namespace/rules/ha.en.md
@@ -36,5 +36,5 @@ Namespace:[http://shardingsphere.apache.org/schema/shardingsphere/database-dis
 | *Name*     | *Type*    | *Description*                                                    |
 | --------- | ---------- | ---------------------------------------------------------------- |
 | id        | Attribute  | Database discovery type Id                                         |
-| type      | Attribute  | Database discovery type, such as: MGR, openGauss                   |
+| type      | Attribute  | Database discovery type, such as: MySQL.MGR                   |
 | props (?) | tag        | Required parameters for database discovery types, such as MGR's group-name   |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
index 9411895b63e..62b61b51c7a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.cn.md
@@ -25,7 +25,7 @@ rules:
   # 数据库发现类型配置
   discoveryTypes:
     <discovery-type-name> (+): # 数据库发现类型名称
-      type: # 数据库发现类型,如:MGR、openGauss 
+      type: # 数据库发现类型,如:MySQL.MGR 
       props (?):
         group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1 # 数据库发现类型必要参数,如 MGR 的 group-name
 ```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
index 61dd3248cfa..0ded27b110b 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/yaml-config/rules/ha.en.md
@@ -23,7 +23,7 @@ rules:
   # Database Discovery Configuration
   discoveryTypes:
     <discovery-type-name> (+): # Database discovery type name
-      type: # Database discovery type, such as: MGR, openGauss
+      type: # Database discovery type, such as: MySQL.MGR
       props (?):
         group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1 # Required parameters for database discovery types, such as MGR's group-name
 ```
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 b91fbd0e6a6..656a8e7f3d5 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
@@ -55,7 +55,7 @@ property:
     key=value                          
 ```
 
-- `discoveryType` 指定数据库发现服务类型,`ShardingSphere` 内置支持 `MGR`;
+- `discoveryType` 指定数据库发现服务类型,`ShardingSphere` 内置支持 `MySQL.MGR`;
 - 重复的 `ruleName` 将无法被创建;
 - 正在被使用的 `discoveryType` 和 `discoveryHeartbeat` 无法被删除;
 - 带有 `-` 的命名在改动时需要使用 `" "`;
@@ -68,13 +68,13 @@ property:
 ```sql
 CREATE DB_DISCOVERY RULE db_discovery_group_0 (
 RESOURCES(ds_0, ds_1, ds_2),
-TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec')),
+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),
-TYPE(NAME=mgr,PROPERTIES('group-name'='246e9612-aaf1')),
+TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='246e9612-aaf1')),
 HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
 );
 
@@ -90,7 +90,7 @@ DROP DB_DISCOVERY HEARTBEAT db_discovery_group_0_heartbeat;
 
 ```sql
 CREATE DB_DISCOVERY TYPE db_discovery_group_1_mgr(
-  TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec'))
+  TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='92504d5b-6dec'))
 );
 
 CREATE DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
@@ -104,7 +104,7 @@ HEARTBEAT=db_discovery_group_1_heartbeat
 );
 
 ALTER DB_DISCOVERY TYPE db_discovery_group_1_mgr(
-  TYPE(NAME=mgr,PROPERTIES('group-name'='246e9612-aaf1'))
+  TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='246e9612-aaf1'))
 );
 
 ALTER DB_DISCOVERY 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 c3e68a607a4..3ba25b52bc9 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
@@ -55,7 +55,7 @@ property:
     key=value                          
 ```
 
-- `discoveryType` specifies the database discovery service type, `ShardingSphere` has built-in support for `MGR`
+- `discoveryType` specifies the database discovery service type, `ShardingSphere` has built-in support for `MySQL.MGR`
 - Duplicate `ruleName` will not be created
 - The `discoveryType` and `discoveryHeartbeat` being used cannot be deleted
 - Names with `-` need to use `" "` when changing
@@ -69,13 +69,13 @@ property:
 ```sql
 CREATE DB_DISCOVERY RULE db_discovery_group_0 (
 RESOURCES(ds_0, ds_1, ds_2),
-TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec')),
+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),
-TYPE(NAME=mgr,PROPERTIES('group-name'='246e9612-aaf1')),
+TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='246e9612-aaf1')),
 HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
 );
 
@@ -91,7 +91,7 @@ DROP DB_DISCOVERY HEARTBEAT db_discovery_group_0_heartbeat;
 
 ```sql
 CREATE DB_DISCOVERY TYPE db_discovery_group_1_mgr(
-  TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec'))
+  TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='92504d5b-6dec'))
 );
 
 CREATE DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
@@ -105,7 +105,7 @@ HEARTBEAT=db_discovery_group_1_heartbeat
 );
 
 ALTER DB_DISCOVERY TYPE db_discovery_group_1_mgr(
-  TYPE(NAME=mgr,PROPERTIES('group-name'='246e9612-aaf1'))
+  TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='246e9612-aaf1'))
 );
 
 ALTER DB_DISCOVERY HEARTBEAT db_discovery_group_1_heartbeat(
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
index 38b11990729..5da3ed1daca 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.cn.md
@@ -46,11 +46,11 @@ SHOW DB_DISCOVERY HEARTBEATS [FROM schemaName]
 
 ```sql
 mysql> show db_discovery rules;
-+----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------+------------------------------------------------------------------------------+
-| group_name           | data_source_names | primary_data_source_name | discovery_type                                                              | discovery_heartbeat                                                          |
-+----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------+------------------------------------------------------------------------------+
-| db_discovery_group_0 | ds_0,ds_1,ds_2    |        ds_0              | {name=db_discovery_group_0_mgr, type=mgr, props={group-name=92504d5b-6dec}} | {name=db_discovery_group_0_heartbeat, props={keep-alive-cron=0/5 * * * * ?}} |
-+----------------------+-------------------+--------------------------+------------------------------------------------------------------------------+-----------------------------------------------------------------------------+
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
+| group_name           | data_source_names | primary_data_source_name | discovery_type                                                                    | discovery_heartbeat                                                          |
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
+| db_discovery_group_0 | ds_0,ds_1,ds_2    |        ds_0              | {name=db_discovery_group_0_mgr, type=MySQL.MGR, props={group-name=92504d5b-6dec}} | {name=db_discovery_group_0_heartbeat, props={keep-alive-cron=0/5 * * * * ?}} |
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+-----------------------------------------------------------------------------+
 1 row in set (0.20 sec)
 ```
 
@@ -58,11 +58,11 @@ mysql> show db_discovery rules;
 
 ```sql
 mysql> show db_discovery types;
-+--------------------------+------+----------------------------+
-| name                     | type | props                      |
-+--------------------------+------+----------------------------+
-| db_discovery_group_0_mgr | mgr  | {group-name=92504d5b-6dec} |
-+--------------------------+------+----------------------------+
++--------------------------+------------+----------------------------+
+| name                     | type       | props                      |
++--------------------------+------------+----------------------------+
+| db_discovery_group_0_mgr | MySQL.MGR  | {group-name=92504d5b-6dec} |
++--------------------------+------------+----------------------------+
 1 row in set (0.01 sec)
 ```
 
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
index a10fa9b695e..1141a049653 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/db-discovery.en.md
@@ -46,11 +46,11 @@ SHOW DB_DISCOVERY HEARTBEATS [FROM schemaName]
 
 ```sql
 mysql> show db_discovery rules;
-+----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------+------------------------------------------------------------------------------+
-| group_name           | data_source_names | primary_data_source_name | discovery_type                                                              | discovery_heartbeat                                                          |
-+----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------+------------------------------------------------------------------------------+
-| db_discovery_group_0 | ds_0,ds_1,ds_2    |        ds_0              | {name=db_discovery_group_0_mgr, type=mgr, props={group-name=92504d5b-6dec}} | {name=db_discovery_group_0_heartbeat, props={keep-alive-cron=0/5 * * * * ?}} |
-+----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------+------------------------------------------------------------------------------+
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
+| group_name           | data_source_names | primary_data_source_name | discovery_type                                                                    | discovery_heartbeat                                                          |
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
+| db_discovery_group_0 | ds_0,ds_1,ds_2    |        ds_0              | {name=db_discovery_group_0_mgr, type=MySQL.MGR, props={group-name=92504d5b-6dec}} | {name=db_discovery_group_0_heartbeat, props={keep-alive-cron=0/5 * * * * ?}} |
++----------------------+-------------------+--------------------------+-----------------------------------------------------------------------------------+------------------------------------------------------------------------------+
 1 row in set (0.20 sec)
 ```
 
@@ -58,11 +58,11 @@ mysql> show db_discovery rules;
 
 ```sql
 mysql> show db_discovery types;
-+---------------------------+------+------------------------------+
-| name                      | type | props                        |
-+---------------------------+------+------------------------------+
-| db_discovery_group_0_mgr  | mgr  | {group-name=92504d5b-6dec}   |
-+---------------------------+------+------------------------------+
++---------------------------+------------+------------------------------+
+| name                      | type       | props                        |
++---------------------------+------------+------------------------------+
+| db_discovery_group_0_mgr  | MySQL.MGR  | {group-name=92504d5b-6dec}   |
++---------------------------+------------+------------------------------+
 1 row in set (0.01 sec)
 ```
 
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 2908bc5f192..8372581fe7a 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
@@ -34,7 +34,7 @@ PASSWORD=root
 ```sql
 CREATE DB_DISCOVERY RULE db_discovery_group_0 (
 RESOURCES(ds_0, ds_1),
-TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec')),
+TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='92504d5b-6dec')),
 HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
 );
 ```
@@ -44,7 +44,7 @@ HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
 ```sql
 ALTER DB_DISCOVERY RULE db_discovery_group_0 (
 RESOURCES(ds_0, ds_1, ds_2),
-TYPE(NAME=mgr,PROPERTIES('group-name'='92504d5b-6dec')),
+TYPE(NAME=MySQL.MGR,PROPERTIES('group-name'='92504d5b-6dec')),
 HEARTBEAT(PROPERTIES('keep-alive-cron'='0/5 * * * * ?'))
 );
 ```
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl
index d0d8f1cbb9f..d53601de821 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/config/db-discovery.ftl
@@ -37,6 +37,6 @@
         Properties props = new Properties();
         props.put("keep-alive-cron", "0/5 * * * * ?");
         props.put("group-name", "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
-        result.put("mgr", new ShardingSphereAlgorithmConfiguration("MGR", props));
+        result.put("mgr", new ShardingSphereAlgorithmConfiguration("MySQL.MGR", props));
         return result;
     }
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/properties/db-discovery.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/properties/db-discovery.ftl
index 8c9c6e95162..1a0ae258889 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/properties/db-discovery.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/properties/db-discovery.ftl
@@ -19,6 +19,6 @@ spring.shardingsphere.rules.database-discovery.data-sources.rule.data-source-nam
 spring.shardingsphere.rules.database-discovery.data-sources.rule.discovery-heartbeat-name=mgr-heartbeat
 spring.shardingsphere.rules.database-discovery.data-sources.rule.discovery-type-name=mgr
 spring.shardingsphere.rules.database-discovery.discovery-heartbeats.mgr-heartbeat.props.keep-alive-cron=0/5 * * * * ?
-spring.shardingsphere.rules.database-discovery.discovery-types.mgr.type=MGR
+spring.shardingsphere.rules.database-discovery.discovery-types.mgr.type=MySQL.MGR
 spring.shardingsphere.rules.database-discovery.discovery-types.mgr.props.keep-alive-cron=0/5 * * * * ?
 spring.shardingsphere.rules.database-discovery.discovery-types.mgr.props.group-name=aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/xml/db-discovery.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/xml/db-discovery.ftl
index 31030888673..e50caf34278 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/xml/db-discovery.ftl
+++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/resources/xml/db-discovery.ftl
@@ -16,8 +16,7 @@
   -->
     
     <database-discovery:rule id="dbDiscoveryRule">
-        <database-discovery:data-source-rule id="db" data-source-names="ds_0,ds_1,ds_2" discovery-heartbeat-name="mgr-heartbeat"
-                                             discovery-type-name="mgr"/>
+        <database-discovery:data-source-rule id="db" data-source-names="ds_0,ds_1,ds_2" discovery-heartbeat-name="mgr-heartbeat" discovery-type-name="mgr" />
         <database-discovery:discovery-heartbeat id="mgr-heartbeat">
             <props>
                 <prop key="keep-alive-cron">0/5 * * * * ?</prop>
@@ -25,7 +24,7 @@
         </database-discovery:discovery-heartbeat>
     </database-discovery:rule>
     
-    <database-discovery:discovery-type id="mgr" type="MGR">
+    <database-discovery:discovery-type id="mgr" type="MySQL.MGR">
         <props>
             <prop key="keep-alive-cron">0/5 * * * * ?</prop>
             <prop key="group-name">aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa</prop>
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleConfigurationYamlSwapperTest.java
index 563c5a792f6..4d8ba2dd3c1 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/test/java/org/apache/shardingsphere/dbdiscovery/yaml/swapper/DatabaseDiscoveryRuleConfigurationYamlSwapperTest.java
@@ -42,7 +42,7 @@ public final class DatabaseDiscoveryRuleConfigurationYamlSwapperTest {
         DatabaseDiscoveryDataSourceRuleConfiguration dataSourceConfig =
                 new DatabaseDiscoveryDataSourceRuleConfiguration("ds", Collections.singletonList("dataSourceName"), "ha_heartbeat", "discoveryTypeName");
         YamlDatabaseDiscoveryRuleConfiguration actual = getHARuleConfigurationYamlSwapper().swapToYamlConfiguration(new DatabaseDiscoveryRuleConfiguration(Collections.singleton(dataSourceConfig),
-                Collections.emptyMap(), ImmutableMap.of("mgr", new ShardingSphereAlgorithmConfiguration("MGR", new Properties()))));
+                Collections.emptyMap(), ImmutableMap.of("mgr", new ShardingSphereAlgorithmConfiguration("MySQL.MGR", new Properties()))));
         assertThat(actual.getDataSources().keySet(), is(Collections.singleton("ds")));
         assertThat(actual.getDataSources().get("ds").getDataSourceNames(), is(Collections.singletonList("dataSourceName")));
     }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDisco [...]
index 04b05914053..fe024b6bded 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverter.java
@@ -51,7 +51,7 @@ public final class DatabaseDiscoveryRuleStatementConverter {
      */
     public static DatabaseDiscoveryRuleConfiguration convert(final Collection<AbstractDatabaseDiscoverySegment> ruleSegments) {
         Map<String, List<AbstractDatabaseDiscoverySegment>> segmentMap = ruleSegments.stream().collect(Collectors.groupingBy(each -> each.getClass().getSimpleName()));
-        final DatabaseDiscoveryRuleConfiguration result = new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>(), new LinkedHashMap<>());
+        DatabaseDiscoveryRuleConfiguration result = new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>(), new LinkedHashMap<>());
         segmentMap.getOrDefault(DatabaseDiscoveryDefinitionSegment.class.getSimpleName(), Collections.emptyList())
                 .forEach(each -> addConfiguration(result, (DatabaseDiscoveryDefinitionSegment) each));
         segmentMap.getOrDefault(DatabaseDiscoveryConstructionSegment.class.getSimpleName(), Collections.emptyList())
@@ -59,16 +59,16 @@ public final class DatabaseDiscoveryRuleStatementConverter {
         return result;
     }
     
-    private static void addConfiguration(final DatabaseDiscoveryRuleConfiguration configuration, final DatabaseDiscoveryDefinitionSegment segment) {
+    private static void addConfiguration(final DatabaseDiscoveryRuleConfiguration config, final DatabaseDiscoveryDefinitionSegment segment) {
         String discoveryTypeName = getName(segment.getName(), segment.getDiscoveryType().getName());
         ShardingSphereAlgorithmConfiguration discoveryType = new ShardingSphereAlgorithmConfiguration(segment.getDiscoveryType().getName(), segment.getDiscoveryType().getProps());
         String heartbeatName = getName(segment.getName(), "heartbeat");
         DatabaseDiscoveryHeartBeatConfiguration heartbeatConfiguration = new DatabaseDiscoveryHeartBeatConfiguration(segment.getDiscoveryHeartbeat());
         DatabaseDiscoveryDataSourceRuleConfiguration dataSourceRuleConfiguration =
                 new DatabaseDiscoveryDataSourceRuleConfiguration(segment.getName(), new LinkedList<>(segment.getDataSources()), heartbeatName, discoveryTypeName);
-        configuration.getDataSources().add(dataSourceRuleConfiguration);
-        configuration.getDiscoveryTypes().put(discoveryTypeName, discoveryType);
-        configuration.getDiscoveryHeartbeats().put(heartbeatName, heartbeatConfiguration);
+        config.getDataSources().add(dataSourceRuleConfiguration);
+        config.getDiscoveryTypes().put(discoveryTypeName, discoveryType);
+        config.getDiscoveryHeartbeats().put(heartbeatName, heartbeatConfiguration);
     }
     
     private static void addConfiguration(final DatabaseDiscoveryRuleConfiguration configuration, final DatabaseDiscoveryConstructionSegment segment) {
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseD [...]
index d433012f5a0..29f1f84f12f 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/converter/DatabaseDiscoveryRuleStatementConverterTest.java
@@ -42,13 +42,13 @@ public final class DatabaseDiscoveryRuleStatementConverterTest {
     public void assertConvert() {
         DatabaseDiscoveryRuleConfiguration ruleConfiguration = DatabaseDiscoveryRuleStatementConverter.convert(createDatabaseDiscoveryRuleSegments());
         assertNotNull(ruleConfiguration);
-        assertTrue(ruleConfiguration.getDiscoveryTypes().containsKey("definition_mgr"));
+        assertTrue(ruleConfiguration.getDiscoveryTypes().containsKey("definition_MySQL.MGR"));
         assertTrue(ruleConfiguration.getDiscoveryHeartbeats().containsKey("definition_heartbeat"));
         Iterator<DatabaseDiscoveryDataSourceRuleConfiguration> iterator = ruleConfiguration.getDataSources().iterator();
         DatabaseDiscoveryDataSourceRuleConfiguration configuration = iterator.next();
         assertThat(configuration.getDataSourceNames(), is(Arrays.asList("resource0", "resource1")));
         assertThat(configuration.getGroupName(), is("definition"));
-        assertThat(configuration.getDiscoveryTypeName(), is("definition_mgr"));
+        assertThat(configuration.getDiscoveryTypeName(), is("definition_MySQL.MGR"));
         assertThat(configuration.getDiscoveryHeartbeatName(), is("definition_heartbeat"));
         configuration = iterator.next();
         assertThat(configuration.getDataSourceNames(), is(Arrays.asList("resource0", "resource1")));
@@ -60,13 +60,13 @@ public final class DatabaseDiscoveryRuleStatementConverterTest {
     private Collection<AbstractDatabaseDiscoverySegment> createDatabaseDiscoveryRuleSegments() {
         Properties properties = new Properties();
         properties.put("key", "value");
-        final Collection<AbstractDatabaseDiscoverySegment> ruleSegments = new LinkedList<>();
+        final Collection<AbstractDatabaseDiscoverySegment> result = new LinkedList<>();
         DatabaseDiscoveryDefinitionSegment databaseDiscoveryDefinitionSegment =
-                new DatabaseDiscoveryDefinitionSegment("definition", Arrays.asList("resource0", "resource1"), new AlgorithmSegment("mgr", properties), properties);
+                new DatabaseDiscoveryDefinitionSegment("definition", Arrays.asList("resource0", "resource1"), new AlgorithmSegment("MySQL.MGR", properties), properties);
         DatabaseDiscoveryConstructionSegment databaseDiscoveryConstructionSegment =
                 new DatabaseDiscoveryConstructionSegment("construction", Arrays.asList("resource0", "resource1"), "type", "heartbeat");
-        ruleSegments.add(databaseDiscoveryConstructionSegment);
-        ruleSegments.add(databaseDiscoveryDefinitionSegment);
-        return ruleSegments;
+        result.add(databaseDiscoveryConstructionSegment);
+        result.add(databaseDiscoveryDefinitionSegment);
+        return result;
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRule [...]
index e0c75d6009d..af9a0416954 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryRuleQueryResultSetTest.java
@@ -62,14 +62,14 @@ public final class DatabaseDiscoveryRuleQueryResultSetTest {
         assertThat(actual.get(0), is("ms_group"));
         assertThat(actual.get(1), is("ds_0,ds_1"));
         assertThat(actual.get(2), is(""));
-        assertThat(actual.get(3).toString(), is("{name=type_test, type=MGR, props={}}"));
+        assertThat(actual.get(3).toString(), is("{name=type_test, type=MySQL.MGR, props={}}"));
         assertThat(actual.get(4).toString(), is("{name=heartbeat_test, props={}}"));
     }
     
     private RuleConfiguration createRuleConfiguration() {
         DatabaseDiscoveryDataSourceRuleConfiguration databaseDiscoveryDataSourceRuleConfig = new DatabaseDiscoveryDataSourceRuleConfiguration("ms_group", Arrays.asList("ds_0", "ds_1"),
                 "heartbeat_test", "type_test");
-        ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("MGR", new Properties());
+        ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("MySQL.MGR", new Properties());
         Map<String, ShardingSphereAlgorithmConfiguration> discoverTypes = new HashMap<>(1, 1);
         discoverTypes.put("type_test", shardingSphereAlgorithmConfig);
         Map<String, DatabaseDiscoveryHeartBeatConfiguration> discoveryHeartbeat = new HashMap<>(1, 1);
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSetTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryType [...]
index d1e9983c26f..e9b8ed8ad74 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/query/DatabaseDiscoveryTypeQueryResultSetTest.java
@@ -54,7 +54,7 @@ public final class DatabaseDiscoveryTypeQueryResultSetTest {
         assertThat(columnNames.size(), is(3));
         assertThat(actual.size(), is(3));
         assertThat(actual.get(0), is("test_name"));
-        assertThat(actual.get(1), is("MGR"));
+        assertThat(actual.get(1), is("MySQL.MGR"));
         assertThat(actual.get(2).toString(), is("{type_key=type_value}"));
     }
     
@@ -63,7 +63,7 @@ public final class DatabaseDiscoveryTypeQueryResultSetTest {
                 "ms-heartbeat", "test");
         Properties discoveryTypeProps = new Properties();
         discoveryTypeProps.put("type_key", "type_value");
-        ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("MGR", discoveryTypeProps);
+        ShardingSphereAlgorithmConfiguration shardingSphereAlgorithmConfig = new ShardingSphereAlgorithmConfiguration("MySQL.MGR", discoveryTypeProps);
         Map<String, ShardingSphereAlgorithmConfiguration> discoverTypes = new HashMap<>(1, 1);
         discoverTypes.put("test_name", shardingSphereAlgorithmConfig);
         return new DatabaseDiscoveryRuleConfiguration(Collections.singleton(databaseDiscoveryDataSourceRuleConfig), Collections.emptyMap(), discoverTypes);
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabas [...]
index 27446854cdd..8286faef19b 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -120,7 +120,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
     public void assertBuild() {
         DatabaseDiscoveryConstructionSegment constructionSegment = new DatabaseDiscoveryConstructionSegment("readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"),
                 "discovery_type_name", "heartbeat_name");
-        AlgorithmSegment algorithmSegment = new AlgorithmSegment("mgr", new Properties());
+        AlgorithmSegment algorithmSegment = new AlgorithmSegment("MySQL.MGR", new Properties());
         DatabaseDiscoveryDefinitionSegment definitionSegment = new DatabaseDiscoveryDefinitionSegment("readwrite_ds_2", Arrays.asList("ds_read_0", "ds_read_1"), algorithmSegment, new Properties());
         DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfiguration =
                 (DatabaseDiscoveryRuleConfiguration) updater.buildToBeAlteredRuleConfiguration(new AlterDatabaseDiscoveryRuleStatement(Arrays.asList(constructionSegment, definitionSegment)));
@@ -129,7 +129,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_1")));
         assertTrue(databaseDiscoveryRuleConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_2")));
-        assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_mgr"));
+        assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_MySQL.MGR"));
         assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryHeartbeats().containsKey("readwrite_ds_2_heartbeat"));
     }
     
@@ -137,7 +137,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
     public void assertUpdate() {
         DatabaseDiscoveryConstructionSegment constructionSegment = new DatabaseDiscoveryConstructionSegment(
                 "readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"), "readwrite_ds_2_mgr", "heartbeat_name");
-        AlgorithmSegment algorithmSegment = new AlgorithmSegment("mgr", new Properties());
+        AlgorithmSegment algorithmSegment = new AlgorithmSegment("MySQL.MGR", new Properties());
         DatabaseDiscoveryDefinitionSegment definitionSegment = new DatabaseDiscoveryDefinitionSegment("readwrite_ds_2", Arrays.asList("ds_read_0", "ds_read_1"), algorithmSegment, new Properties());
         DatabaseDiscoveryRuleConfiguration toBeCreatedRuleConfig =
                 (DatabaseDiscoveryRuleConfiguration) updater.buildToBeAlteredRuleConfiguration(new AlterDatabaseDiscoveryRuleStatement(Arrays.asList(constructionSegment, definitionSegment)));
@@ -151,7 +151,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_1")));
         assertTrue(currentConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_2")));
-        assertTrue(currentConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_mgr"));
+        assertTrue(currentConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_MySQL.MGR"));
         assertTrue(currentConfiguration.getDiscoveryHeartbeats().containsKey("readwrite_ds_2_heartbeat"));
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatab [...]
index 41b50ae7acf..f15b0c8de45 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -107,7 +107,7 @@ public final class CreateDatabaseDiscoveryRuleStatementUpdaterTest {
     public void assertBuild() {
         DatabaseDiscoveryConstructionSegment constructionSegment = new DatabaseDiscoveryConstructionSegment("readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"),
                 "discovery_type_name", "heartbeat_name");
-        AlgorithmSegment algorithmSegment = new AlgorithmSegment("mgr", new Properties());
+        AlgorithmSegment algorithmSegment = new AlgorithmSegment("MySQL.MGR", new Properties());
         DatabaseDiscoveryDefinitionSegment definitionSegment = new DatabaseDiscoveryDefinitionSegment("readwrite_ds_2", Arrays.asList("ds_read_0", "ds_read_1"), algorithmSegment, new Properties());
         DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfiguration =
                 updater.buildToBeCreatedRuleConfiguration(new CreateDatabaseDiscoveryRuleStatement(Arrays.asList(constructionSegment, definitionSegment)));
@@ -116,26 +116,26 @@ public final class CreateDatabaseDiscoveryRuleStatementUpdaterTest {
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_1")));
         assertTrue(databaseDiscoveryRuleConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_2")));
-        assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_mgr"));
+        assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_MySQL.MGR"));
         assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryHeartbeats().containsKey("readwrite_ds_2_heartbeat"));
     }
     
     @Test
     public void assertUpdate() {
-        DatabaseDiscoveryConstructionSegment constructionSegment = new DatabaseDiscoveryConstructionSegment("readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"),
-                "discovery_type_name", "heartbeat_name");
-        AlgorithmSegment algorithmSegment = new AlgorithmSegment("mgr", new Properties());
+        DatabaseDiscoveryConstructionSegment constructionSegment = new DatabaseDiscoveryConstructionSegment(
+                "readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"), "discovery_type_name", "heartbeat_name");
+        AlgorithmSegment algorithmSegment = new AlgorithmSegment("MySQL.MGR", new Properties());
         DatabaseDiscoveryDefinitionSegment definitionSegment = new DatabaseDiscoveryDefinitionSegment("readwrite_ds_2", Arrays.asList("ds_read_0", "ds_read_1"), algorithmSegment, new Properties());
-        DatabaseDiscoveryRuleConfiguration toBeCreatedRuleConfig =
-                updater.buildToBeCreatedRuleConfiguration(new CreateDatabaseDiscoveryRuleStatement(Arrays.asList(constructionSegment, definitionSegment)));
-        DatabaseDiscoveryRuleConfiguration currentConfiguration = new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>(), new LinkedHashMap<>());
-        updater.updateCurrentRuleConfiguration(currentConfiguration, toBeCreatedRuleConfig);
-        assertThat(currentConfiguration.getDataSources().size(), is(2));
-        assertTrue(currentConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
+        DatabaseDiscoveryRuleConfiguration toBeCreatedRuleConfig = updater.buildToBeCreatedRuleConfiguration(
+                new CreateDatabaseDiscoveryRuleStatement(Arrays.asList(constructionSegment, definitionSegment)));
+        DatabaseDiscoveryRuleConfiguration currentConfig = new DatabaseDiscoveryRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>(), new LinkedHashMap<>());
+        updater.updateCurrentRuleConfiguration(currentConfig, toBeCreatedRuleConfig);
+        assertThat(currentConfig.getDataSources().size(), is(2));
+        assertTrue(currentConfig.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_1")));
-        assertTrue(currentConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
+        assertTrue(currentConfig.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
                 .collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_2")));
-        assertTrue(currentConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_2_mgr"));
-        assertTrue(currentConfiguration.getDiscoveryHeartbeats().containsKey("readwrite_ds_2_heartbeat"));
+        assertTrue(currentConfig.getDiscoveryTypes().containsKey("readwrite_ds_2_MySQL.MGR"));
+        assertTrue(currentConfig.getDiscoveryHeartbeats().containsKey("readwrite_ds_2_heartbeat"));
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseD [...]
index e3f57a86a6b..364299b7535 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdaterTest.java
@@ -92,8 +92,8 @@ public final class DropDatabaseDiscoveryTypeStatementUpdaterTest {
     
     private DatabaseDiscoveryRuleConfiguration createCurrentRuleConfiguration() {
         Map<String, ShardingSphereAlgorithmConfiguration> discoveryTypes = new HashMap<>(2, 1);
-        discoveryTypes.put("type_name", new ShardingSphereAlgorithmConfiguration("MGR", new Properties()));
-        discoveryTypes.put("other", new ShardingSphereAlgorithmConfiguration("MGR", new Properties()));
+        discoveryTypes.put("type_name", new ShardingSphereAlgorithmConfiguration("MySQL.MGR", new Properties()));
+        discoveryTypes.put("other", new ShardingSphereAlgorithmConfiguration("MySQL.MGR", new Properties()));
         return new DatabaseDiscoveryRuleConfiguration(Collections.emptyList(), Collections.emptyMap(), discoveryTypes);
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryType.java
index 9e721a47ea6..bc34bcc16f6 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/mgr/MGRDatabaseDiscoveryType.java
@@ -41,7 +41,7 @@ import java.util.Optional;
 import java.util.Properties;
 
 /**
- * MGR database discovery type.
+ * MGR database discovery type for MySQL.
  */
 @Slf4j
 public final class MGRDatabaseDiscoveryType extends AbstractDatabaseDiscoveryType {
@@ -160,6 +160,6 @@ public final class MGRDatabaseDiscoveryType extends AbstractDatabaseDiscoveryTyp
     
     @Override
     public String getType() {
-        return "MGR";
+        return "MySQL.MGR";
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryType.java
similarity index 89%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryType.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryType.java
index 562445caf0c..7b6b89875a3 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.mysql.type.masterslave;
+package org.apache.shardingsphere.dbdiscovery.mysql.type.replication;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -38,23 +38,23 @@ import java.util.Optional;
 import java.util.Properties;
 
 /**
- * Master-slave database discovery type.
+ * Normal replication database discovery type for MySQL.
  */
 @Getter
 @Setter
 @Slf4j
-public final class MasterSlaveDatabaseDiscoveryType extends AbstractDatabaseDiscoveryType {
+public final class MySQLNormalReplicationDatabaseDiscoveryType extends AbstractDatabaseDiscoveryType {
     
     private static final String SHOW_SLAVE_STATUS = "SHOW SLAVE STATUS";
     
     private Properties props = new Properties();
     
     @Override
-    public MasterSlaveHighlyAvailableStatus loadHighlyAvailableStatus(final DataSource dataSource) throws SQLException {
+    public MySQLNormalReplicationHighlyAvailableStatus loadHighlyAvailableStatus(final DataSource dataSource) throws SQLException {
         try (
                 Connection connection = dataSource.getConnection();
                 Statement statement = connection.createStatement()) {
-            return new MasterSlaveHighlyAvailableStatus(loadPrimaryDataSourceURL(statement).orElse(null));
+            return new MySQLNormalReplicationHighlyAvailableStatus(loadPrimaryDataSourceURL(statement).orElse(null));
         }
     }
     
@@ -110,6 +110,6 @@ public final class MasterSlaveDatabaseDiscoveryType extends AbstractDatabaseDisc
     
     @Override
     public String getType() {
-        return "MASTER_SLAVE";
+        return "MySQL.NORMAL_REPLICATION";
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveHighlyAvailableStatus.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationHighlyAvailableStatus.java
similarity index 86%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveHighlyAvailableStatus.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationHighlyAvailableStatus.java
index bec3769573e..5cec7809d81 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveHighlyAvailableStatus.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationHighlyAvailableStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.mysql.type.masterslave;
+package org.apache.shardingsphere.dbdiscovery.mysql.type.replication;
 
 import com.google.common.base.Preconditions;
 import lombok.EqualsAndHashCode;
@@ -28,12 +28,12 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * Highly available status of MySQL master-slave cluster.
+ * Highly available status of MySQL normal replication cluster.
  */
 @RequiredArgsConstructor
 @Getter
 @EqualsAndHashCode
-public final class MasterSlaveHighlyAvailableStatus implements GlobalHighlyAvailableStatus {
+public final class MySQLNormalReplicationHighlyAvailableStatus implements GlobalHighlyAvailableStatus {
     
     private final String primaryInstanceURL;
     
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
index 1a0a529e86d..5e3baa99cf6 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
@@ -16,4 +16,4 @@
 #
 
 org.apache.shardingsphere.dbdiscovery.mysql.type.mgr.MGRDatabaseDiscoveryType
-org.apache.shardingsphere.dbdiscovery.mysql.type.masterslave.MasterSlaveDatabaseDiscoveryType
+org.apache.shardingsphere.dbdiscovery.mysql.type.replication.MySQLNormalReplicationDatabaseDiscoveryType
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryTypeTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryT [...]
similarity index 85%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryTypeTest.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java
index abaef92a37e..a492faa3ba1 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/masterslave/MasterSlaveDatabaseDiscoveryTypeTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-mysql/src/test/java/org/apache/shardingsphere/dbdiscovery/mysql/type/replication/MySQLNormalReplicationDatabaseDiscoveryTypeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.mysql.type.masterslave;
+package org.apache.shardingsphere.dbdiscovery.mysql.type.replication;
 
 import org.junit.Test;
 
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public final class MasterSlaveDatabaseDiscoveryTypeTest {
+public final class MySQLNormalReplicationDatabaseDiscoveryTypeTest {
     
     @Test
     public void assertLoadHighlyAvailableStatus() throws SQLException {
-        MasterSlaveHighlyAvailableStatus actual = new MasterSlaveDatabaseDiscoveryType().loadHighlyAvailableStatus(mockDataSource(3306));
+        MySQLNormalReplicationHighlyAvailableStatus actual = new MySQLNormalReplicationDatabaseDiscoveryType().loadHighlyAvailableStatus(mockDataSource(3306));
         assertThat(actual.getPrimaryInstanceURL(), is("127.0.0.1:3306"));
     }
     
@@ -46,7 +46,7 @@ public final class MasterSlaveDatabaseDiscoveryTypeTest {
         Map<String, DataSource> dataSourceMap = new HashMap<>(2, 1);
         dataSourceMap.put("ds_0", mockDataSource(3306));
         dataSourceMap.put("ds_1", mockDataSource(3307));
-        Optional<String> actual = new MasterSlaveDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
+        Optional<String> actual = new MySQLNormalReplicationDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
         assertTrue(actual.isPresent());
         assertThat(actual.get(), is("ds_0"));
     }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java
similarity index 88%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java
index f95e5c53720..f965f126b3c 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryType.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.opengauss;
+package org.apache.shardingsphere.dbdiscovery.opengauss.replication;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -38,12 +38,12 @@ import java.util.Optional;
 import java.util.Properties;
 
 /**
- * OpenGauss database discovery type.
+ * Normal replication database discovery type for openGauss.
  */
 @Getter
 @Setter
 @Slf4j
-public final class OpenGaussDatabaseDiscoveryType implements DatabaseDiscoveryType {
+public final class OpenGaussNormalReplicationDatabaseDiscoveryType implements DatabaseDiscoveryType {
     
     private static final String DB_ROLE = "SELECT local_role,db_state FROM pg_stat_get_stream_replications()";
     
@@ -52,12 +52,12 @@ public final class OpenGaussDatabaseDiscoveryType implements DatabaseDiscoveryTy
     private Properties props = new Properties();
     
     @Override
-    public OpenGaussHighlyAvailableStatus loadHighlyAvailableStatus(final DataSource dataSource) throws SQLException {
+    public OpenGaussNormalReplicationHighlyAvailableStatus loadHighlyAvailableStatus(final DataSource dataSource) throws SQLException {
         try (
                 Connection connection = dataSource.getConnection();
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery(DB_ROLE)) {
-            return new OpenGaussHighlyAvailableStatus(resultSet.next() && resultSet.getString("local_role").equals("Primary"));
+            return new OpenGaussNormalReplicationHighlyAvailableStatus(resultSet.next() && resultSet.getString("local_role").equals("Primary"));
         }
     }
     
@@ -109,6 +109,6 @@ public final class OpenGaussDatabaseDiscoveryType implements DatabaseDiscoveryTy
     
     @Override
     public String getType() {
-        return "openGauss";
+        return "openGauss.NORMAL_REPLICATION";
     }
 }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussHighlyAvailableStatus.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationHighlyAvailableStatus.java
similarity index 83%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussHighlyAvailableStatus.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationHighlyAvailableStatus.java
index 19498b33004..39726087df3 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussHighlyAvailableStatus.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationHighlyAvailableStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.opengauss;
+package org.apache.shardingsphere.dbdiscovery.opengauss.replication;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -27,12 +27,12 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * Highly available status of openGauss cluster.
+ * Highly available status of openGauss normal replication cluster.
  */
 @RequiredArgsConstructor
 @Getter
 @EqualsAndHashCode
-public final class OpenGaussHighlyAvailableStatus implements RoleSeparatedHighlyAvailableStatus {
+public final class OpenGaussNormalReplicationHighlyAvailableStatus implements RoleSeparatedHighlyAvailableStatus {
     
     private final boolean primary;
     
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
index 4a9dd1a176d..a042a799f96 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryType
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.dbdiscovery.opengauss.OpenGaussDatabaseDiscoveryType
+org.apache.shardingsphere.dbdiscovery.opengauss.replication.OpenGaussNormalReplicationDatabaseDiscoveryType
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeT [...]
similarity index 92%
rename from shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
rename to shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java
index b3c2f88ed77..ac8d5ed0cfb 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussDatabaseDiscoveryTypeTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-provider/shardingsphere-db-discovery-opengauss/src/test/java/org/apache/shardingsphere/dbdiscovery/opengauss/replication/OpenGaussNormalReplicationDatabaseDiscoveryTypeTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.dbdiscovery.opengauss;
+package org.apache.shardingsphere.dbdiscovery.opengauss.replication;
 
 import org.junit.Test;
 
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public final class OpenGaussDatabaseDiscoveryTypeTest {
+public final class OpenGaussNormalReplicationDatabaseDiscoveryTypeTest {
     
     private static final String DB_ROLE = "SELECT local_role,db_state FROM pg_stat_get_stream_replications()";
     
@@ -69,7 +69,7 @@ public final class OpenGaussDatabaseDiscoveryTypeTest {
         for (int i = 0; i < 3; i++) {
             dataSourceMap.put(String.format("ds_%s", i), dataSources.get(i));
         }
-        Optional<String> actual = new OpenGaussDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
+        Optional<String> actual = new OpenGaussNormalReplicationDatabaseDiscoveryType().determinePrimaryDataSource(dataSourceMap);
         assertTrue(actual.isPresent());
         assertThat(actual.get(), is("ds_2"));
     }
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/test/resources/application-database-discovery.properties b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/test/resources/application-database-discovery.properties
index 3eb33230717..189bb177fa4 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/test/resources/application-database-discovery.properties
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-boot-starter/src/test/resources/application-database-discovery.properties
@@ -21,6 +21,6 @@ spring.shardingsphere.rules.database-discovery.data-sources.primary_replica_ds.d
 
 spring.shardingsphere.rules.database-discovery.discovery-heartbeats.mgr-heartbeat.props.keep-alive-cron='0/3 * * * * ?'
 
-spring.shardingsphere.rules.database-discovery.discovery-types.mgr.type=MGR
+spring.shardingsphere.rules.database-discovery.discovery-types.mgr.type=MySQL.MGR
 spring.shardingsphere.rules.database-discovery.discovery-types.mgr.props.group-name=92504d5b-6dec-11e8-91ea-246e9612aaf1
 
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/java/org/apache/shardingsphere/dbdiscovery/spring/namespace/DatabaseDiscoverySpringNamespaceTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/java/org/apache/shardingsphere/dbdiscovery/spring/namespace/DatabaseDiscoverySpringNamespaceTest.java
index ced4369c177..2da67df9ca2 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/java/org/apache/shardingsphere/dbdiscovery/spring/namespace/DatabaseDiscoverySpringNamespaceTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/java/org/apache/shardingsphere/dbdiscovery/spring/namespace/DatabaseDiscoverySpringNamespaceTest.java
@@ -44,11 +44,6 @@ public final class DatabaseDiscoverySpringNamespaceTest extends AbstractJUnit4Sp
     @Resource
     private AlgorithmProvidedDatabaseDiscoveryRuleConfiguration mgrDatabaseDiscoveryRule;
     
-    @Test
-    public void assertMGRDatabaseDiscoveryType() {
-        assertThat(mgrDatabaseDiscoveryType.getType(), is("MGR"));
-    }
-    
     @Test
     public void assertDefaultDataSource() {
         assertDiscoveryTypes(mgrDatabaseDiscoveryRule.getDiscoveryTypes());
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/resources/META-INF/spring/database-discovery-application-context.xml b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/resources/META-INF/spring/database-discovery-application-context.xml
index 277abeabc33..adce9e29c29 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/resources/META-INF/spring/database-discovery-application-context.xml
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-spring/shardingsphere-db-discovery-spring-namespace/src/test/resources/META-INF/spring/database-discovery-application-context.xml
@@ -26,7 +26,7 @@
                            ">
     
     <database-discovery:rule id="mgrDatabaseDiscoveryRule">
-        <database-discovery:data-source-rule id="readwrite_ds" data-source-names="ds_0,ds_1,ds_2" discovery-heartbeat-name="mgr-heartbeat" discovery-type-name="mgr"/>
+        <database-discovery:data-source-rule id="readwrite_ds" data-source-names="ds_0,ds_1,ds_2" discovery-heartbeat-name="mgr-heartbeat" discovery-type-name="mgr" />
         <database-discovery:discovery-heartbeat id="mgr-heartbeat">
             <props>
                 <prop key="keep-alive-cron" > 0/5 * * * * ? </prop>
@@ -34,7 +34,7 @@
         </database-discovery:discovery-heartbeat>
     </database-discovery:rule>
 
-    <database-discovery:discovery-type id="mgr" type="MGR" >
+    <database-discovery:discovery-type id="mgr" type="MySQL.MGR">
         <props>
             <prop key="group-name">92504d5b-6dec-11e8-91ea-246e9612aaf1</prop>
         </props>
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/create.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/create.xml
index f169e6c8a57..e5432a57716 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/create.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/create.xml
@@ -18,39 +18,39 @@
 
 <sql-parser-test-cases>
     <add-resource sql-case-id="add-resource-simple-single-without-password">
-        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password=""/>
+        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="" />
     </add-resource>
     
     <add-resource sql-case-id="add-resource-simple-single-with-password">
-        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="123456"/>
+        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="123456" />
     </add-resource>
     
     <add-resource sql-case-id="add-resource-simple-multiple">
-        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="123456"/>
-        <data-source name="ds_1" hostname="127.0.0.1" port="3306" db="test1" user="ROOT" password="123456"/>
+        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="123456" />
+        <data-source name="ds_1" hostname="127.0.0.1" port="3306" db="test1" user="ROOT" password="123456" />
     </add-resource>
 
     <add-resource sql-case-id="add-resource-with-quota">
-        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password=""/>
+        <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="" />
     </add-resource>
     
     <add-resource sql-case-id="add-resource-url-single-without-password">
-        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password=""/>
+        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password="" />
     </add-resource>
     
     <add-resource sql-case-id="add-resource-url-single-with-password">
-        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password="123456"/>
+        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password="123456" />
     </add-resource>
     
     <add-resource sql-case-id="add-resource-url-multiple">
-        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password="123456"/>
-        <data-source name="ds_1" url="jdbc:mysql://127.0.0.1:3306/test1" user="ROOT" password="123456"/>
+        <data-source name="ds_0" url="jdbc:mysql://127.0.0.1:3306/test0" user="ROOT" password="123456" />
+        <data-source name="ds_1" url="jdbc:mysql://127.0.0.1:3306/test1" user="ROOT" password="123456" />
     </add-resource>
 
     <add-resource sql-case-id="add-resource-single-with-properties">
         <data-source name="ds_0" hostname="127.0.0.1" port="3306" db="test0" user="ROOT" password="123456">
             <properties>
-                <property key="maxPoolSize" value="30"/>
+                <property key="maxPoolSize" value="30" />
             </properties>
         </data-source>
     </add-resource>
@@ -98,7 +98,7 @@
             <data-source>ms_group_${0..1}</data-source>
             <table-strategy algorithm-name="hash_mod">
                 <properties>
-                    <property key="sharding-count" value="4"/>
+                    <property key="sharding-count" value="4" />
                 </properties>
             </table-strategy>
             <key-generate-strategy algorithm-name="snowflake" />
@@ -154,7 +154,7 @@
             <database-strategy type="standard" sharding-column="order_id">
                 <algorithm-segment algorithm-name="inline">
                     <properties>
-                        <property key="algorithm-expression" value="ms_group_${order_id% 2}"/>
+                        <property key="algorithm-expression" value="ms_group_${order_id% 2}" />
                     </properties>
                 </algorithm-segment>
             </database-strategy>
@@ -163,12 +163,12 @@
     </create-sharding-table-rule>
     
     <create-sharding-binding-table-rule sql-case-id="create-sharding-binding-table-rule">
-        <rule table-groups="t_order,t_order_item"/>
-        <rule table-groups="t_1,t_2"/>
+        <rule table-groups="t_order,t_order_item" />
+        <rule table-groups="t_1,t_2" />
     </create-sharding-binding-table-rule>
 
     <create-sharding-binding-table-rule sql-case-id="create-sharding-binding-table-rule-with-quota">
-        <rule table-groups="t_order,t_order_item"/>
+        <rule table-groups="t_order,t_order_item" />
         <rule table-groups="t_1,t_2"/>
     </create-sharding-binding-table-rule>
     
@@ -199,7 +199,7 @@
     <create-readwrite-splitting-rule sql-case-id="create-dynamic-readwrite-splitting-rule">
         <rule name="ms_group_1" auto-aware-resource="group_0" load-balancer="random">
             <properties>
-                <property key="read_weight" value="'2:1'"/>
+                <property key="read_weight" value="'2:1'" />
             </properties>
         </rule>
     </create-readwrite-splitting-rule>
@@ -210,11 +210,11 @@
             <data-source>resource1</data-source>
             <discovery-type algorithm-name="mgr">
                 <properties>
-                    <property key="groupName" value="92504d5b-6dec"/>
+                    <property key="groupName" value="92504d5b-6dec" />
                 </properties>
             </discovery-type>
             <heartbeat>
-                <property key="keepAliveCron" value="0/5 * * * * ?"/>
+                <property key="keepAliveCron" value="0/5 * * * * ?" />
             </heartbeat>
         </rule>
         <rule rule-name="ha_group_1" type="mgr2">
@@ -222,11 +222,11 @@
             <data-source>resource3</data-source>
             <discovery-type algorithm-name="mgr2">
                 <properties>
-                    <property key="groupName" value="92504d5b-6dec-2"/>
+                    <property key="groupName" value="92504d5b-6dec-2" />
                 </properties>
             </discovery-type>
             <heartbeat>
-                <property key="keepAliveCron" value="0/6 * * * * ?"/>
+                <property key="keepAliveCron" value="0/6 * * * * ?" />
             </heartbeat>
         </rule>
     </create-database-discovery-definition-rule>
@@ -242,12 +242,12 @@
         <type discovery-type-name="primary_replica_ds_mgr">
             <algorithm algorithm-name="mgr">
                 <properties>
-                    <property key="groupName" value="92504d5b-6dec"/>
+                    <property key="groupName" value="92504d5b-6dec" />
                 </properties>
             </algorithm>
         </type>
         <type discovery-type-name="primary_replica_ds_mgr_2">
-            <algorithm algorithm-name="mgr"/>
+            <algorithm algorithm-name="mgr" />
         </type>
     </create-database-discovery-type>
 
@@ -255,7 +255,7 @@
     <create-database-discovery-heartbeat sql-case-id="create-database-discovery-heartbeat">
         <rule heartbeat-name="mgr_heartbeat" >
             <properties>
-                <property key="keepAliveCron" value="0/5 * * * * ?"/>
+                <property key="keepAliveCron" value="0/5 * * * * ?" />
             </properties>
         </rule>
     </create-database-discovery-heartbeat>