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

jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 232031b7fb5 Refactor RDLStatement, separate 
GlobalRuleDefinitionStatement and DatabaseRuleDefinitionStatement (#30244)
232031b7fb5 is described below

commit 232031b7fb50240b8e6e7d1e9abcc1d94343bec8
Author: ChenJiaHao <[email protected]>
AuthorDate: Thu Feb 22 19:16:35 2024 +0800

    Refactor RDLStatement, separate GlobalRuleDefinitionStatement and 
DatabaseRuleDefinitionStatement (#30244)
    
    * Refactor RDLStatement, split GlobalRuleDefinitionStatement and 
DatabaseRuleDefinitionStatement
    
    * Fix DistSQLUpdateExecuteEngine
---
 .../statement/CreateBroadcastTableRuleStatement.java       |  2 +-
 .../distsql/statement/DropBroadcastTableRuleStatement.java |  2 +-
 .../distsql/statement/AlterEncryptRuleStatement.java       |  2 +-
 .../distsql/statement/CreateEncryptRuleStatement.java      |  2 +-
 .../distsql/statement/DropEncryptRuleStatement.java        |  2 +-
 .../mask/distsql/statement/AlterMaskRuleStatement.java     |  2 +-
 .../mask/distsql/statement/CreateMaskRuleStatement.java    |  2 +-
 .../mask/distsql/statement/DropMaskRuleStatement.java      |  2 +-
 .../statement/AlterReadwriteSplittingRuleStatement.java    |  2 +-
 .../statement/CreateReadwriteSplittingRuleStatement.java   |  2 +-
 .../statement/DropReadwriteSplittingRuleStatement.java     |  2 +-
 .../statement/AlterDefaultShadowAlgorithmStatement.java    |  2 +-
 .../distsql/statement/AlterShadowAlgorithmStatement.java   |  2 +-
 .../shadow/distsql/statement/AlterShadowRuleStatement.java |  2 +-
 .../statement/CreateDefaultShadowAlgorithmStatement.java   |  2 +-
 .../distsql/statement/CreateShadowRuleStatement.java       |  2 +-
 .../statement/DropDefaultShadowAlgorithmStatement.java     |  2 +-
 .../distsql/statement/DropShadowAlgorithmStatement.java    |  2 +-
 .../shadow/distsql/statement/DropShadowRuleStatement.java  |  2 +-
 .../statement/AlterDefaultShardingStrategyStatement.java   |  2 +-
 .../AlterShardingTableReferenceRuleStatement.java          |  4 ++--
 .../distsql/statement/AlterShardingTableRuleStatement.java |  2 +-
 .../statement/CreateDefaultShardingStrategyStatement.java  |  2 +-
 .../CreateShardingTableReferenceRuleStatement.java         |  2 +-
 .../statement/CreateShardingTableRuleStatement.java        |  2 +-
 .../statement/DropDefaultShardingStrategyStatement.java    |  2 +-
 .../distsql/statement/DropShardingAlgorithmStatement.java  |  2 +-
 .../distsql/statement/DropShardingAuditorStatement.java    |  2 +-
 .../statement/DropShardingKeyGeneratorStatement.java       |  2 +-
 .../statement/DropShardingTableReferenceRuleStatement.java |  2 +-
 .../distsql/statement/DropShardingTableRuleStatement.java  |  2 +-
 .../handler/engine/update/DistSQLUpdateExecuteEngine.java  | 12 +++++++-----
 .../database/DatabaseRuleDefinitionExecuteEngine.java      |  4 ++--
 .../rdl/rule/engine/database/DatabaseRuleOperator.java     |  6 +++---
 .../engine/database/type/AlterDatabaseRuleOperator.java    |  4 ++--
 .../engine/database/type/CreateDatabaseRuleOperator.java   |  4 ++--
 .../engine/database/type/DropDatabaseRuleOperator.java     |  4 ++--
 .../engine/global/GlobalRuleDefinitionExecuteEngine.java   |  6 +++---
 .../legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java  | 14 +++++++-------
 .../legacy/LegacyGlobalRuleDefinitionExecuteEngine.java    |  6 +++---
 .../rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java  |  6 +++---
 .../handler/required/DistSQLExecutorRequiredChecker.java   |  4 ++--
 .../statement/updatable/AlterGlobalClockRuleStatement.java |  4 ++--
 .../distsql/statement/rdl/LoadSingleTableStatement.java    |  2 +-
 .../rdl/SetDefaultSingleTableStorageUnitStatement.java     |  2 +-
 .../distsql/statement/rdl/UnloadSingleTableStatement.java  |  2 +-
 .../updatable/AlterSQLFederationRuleStatement.java         |  4 ++--
 .../statement/updatable/AlterSQLParserRuleStatement.java   |  4 ++--
 .../updateable/AlterSQLTranslatorRuleStatement.java        |  4 ++--
 .../statement/updatable/AlterTrafficRuleStatement.java     |  4 ++--
 .../statement/updatable/AlterTransactionRuleStatement.java |  4 ++--
 .../statement/rdl/rule/RuleDefinitionStatement.java        |  2 +-
 .../DatabaseRuleDefinitionStatement.java}                  |  6 +++---
 .../rdl/rule/{ => database}/type/AlterRuleStatement.java   |  6 +++---
 .../rdl/rule/{ => database}/type/CreateRuleStatement.java  |  6 +++---
 .../rdl/rule/{ => database}/type/DropRuleStatement.java    |  6 +++---
 .../GlobalRuleDefinitionStatement.java}                    |  6 +++---
 .../distsql/fixture/CreateFixtureRuleStatement.java        |  2 +-
 .../internal/asserts/statement/rdl/RDLStatementAssert.java |  6 +++---
 .../statement/rdl/alter/AlterRuleStatementAssert.java      |  2 +-
 .../statement/rdl/create/CreateRuleStatementAssert.java    |  2 +-
 .../statement/rdl/drop/DropRuleStatementAssert.java        |  2 +-
 62 files changed, 106 insertions(+), 104 deletions(-)

diff --git 
a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java
 
b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java
index cc6efbf629e..ad09bddbd91 100644
--- 
a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java
+++ 
b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.broadcast.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java
 
b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java
index c71828dd73a..b8373b7c3b9 100644
--- 
a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java
+++ 
b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.broadcast.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java
 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java
index 687004a1517..367c30236fa 100644
--- 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java
+++ 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java
 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java
index bea4efebb90..6417dc3f9ae 100644
--- 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java
+++ 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.encrypt.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java
 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java
index 559ae4a38cb..3e28440b688 100644
--- 
a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java
+++ 
b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.encrypt.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java
 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java
index e3e44cb85c9..26b7446a716 100644
--- 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java
+++ 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mask.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java
 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java
index 7d387349bea..217f2784a10 100644
--- 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java
+++ 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mask.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java
 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java
index 2b4166e2a56..80a9bb58609 100644
--- 
a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java
+++ 
b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mask.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java
 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java
index 4196c2a636c..d5179b2446b 100644
--- 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java
+++ 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.readwritesplitting.distsql.statement;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java
 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java
index 384fa1caba2..6646b53d3a2 100644
--- 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java
+++ 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.readwritesplitting.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import 
org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java
 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java
index 30fb34b3c2c..63bb2595dbf 100644
--- 
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java
+++ 
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.readwritesplitting.distsql.statement;
 
 import lombok.Getter;
 import 
org.apache.shardingsphere.distsql.statement.rdl.rule.aware.StaticDataSourceContainedRuleAwareStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java
index 5be96cf26f2..87ed757f8e5 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment;
 
 /**
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java
index bbc03f33b86..5d458e68297 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment;
 
 import java.util.Collection;
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java
index 621f0950301..2daae94ce34 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java
index 6cc6a3799a1..2c3da929533 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment;
 
 /**
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java
index 70beb009502..a3a31836093 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java
index f09c915ad1b..350026486b4 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.distsql.statement;
 
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 /**
  * Drop default shadow algorithm statement.
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java
index 14050fa0b60..1104281cc05 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java
 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java
index 39ea258f38f..284dcc35cdf 100644
--- 
a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java
+++ 
b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java
index f15d38264b3..fe9174ed40c 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.distsql.statement;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 
 /**
  * Alter default sharding strategy statement.
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java
index d9a98b52623..fe9330b96dc 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import 
org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment;
 
 import java.util.Collection;
@@ -36,7 +36,7 @@ public final class AlterShardingTableReferenceRuleStatement 
extends AlterRuleSta
     
     /**
      * Get table names.
-     * 
+     *
      * @return table names
      */
     public Collection<String> getTableNames() {
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java
index ca38e26b427..af70f248057 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import 
org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java
index 7437e3b9c8c..2f7722921c3 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
 import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 
 /**
  * Create default sharding strategy statement.
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java
index afeb000b09c..7c0d2a34cd3 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import 
org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java
index e65f0bc7ae8..2d4634975fa 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import 
org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment;
 
 import java.util.Collection;
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java
index 26863d61254..91fd43e05f6 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 /**
  * Drop default sharding strategy statement.
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java
index ce76f0711be..b6201731b42 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java
index b618b236a7f..d6180eb192e 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java
index 8b3b0235a58..687548fa604 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java
index 0b53d793b50..c0497629b3f 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java
 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java
index b8dc89889fc..45609a6bcaf 100644
--- 
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java
+++ 
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.distsql.statement;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
 
 import java.util.Collection;
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
index b041d2b2fb5..5979665546f 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
@@ -28,6 +28,8 @@ import 
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequire
 import org.apache.shardingsphere.distsql.handler.util.DatabaseNameUtils;
 import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
 import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -54,7 +56,7 @@ public final class DistSQLUpdateExecuteEngine {
     
     /**
      * Execute update.
-     * 
+     *
      * @throws SQLException SQL exception
      */
     public void executeUpdate() throws SQLException {
@@ -78,20 +80,20 @@ public final class DistSQLUpdateExecuteEngine {
     @SuppressWarnings("rawtypes")
     private void executeDatabaseRuleDefinitionUpdate(final 
DatabaseRuleDefinitionExecutor executor) {
         if (isNormalRuleUpdater()) {
-            new DatabaseRuleDefinitionExecuteEngine((RuleDefinitionStatement) 
sqlStatement, contextManager, contextManager.getDatabase(databaseName), 
executor).executeUpdate();
+            new 
DatabaseRuleDefinitionExecuteEngine((DatabaseRuleDefinitionStatement) 
sqlStatement, contextManager, contextManager.getDatabase(databaseName), 
executor).executeUpdate();
         } else {
             // TODO Remove when metadata structure adjustment completed. #25485
-            new 
LegacyDatabaseRuleDefinitionExecuteEngine((RuleDefinitionStatement) 
sqlStatement, contextManager, contextManager.getDatabase(databaseName), 
executor).executeUpdate();
+            new 
LegacyDatabaseRuleDefinitionExecuteEngine((DatabaseRuleDefinitionStatement) 
sqlStatement, contextManager, contextManager.getDatabase(databaseName), 
executor).executeUpdate();
         }
     }
     
     @SuppressWarnings("rawtypes")
     private void executeGlobalRuleDefinitionUpdate(final 
GlobalRuleDefinitionExecutor executor) {
         if (isNormalRuleUpdater()) {
-            new GlobalRuleDefinitionExecuteEngine((RuleDefinitionStatement) 
sqlStatement, contextManager, executor).executeUpdate();
+            new 
GlobalRuleDefinitionExecuteEngine((GlobalRuleDefinitionStatement) sqlStatement, 
contextManager, executor).executeUpdate();
         } else {
             // TODO Remove when metadata structure adjustment completed. #25485
-            new 
LegacyGlobalRuleDefinitionExecuteEngine((RuleDefinitionStatement) sqlStatement, 
contextManager, executor).executeUpdate();
+            new 
LegacyGlobalRuleDefinitionExecuteEngine((GlobalRuleDefinitionStatement) 
sqlStatement, contextManager, executor).executeUpdate();
         }
     }
     
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
index 7e9bbaceb52..d8ee7d33b03 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleDefinitionExecuteEngine.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequiredChecker;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -35,7 +35,7 @@ import java.util.Optional;
 @RequiredArgsConstructor
 public final class DatabaseRuleDefinitionExecuteEngine {
     
-    private final RuleDefinitionStatement sqlStatement;
+    private final DatabaseRuleDefinitionStatement sqlStatement;
     
     private final ContextManager contextManager;
     
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperator.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperator.java
index 54f7c417016..523ea733e1c 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperator.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/DatabaseRuleOperator.java
@@ -17,7 +17,7 @@
 
 package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.database;
 
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
@@ -31,11 +31,11 @@ public interface DatabaseRuleOperator {
     
     /**
      * Operate rule change.
-     * 
+     *
      * @param sqlStatement SQL statement
      * @param database database
      * @param currentRuleConfig current rule configuration
      * @return meta data versions
      */
-    Collection<MetaDataVersion> operate(RuleDefinitionStatement sqlStatement, 
ShardingSphereDatabase database, RuleConfiguration currentRuleConfig);
+    Collection<MetaDataVersion> operate(DatabaseRuleDefinitionStatement 
sqlStatement, ShardingSphereDatabase database, RuleConfiguration 
currentRuleConfig);
 }
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
index 1deb4dbab45..89b9c9a6061 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/AlterDatabaseRuleOperator.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.database.DatabaseRuleOperator;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleAlterExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.config.rule.decorator.RuleConfigurationDecorator;
 import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
@@ -47,7 +47,7 @@ public final class AlterDatabaseRuleOperator implements 
DatabaseRuleOperator {
     
     @Override
     @SuppressWarnings("unchecked")
-    public Collection<MetaDataVersion> operate(final RuleDefinitionStatement 
sqlStatement, final ShardingSphereDatabase database, final RuleConfiguration 
currentRuleConfig) {
+    public Collection<MetaDataVersion> operate(final 
DatabaseRuleDefinitionStatement sqlStatement, final ShardingSphereDatabase 
database, final RuleConfiguration currentRuleConfig) {
         RuleConfiguration toBeAlteredRuleConfig = 
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
         ModeContextManager modeContextManager = 
contextManager.getInstanceContext().getModeContextManager();
         RuleConfiguration toBeDroppedRuleConfig = 
executor.buildToBeDroppedRuleConfiguration(toBeAlteredRuleConfig);
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
index 99a814a995f..919cac5cc2f 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/CreateDatabaseRuleOperator.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.database.DatabaseRuleOperator;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.config.rule.decorator.RuleConfigurationDecorator;
 import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
@@ -47,7 +47,7 @@ public final class CreateDatabaseRuleOperator implements 
DatabaseRuleOperator {
     
     @Override
     @SuppressWarnings("unchecked")
-    public Collection<MetaDataVersion> operate(final RuleDefinitionStatement 
sqlStatement, final ShardingSphereDatabase database, final RuleConfiguration 
currentRuleConfig) {
+    public Collection<MetaDataVersion> operate(final 
DatabaseRuleDefinitionStatement sqlStatement, final ShardingSphereDatabase 
database, final RuleConfiguration currentRuleConfig) {
         RuleConfiguration toBeCreatedRuleConfig = 
executor.buildToBeCreatedRuleConfiguration(sqlStatement);
         ModeContextManager modeContextManager = 
contextManager.getInstanceContext().getModeContextManager();
         return modeContextManager.alterRuleConfiguration(database.getName(), 
decorateRuleConfiguration(database, toBeCreatedRuleConfig));
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
index 6a2154a0646..6792265b4eb 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/database/type/DropDatabaseRuleOperator.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.database.DatabaseRuleOperator;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import 
org.apache.shardingsphere.distsql.statement.rdl.rule.aware.StaticDataSourceContainedRuleAwareStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
@@ -47,7 +47,7 @@ public final class DropDatabaseRuleOperator implements 
DatabaseRuleOperator {
     
     @Override
     @SuppressWarnings("unchecked")
-    public Collection<MetaDataVersion> operate(final RuleDefinitionStatement 
sqlStatement, final ShardingSphereDatabase database, final RuleConfiguration 
currentRuleConfig) {
+    public Collection<MetaDataVersion> operate(final 
DatabaseRuleDefinitionStatement sqlStatement, final ShardingSphereDatabase 
database, final RuleConfiguration currentRuleConfig) {
         if (!executor.hasAnyOneToBeDropped(sqlStatement)) {
             return Collections.emptyList();
         }
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
index fb0d9cc6149..77d67dfc55e 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.
 
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -32,7 +32,7 @@ import java.util.Collection;
 @RequiredArgsConstructor
 public final class GlobalRuleDefinitionExecuteEngine {
     
-    private final RuleDefinitionStatement sqlStatement;
+    private final GlobalRuleDefinitionStatement sqlStatement;
     
     private final ContextManager contextManager;
     
@@ -51,7 +51,7 @@ public final class GlobalRuleDefinitionExecuteEngine {
     }
     
     @SuppressWarnings("unchecked")
-    private RuleConfiguration processUpdate(final RuleDefinitionStatement 
sqlStatement, final ShardingSphereRule rule) {
+    private RuleConfiguration processUpdate(final 
GlobalRuleDefinitionStatement sqlStatement, final ShardingSphereRule rule) {
         RuleConfiguration result = 
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
         Collection<RuleConfiguration> ruleConfigs = 
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
         ruleConfigs.remove(rule.getConfiguration());
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
index 28457367044..b1d984d666a 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyDatabaseRuleDefinitionExecuteEngine.java
@@ -23,7 +23,7 @@ import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.data
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import 
org.apache.shardingsphere.infra.config.rule.decorator.RuleConfigurationDecorator;
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException;
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public final class LegacyDatabaseRuleDefinitionExecuteEngine {
     
-    private final RuleDefinitionStatement sqlStatement;
+    private final DatabaseRuleDefinitionStatement sqlStatement;
     
     private final ContextManager contextManager;
     
@@ -83,8 +83,8 @@ public final class LegacyDatabaseRuleDefinitionExecuteEngine {
     }
     
     @SuppressWarnings("rawtypes")
-    private Collection<RuleConfiguration> processSQLStatement(final 
ShardingSphereDatabase database,
-                                                              final 
RuleDefinitionStatement sqlStatement, final DatabaseRuleDefinitionExecutor 
executor, final RuleConfiguration currentRuleConfig) {
+    private Collection<RuleConfiguration> processSQLStatement(final 
ShardingSphereDatabase database, final DatabaseRuleDefinitionStatement 
sqlStatement,
+                                                              final 
DatabaseRuleDefinitionExecutor executor, final RuleConfiguration 
currentRuleConfig) {
         Collection<RuleConfiguration> result = new 
LinkedList<>(database.getRuleMetaData().getConfigurations());
         if (executor instanceof DatabaseRuleCreateExecutor) {
             if (null != currentRuleConfig) {
@@ -105,7 +105,7 @@ public final class 
LegacyDatabaseRuleDefinitionExecuteEngine {
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private RuleConfiguration processCreate(final RuleDefinitionStatement 
sqlStatement, final DatabaseRuleCreateExecutor executor, final 
RuleConfiguration currentRuleConfig) {
+    private RuleConfiguration processCreate(final 
DatabaseRuleDefinitionStatement sqlStatement, final DatabaseRuleCreateExecutor 
executor, final RuleConfiguration currentRuleConfig) {
         RuleConfiguration toBeCreatedRuleConfig = 
executor.buildToBeCreatedRuleConfiguration(sqlStatement);
         if (null == currentRuleConfig) {
             return toBeCreatedRuleConfig;
@@ -115,14 +115,14 @@ public final class 
LegacyDatabaseRuleDefinitionExecuteEngine {
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private RuleConfiguration processAlter(final RuleDefinitionStatement 
sqlStatement, final DatabaseRuleAlterExecutor executor, final RuleConfiguration 
currentRuleConfig) {
+    private RuleConfiguration processAlter(final 
DatabaseRuleDefinitionStatement sqlStatement, final DatabaseRuleAlterExecutor 
executor, final RuleConfiguration currentRuleConfig) {
         RuleConfiguration toBeAlteredRuleConfig = 
executor.buildToBeAlteredRuleConfiguration(sqlStatement);
         executor.updateCurrentRuleConfiguration(currentRuleConfig, 
toBeAlteredRuleConfig);
         return currentRuleConfig;
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private void processDrop(final ShardingSphereDatabase database, final 
Collection<RuleConfiguration> configs, final RuleDefinitionStatement 
sqlStatement,
+    private void processDrop(final ShardingSphereDatabase database, final 
Collection<RuleConfiguration> configs, final DatabaseRuleDefinitionStatement 
sqlStatement,
                              final DatabaseRuleDropExecutor executor, final 
RuleConfiguration currentRuleConfig) {
         if (!executor.hasAnyOneToBeDropped(sqlStatement)) {
             return;
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyGlobalRuleDefinitionExecuteEngine.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyGlobalRuleDefinitionExecuteEngine.java
index a1a0d9e1db7..4a885325f5b 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyGlobalRuleDefinitionExecuteEngine.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/legacy/LegacyGlobalRuleDefinitionExecuteEngine.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.
 
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -34,7 +34,7 @@ import java.util.LinkedList;
 @RequiredArgsConstructor
 public final class LegacyGlobalRuleDefinitionExecuteEngine {
     
-    private final RuleDefinitionStatement sqlStatement;
+    private final GlobalRuleDefinitionStatement sqlStatement;
     
     private final ContextManager contextManager;
     
@@ -53,7 +53,7 @@ public final class LegacyGlobalRuleDefinitionExecuteEngine {
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private Collection<RuleConfiguration> processUpdate(final 
RuleDefinitionStatement sqlStatement, final GlobalRuleDefinitionExecutor 
executor, final RuleConfiguration currentRuleConfig) {
+    private Collection<RuleConfiguration> processUpdate(final 
GlobalRuleDefinitionStatement sqlStatement, final GlobalRuleDefinitionExecutor 
executor, final RuleConfiguration currentRuleConfig) {
         Collection<RuleConfiguration> ruleConfigs = 
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
         Collection<RuleConfiguration> result = new LinkedList<>(ruleConfigs);
         result.remove(currentRuleConfig);
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
index b3ec8d3b29b..b1baf56b402 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
@@ -18,7 +18,7 @@
 package 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global;
 
 import 
org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
@@ -26,12 +26,12 @@ import 
org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 
 /**
  * Global rule definition executor.
- * 
+ *
  * @param <T> type of rule definition statement
  * @param <R> type of rule
  */
 @SingletonSPI
-public interface GlobalRuleDefinitionExecutor<T extends 
RuleDefinitionStatement, R extends ShardingSphereRule> extends 
DistSQLExecutorRuleAware<R>, TypedSPI {
+public interface GlobalRuleDefinitionExecutor<T extends 
GlobalRuleDefinitionStatement, R extends ShardingSphereRule> extends 
DistSQLExecutorRuleAware<R>, TypedSPI {
     
     /**
      * Check before update.
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
index ff798aa4342..09948c94d42 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.distsql.handler.required;
 
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 import 
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -39,7 +39,7 @@ public final class DistSQLExecutorRequiredChecker {
     
     /**
      * Check before DistSQL execute.
-     * 
+     *
      * @param sqlStatement SQL statement
      * @param contextManager context manager
      * @param database database
diff --git 
a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
 
b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
index 1556ee6d6ae..82855f5340a 100644
--- 
a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
+++ 
b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.globalclock.distsql.statement.updatable;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 
 import java.util.Properties;
 
@@ -28,7 +28,7 @@ import java.util.Properties;
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterGlobalClockRuleStatement extends AlterRuleStatement {
+public final class AlterGlobalClockRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final String type;
     
diff --git 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java
 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java
index 91d71cc1222..950f389dc03 100644
--- 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java
+++ 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.single.distsql.statement.rdl;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import org.apache.shardingsphere.single.distsql.segment.SingleTableSegment;
 
 import java.util.Collection;
diff --git 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java
 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java
index a85b86698c8..5a712526959 100644
--- 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java
+++ 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.single.distsql.statement.rdl;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 
 /**
  * Set default single table storage unit statement.
diff --git 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java
 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java
index d7f71bac9ba..7abf60b72ca 100644
--- 
a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java
+++ 
b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.single.distsql.statement.rdl;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 
 import java.util.Collection;
 
diff --git 
a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
 
b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
index 7d32fd31f4b..33feafae0c0 100644
--- 
a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
+++ 
b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.sqlfederation.distsql.statement.updatable;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import 
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment;
 
 /**
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegmen
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterSQLFederationRuleStatement extends AlterRuleStatement {
+public final class AlterSQLFederationRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final Boolean sqlFederationEnabled;
     
diff --git 
a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
 
b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
index d9aba8258aa..988a36084ee 100644
--- 
a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
+++ 
b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.parser.distsql.statement.updatable;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
 
 /**
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterSQLParserRuleStatement extends AlterRuleStatement {
+public final class AlterSQLParserRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final CacheOptionSegment parseTreeCache;
     
diff --git 
a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
 
b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
index b9f5ea5fade..4dc35342bab 100644
--- 
a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
+++ 
b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
@@ -20,14 +20,14 @@ package 
org.apache.shardingsphere.sqltranslator.distsql.statement.updateable;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 
 /**
  * Alter SQL translator rule statement.
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterSQLTranslatorRuleStatement extends AlterRuleStatement {
+public final class AlterSQLTranslatorRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final AlgorithmSegment provider;
     
diff --git 
a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
 
b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
index 3d6200a416d..094ed3657dd 100644
--- 
a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
+++ 
b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.traffic.distsql.statement.updatable;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment;
 
 import java.util.Collection;
@@ -29,7 +29,7 @@ import java.util.Collection;
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterTrafficRuleStatement extends AlterRuleStatement {
+public final class AlterTrafficRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final Collection<TrafficRuleSegment> segments;
 }
diff --git 
a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
 
b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
index 622730f7d9e..aabc00292ce 100644
--- 
a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
+++ 
b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.transaction.distsql.statement.updatable;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.global.GlobalRuleDefinitionStatement;
 import 
org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment;
 
 /**
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.transaction.distsql.segment.TransactionProvider
  */
 @RequiredArgsConstructor
 @Getter
-public final class AlterTransactionRuleStatement extends AlterRuleStatement {
+public final class AlterTransactionRuleStatement extends 
GlobalRuleDefinitionStatement {
     
     private final String defaultType;
     
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
index 5fc63a31d89..9ead44c4041 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.statement.rdl.rule;
 import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
 
 /**
- * Rule definition statement.
+ * Database rule definition statement.
  */
 public abstract class RuleDefinitionStatement extends RDLStatement {
 }
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/DatabaseRuleDefinitionStatement.java
similarity index 81%
copy from 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
copy to 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/DatabaseRuleDefinitionStatement.java
index 8662adc2ebb..07b07cf59fe 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/DatabaseRuleDefinitionStatement.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.database;
 
 import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
 
 /**
- * Alter rule statement.
+ * Database rule definition statement.
  */
-public abstract class AlterRuleStatement extends RuleDefinitionStatement {
+public abstract class DatabaseRuleDefinitionStatement extends 
RuleDefinitionStatement {
 }
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/AlterRuleStatement.java
similarity index 76%
copy from 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
copy to 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/AlterRuleStatement.java
index 8662adc2ebb..d7b90b8d413 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/AlterRuleStatement.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.database.type;
 
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 
 /**
  * Alter rule statement.
  */
-public abstract class AlterRuleStatement extends RuleDefinitionStatement {
+public abstract class AlterRuleStatement extends 
DatabaseRuleDefinitionStatement {
 }
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/CreateRuleStatement.java
similarity index 80%
rename from 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
rename to 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/CreateRuleStatement.java
index 5db695c6fcf..a6d07bc9bba 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/CreateRuleStatement.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.database.type;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 
 /**
  * Create rule statement.
  */
 @RequiredArgsConstructor
 @Getter
-public abstract class CreateRuleStatement extends RuleDefinitionStatement {
+public abstract class CreateRuleStatement extends 
DatabaseRuleDefinitionStatement {
     
     private final boolean ifNotExists;
     
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/DropRuleStatement.java
similarity index 80%
rename from 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
rename to 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/DropRuleStatement.java
index 05a74219278..6ca79610d88 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/database/type/DropRuleStatement.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.database.type;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.DatabaseRuleDefinitionStatement;
 
 /**
  * Drop rule statement.
  */
 @RequiredArgsConstructor
 @Getter
-public abstract class DropRuleStatement extends RuleDefinitionStatement {
+public abstract class DropRuleStatement extends 
DatabaseRuleDefinitionStatement {
     
     private final boolean ifExists;
     
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/global/GlobalRuleDefinitionStatement.java
similarity index 82%
rename from 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
rename to 
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/global/GlobalRuleDefinitionStatement.java
index 8662adc2ebb..90265f2a6ab 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/global/GlobalRuleDefinitionStatement.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.global;
 
 import 
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
 
 /**
- * Alter rule statement.
+ * Global rule definition statement.
  */
-public abstract class AlterRuleStatement extends RuleDefinitionStatement {
+public abstract class GlobalRuleDefinitionStatement extends 
RuleDefinitionStatement {
 }
diff --git 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java
 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java
index b194e41b154..0ad1252c95c 100644
--- 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java
+++ 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.proxy.backend.handler.distsql.fixture;
 
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 
 public final class CreateFixtureRuleStatement extends CreateRuleStatement {
 }
diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
index 9673a801ee1..e4eef347b9a 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
@@ -20,11 +20,11 @@ package 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import 
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import 
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 import 
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
 import 
org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
 import 
org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement;
diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java
index 9926e5aa603..75de5146c78 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java
@@ -19,7 +19,7 @@ package 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.AlterRuleStatement;
 import 
org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement;
 import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement;
 import 
org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement;
diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java
index 1995cd7ce59..a08ef083dfc 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import 
org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.CreateRuleStatement;
 import 
org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement;
 import 
org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement;
 import 
org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement;
diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
index dc810d8aec4..dbe19146891 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import 
org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement;
-import 
org.apache.shardingsphere.distsql.statement.rdl.rule.type.DropRuleStatement;
+import 
org.apache.shardingsphere.distsql.statement.rdl.rule.database.type.DropRuleStatement;
 import 
org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement;
 import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement;
 import 
org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement;


Reply via email to