This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 f3a6254cde7 Add ResourceDefinitionStatement as parent class of
StorageUnitDefinitionStatement (#29825)
f3a6254cde7 is described below
commit f3a6254cde7192a2e67dcf932608a63115abb919
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 24 15:32:06 2024 +0800
Add ResourceDefinitionStatement as parent class of
StorageUnitDefinitionStatement (#29825)
* Refactor CreateDatabaseRuleRDLExecuteEngine
* Add ResourceDefinitionStatement as parent class of
StorageUnitDefinitionStatement
---
.../plugin/metrics/core/advice/SQLParseCountAdviceTest.java | 2 +-
.../distsql/statement/CreateBroadcastTableRuleStatement.java | 2 +-
.../distsql/statement/DropBroadcastTableRuleStatement.java | 2 +-
.../encrypt/distsql/statement/AlterEncryptRuleStatement.java | 2 +-
.../distsql/statement/CreateEncryptRuleStatement.java | 2 +-
.../encrypt/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 +-
.../shadow/distsql/statement/CreateShadowRuleStatement.java | 2 +-
.../statement/DropDefaultShadowAlgorithmStatement.java | 2 +-
.../distsql/statement/DropShadowAlgorithmStatement.java | 2 +-
.../shadow/distsql/statement/DropShadowRuleStatement.java | 2 +-
.../statement/AlterDefaultShardingStrategyStatement.java | 2 +-
.../statement/AlterShardingTableReferenceRuleStatement.java | 2 +-
.../distsql/statement/AlterShardingTableRuleStatement.java | 2 +-
.../statement/CreateDefaultShardingStrategyStatement.java | 2 +-
.../statement/CreateShardingTableReferenceRuleStatement.java | 2 +-
.../distsql/statement/CreateShardingTableRuleStatement.java | 2 +-
.../statement/DropDefaultShardingStrategyStatement.java | 2 +-
.../distsql/statement/DropShardingAlgorithmStatement.java | 2 +-
.../distsql/statement/DropShardingAuditorStatement.java | 2 +-
.../distsql/statement/DropShardingKeyGeneratorStatement.java | 2 +-
.../statement/DropShardingTableReferenceRuleStatement.java | 2 +-
.../distsql/statement/DropShardingTableRuleStatement.java | 2 +-
.../type/rdl/resource/ResourceDefinitionExecutor.java | 6 +++---
.../aware/DatabaseAwareResourceDefinitionExecutor.java | 6 +++---
.../type/rdl/rule/global/GlobalRuleDefinitionExecutor.java | 2 +-
.../statement/updatable/AlterGlobalClockRuleStatement.java | 2 +-
.../distsql/statement/rdl/LoadSingleTableStatement.java | 2 +-
.../rdl/SetDefaultSingleTableStorageUnitStatement.java | 2 +-
.../distsql/statement/rdl/UnloadSingleTableStatement.java | 2 +-
.../statement/updatable/AlterSQLFederationRuleStatement.java | 2 +-
.../statement/updatable/AlterSQLParserRuleStatement.java | 2 +-
.../updateable/AlterSQLTranslatorRuleStatement.java | 2 +-
.../statement/updatable/AlterTrafficRuleStatement.java | 2 +-
.../shardingsphere/transaction/util/AutoCommitUtilsTest.java | 2 +-
.../statement/updatable/AlterTransactionRuleStatement.java | 2 +-
.../parser/core/kernel/KernelDistSQLStatementVisitor.java | 6 +++---
.../distsql/parser/rdl/RegisterStorageUnitTest.java | 2 +-
.../ResourceDefinitionStatement.java} | 8 +++++---
.../{ => resource/unit}/StorageUnitDefinitionStatement.java | 6 ++++--
.../unit/type}/AlterStorageUnitStatement.java | 4 ++--
.../unit/type}/RegisterStorageUnitStatement.java | 4 ++--
.../unit/type}/UnregisterStorageUnitStatement.java | 4 ++--
.../statement/rdl/{ => rule}/RuleDefinitionStatement.java | 4 +++-
.../rdl/{alter => rule/type}/AlterRuleStatement.java | 4 ++--
.../rdl/{create => rule/type}/CreateRuleStatement.java | 4 ++--
.../statement/rdl/{drop => rule/type}/DropRuleStatement.java | 4 ++--
.../handler/distsql/rdl/RDLBackendHandlerFactory.java | 10 +++++-----
.../rdl/resource/ResourceDefinitionBackendHandler.java | 4 ++--
.../distsql/rdl/resource/type/AlterStorageUnitExecutor.java | 2 +-
.../rdl/resource/type/RegisterStorageUnitExecutor.java | 2 +-
.../rdl/resource/type/UnregisterStorageUnitExecutor.java | 2 +-
.../distsql/rdl/rule/RuleDefinitionBackendHandler.java | 2 +-
.../distsql/rdl/rule/database/DatabaseRuleUpdater.java | 2 +-
.../rule/database/execute/DatabaseRuleRDLExecuteEngine.java | 2 +-
.../execute/type/AlterDatabaseRuleRDLExecuteEngine.java | 2 +-
.../execute/type/CreateDatabaseRuleRDLExecuteEngine.java | 2 +-
.../execute/type/DropDatabaseRuleRDLExecuteEngine.java | 2 +-
.../handler/distsql/rdl/rule/global/GlobalRuleUpdater.java | 2 +-
.../distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java | 2 +-
.../rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java | 2 +-
.../handler/distsql/DistSQLBackendHandlerFactoryTest.java | 6 +++---
.../handler/distsql/fixture/CreateFixtureRuleStatement.java | 2 +-
.../distsql/rdl/resource/AlterStorageUnitExecutorTest.java | 2 +-
.../rdl/resource/RegisterStorageUnitExecutorTest.java | 2 +-
.../rdl/resource/UnregisterStorageUnitExecutorTest.java | 2 +-
.../postgresql/command/query/PostgreSQLCommandTest.java | 2 +-
.../internal/asserts/statement/rdl/RDLStatementAssert.java | 12 ++++++------
.../statement/rdl/alter/AlterRuleStatementAssert.java | 2 +-
.../statement/rdl/alter/AlterStorageUnitStatementAssert.java | 2 +-
.../statement/rdl/create/CreateRuleStatementAssert.java | 2 +-
.../rdl/create/RegisterStorageUnitStatementAssert.java | 2 +-
.../asserts/statement/rdl/drop/DropRuleStatementAssert.java | 2 +-
.../rdl/drop/UnregisterStorageUnitStatementAssert.java | 2 +-
83 files changed, 116 insertions(+), 110 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
index 76d83e732b7..9326c2d73d7 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollecto
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
import
org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.MetricsCollectorFixture;
import
org.apache.shardingsphere.agent.plugin.metrics.core.fixture.TargetAdviceObjectFixture;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement;
import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement;
import
org.apache.shardingsphere.data.pipeline.migration.distsql.statement.ShowMigrationListStatement;
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 63fbf72d255..cc6efbf629e 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 587ea2777a3..c71828dd73a 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 fa3e3c2dc55..687004a1517 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 0b2edf361f0..bea4efebb90 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 8b1d2137885..559ae4a38cb 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 c51fb82465d..e3e44cb85c9 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 82d85ea8d19..7d387349bea 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 3a7ff16f462..2b4166e2a56 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 0a8be6e32b6..4196c2a636c 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 5eb16ed48b0..384fa1caba2 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 249dff4dc9e..8d1e29d65e1 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.statement;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 d719be6fc12..5be96cf26f2 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 d70e5177035..bbc03f33b86 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 54a53f76936..621f0950301 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 86df1b5daed..6cc6a3799a1 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 57adb50d3e7..70beb009502 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 9f7c4f69a55..f09c915ad1b 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 df672fb4e64..14050fa0b60 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 c91a1f939ce..39ea258f38f 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 62b520396ea..f15d38264b3 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 8d824a4b6a5..d9a98b52623 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.type.AlterRuleStatement;
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/AlterShardingTableRuleStatement.java
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java
index 410639f1f04..ca38e26b427 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 335539b16ce..7437e3b9c8c 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 5c4e1c91897..afeb000b09c 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 f5ba08924d5..e65f0bc7ae8 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 45b9f5848a2..26863d61254 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 17b3442790f..ce76f0711be 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 145f4e3af54..b618b236a7f 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 ef3f49c33d0..8b3b0235a58 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 8990476f0b0..0b53d793b50 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 3ffbac8ec6b..b8dc89889fc 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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/type/rdl/resource/ResourceDefinitionExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/ResourceDefinitionExecutor.java
index ca57a1072ff..d090239951b 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/ResourceDefinitionExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/ResourceDefinitionExecutor.java
@@ -17,17 +17,17 @@
package org.apache.shardingsphere.distsql.handler.type.rdl.resource;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.ResourceDefinitionStatement;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
/**
* Resource definition executor.
*
- * @param <T> type of storage unit definition statement
+ * @param <T> type of resource definition statement
*/
@SingletonSPI
-public interface ResourceDefinitionExecutor<T extends
StorageUnitDefinitionStatement> extends TypedSPI {
+public interface ResourceDefinitionExecutor<T extends
ResourceDefinitionStatement> extends TypedSPI {
/**
* Execute update.
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/aware/DatabaseAwareResourceDefinitionExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/aware/DatabaseAwareResourceDefinitionExecutor.java
index 449b8258b58..28e6d9ced46 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/aware/DatabaseAwareResourceDefinitionExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/resource/aware/DatabaseAwareResourceDefinitionExecutor.java
@@ -18,15 +18,15 @@
package org.apache.shardingsphere.distsql.handler.type.rdl.resource.aware;
import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.ResourceDefinitionExecutor;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.ResourceDefinitionStatement;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
/**
* Database aware resource definition executor.
*
- * @param <T> type of storage unit definition statement
+ * @param <T> type of resource definition statement
*/
-public interface DatabaseAwareResourceDefinitionExecutor<T extends
StorageUnitDefinitionStatement> extends ResourceDefinitionExecutor<T> {
+public interface DatabaseAwareResourceDefinitionExecutor<T extends
ResourceDefinitionStatement> extends ResourceDefinitionExecutor<T> {
/**
* Set database.
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/global/GlobalRuleDefinitionExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/global/GlobalRuleDefinitionExecutor.java
index baab3444dab..8a38ffad3d0 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/global/GlobalRuleDefinitionExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/rule/global/GlobalRuleDefinitionExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.distsql.handler.type.rdl.rule.global;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
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 05233d1892a..e9f66a009bf 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import java.util.Properties;
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 76265f1dc01..91d71cc1222 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 6f8e7770e71..a85b86698c8 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 c53f580e0b1..d7f71bac9ba 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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 847ac630c37..2e617ba7672 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment;
/**
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 f5aca5b0959..304c788ee73 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
/**
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 3a56511b9d0..0ac31f035d6 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,7 +20,7 @@ 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
/**
* Alter SQL translator rule statement.
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 d967123c8d0..0de032f48b1 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment;
import java.util.Collection;
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
index c5f0d5d20c9..151f4aa73af 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.transaction.util;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
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 1711b923341..409d508661a 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.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import
org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment;
/**
diff --git
a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index 3529b732876..441480c27fb 100644
---
a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++
b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -101,9 +101,9 @@ import
org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariable
import
org.apache.shardingsphere.distsql.statement.ral.updatable.SetInstanceStatusStatement;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowLogicalTablesStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesUsedStorageUnitStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement;
diff --git
a/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
b/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
index 98d5d3d66ae..870a3a65cff 100644
---
a/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
+++
b/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.distsql.parser.rdl;
import
org.apache.shardingsphere.distsql.parser.engine.api.DistSQLStatementParserEngine;
import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/ResourceDefinitionStatement.java
similarity index 77%
copy from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
copy to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/ResourceDefinitionStatement.java
index f8abfa64656..8bd73fcd62d 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/ResourceDefinitionStatement.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl;
+package org.apache.shardingsphere.distsql.statement.rdl.resource;
+
+import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
/**
- * Storage unit definition statement.
+ * Resource definition statement.
*/
-public abstract class StorageUnitDefinitionStatement extends RDLStatement {
+public abstract class ResourceDefinitionStatement extends RDLStatement {
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/StorageUnitDefinitionStatement.java
similarity index 76%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/StorageUnitDefinitionStatement.java
index f8abfa64656..b4fdc4991ac 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/StorageUnitDefinitionStatement.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl;
+package org.apache.shardingsphere.distsql.statement.rdl.resource.unit;
+
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.ResourceDefinitionStatement;
/**
* Storage unit definition statement.
*/
-public abstract class StorageUnitDefinitionStatement extends RDLStatement {
+public abstract class StorageUnitDefinitionStatement extends
ResourceDefinitionStatement {
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/AlterStorageUnitStatement.java
similarity index 87%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/AlterStorageUnitStatement.java
index be0913ae2b4..7a26c867c4d 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/AlterStorageUnitStatement.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.alter;
+package org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.StorageUnitDefinitionStatement;
import java.util.Collection;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/RegisterStorageUnitStatement.java
similarity index 87%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/RegisterStorageUnitStatement.java
index 146c7855a0e..84795ad9340 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/RegisterStorageUnitStatement.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.create;
+package org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.StorageUnitDefinitionStatement;
import java.util.Collection;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/UnregisterStorageUnitStatement.java
similarity index 89%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/UnregisterStorageUnitStatement.java
index d514f58e675..ab95066c31b 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/resource/unit/type/UnregisterStorageUnitStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.drop;
+package org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.StorageUnitDefinitionStatement;
import java.util.Collection;
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
similarity index 87%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
index 9f47d3e4cef..5fc63a31d89 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/RuleDefinitionStatement.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl;
+package org.apache.shardingsphere.distsql.statement.rdl.rule;
+
+import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
/**
* Rule definition statement.
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
similarity index 85%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
index 1236c469b76..8662adc2ebb 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/AlterRuleStatement.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.alter;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
/**
* Alter rule statement.
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
similarity index 88%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
index 1db3cacb7f0..5db695c6fcf 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/CreateRuleStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.create;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
/**
* Create rule statement.
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
similarity index 88%
rename from
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java
rename to
parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
index bbbbdc46389..05a74219278 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/rule/type/DropRuleStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.statement.rdl.drop;
+package org.apache.shardingsphere.distsql.statement.rdl.rule.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
/**
* Drop rule statement.
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
index 24d82e78124..9d35e089d32 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
@@ -22,8 +22,8 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.ResourceDefinitionExecutor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.aware.DatabaseAwareResourceDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.ResourceDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
@@ -48,14 +48,14 @@ public final class RDLBackendHandlerFactory {
* @return RDL backend handler
*/
public static ProxyBackendHandler newInstance(final RDLStatement
sqlStatement, final ConnectionSession connectionSession) {
- if (sqlStatement instanceof StorageUnitDefinitionStatement) {
- return
getStorageUnitBackendHandler((StorageUnitDefinitionStatement) sqlStatement,
connectionSession);
+ if (sqlStatement instanceof ResourceDefinitionStatement) {
+ return getResourceBackendHandler((ResourceDefinitionStatement)
sqlStatement, connectionSession);
}
return getRuleBackendHandler((RuleDefinitionStatement) sqlStatement,
connectionSession);
}
@SuppressWarnings("rawtypes")
- private static ResourceDefinitionBackendHandler
getStorageUnitBackendHandler(final StorageUnitDefinitionStatement sqlStatement,
final ConnectionSession connectionSession) {
+ private static ResourceDefinitionBackendHandler
getResourceBackendHandler(final ResourceDefinitionStatement sqlStatement, final
ConnectionSession connectionSession) {
ResourceDefinitionExecutor executor =
TypedSPILoader.getService(ResourceDefinitionExecutor.class,
sqlStatement.getClass());
if (executor instanceof DatabaseAwareResourceDefinitionExecutor) {
((DatabaseAwareResourceDefinitionExecutor<?>)
executor).setDatabase(ProxyContext.getInstance().getDatabase(DatabaseNameUtils.getDatabaseName(sqlStatement,
connectionSession)));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/ResourceDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/ResourceDefinitionBackendHandler.java
index 236c788a181..0f4ede74e43 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/ResourceDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/ResourceDefinitionBackendHandler.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.ResourceDefinitionExecutor;
-import
org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.ResourceDefinitionStatement;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
@@ -32,7 +32,7 @@ import java.sql.SQLException;
@RequiredArgsConstructor
public final class ResourceDefinitionBackendHandler implements
DistSQLBackendHandler {
- private final StorageUnitDefinitionStatement sqlStatement;
+ private final ResourceDefinitionStatement sqlStatement;
@SuppressWarnings("rawtypes")
private final ResourceDefinitionExecutor executor;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/AlterStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/AlterStorageUnitExecutor.java
index 23523d096a3..4fe67c747fb 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/AlterStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/AlterStorageUnitExecutor.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import
org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment;
import
org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
import
org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties;
import org.apache.shardingsphere.infra.database.core.connector.url.JdbcUrl;
import
org.apache.shardingsphere.infra.database.core.connector.url.StandardJdbcUrlParser;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/RegisterStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/RegisterStorageUnitExecutor.java
index 1de047cb88b..e02b5e36ed0 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/RegisterStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/RegisterStorageUnitExecutor.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.aware.Databas
import
org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import
org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.ShardingSphereExternalException;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/UnregisterStorageUnitExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/UnregisterStorageUnitExecutor.java
index 78a321b7d66..03e9168d08a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/UnregisterStorageUnitExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/type/UnregisterStorageUnitExecutor.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidSt
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.StorageUnitInUsedException;
import
org.apache.shardingsphere.distsql.handler.type.rdl.resource.aware.DatabaseAwareResourceDefinitionExecutor;
-import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.server.ShardingSphereServerException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index 462efc00f67..e5178e13c23 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDefinitionExecutor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/DatabaseRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/DatabaseRuleUpdater.java
index 1594ef844f4..951fbb68221 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/DatabaseRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/DatabaseRuleUpdater.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.databas
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/DatabaseRuleRDLExecuteEngine.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/DatabaseRuleRDLExecuteEngine.java
index 624f67ddf40..dbfd3997aa2 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/DatabaseRuleRDLExecuteEngine.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/DatabaseRuleRDLExecuteEngine.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.database.execute;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/AlterDatabaseRuleRDLExecuteEngine.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/AlterDatabaseRuleRDLExecuteEngine.java
index 44bb4fa3523..143efbe1def 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/AlterDatabaseRuleRDLExecuteEngine.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/AlterDatabaseRuleRDLExecuteEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.databas
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
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;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java
index 1660d3b4e10..ba73a831d80 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/CreateDatabaseRuleRDLExecuteEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.databas
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleCreateExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
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;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java
index 4063aa96abd..7bc84f7daf5 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/database/execute/type/DropDatabaseRuleRDLExecuteEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.databas
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/global/GlobalRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/global/GlobalRuleUpdater.java
index 993220a71cf..92850d77f51 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/global/GlobalRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/global/GlobalRuleUpdater.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.global;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
index 0e88b5954e4..00ab41ccd02 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
index 4e5c2e9612e..afc900f06a6 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.Database
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleCreateExecutor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.type.rdl.rule.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;
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;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
index e0bf70be634..43de3b8f53b 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -19,9 +19,9 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import
org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
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 f5e6e4f65ec..b194e41b154 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.type.CreateRuleStatement;
public final class CreateFixtureRuleStatement extends CreateRuleStatement {
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitExecutorTest.java
index dbcf72afb7a..2a54850581c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/AlterStorageUnitExecutorTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRe
import
org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler;
import
org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
import
org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
index 5bcbd62f48e..39723bd220c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitExecutorTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolProperti
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import
org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitExecutorTest.java
index 2ef5c93798b..fecbc705275 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/UnregisterStorageUnitExecutorTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.StorageUnitInUsedException;
-import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException;
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java
index fa8cfde78ce..da464799faf 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.frontend.postgresql.command.query;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dal.AnalyzeTableStatement;
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 51dd6c4c550..9673a801ee1 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,12 +20,12 @@ 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.alter.AlterRuleStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
-import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement;
-import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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.resource.unit.type.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
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 4206145c4cb..9926e5aa603 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.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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/alter/AlterStorageUnitStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java
index c2726a70263..c3a7ed765d7 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.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.distsql.segment.DataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.AlterStorageUnitStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.DataSourceAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedDataSource;
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 637c4b381b3..1995cd7ce59 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.create.CreateRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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/create/RegisterStorageUnitStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java
index 78271897c99..77bff30128e 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.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.distsql.segment.DataSourceSegment;
-import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.RegisterStorageUnitStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.DataSourceAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedDataSource;
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 353750af0ff..dc810d8aec4 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.drop.DropRuleStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.rule.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;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java
index 9adf88b1c84..64397e58c53 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.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.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.distsql.statement.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.UnregisterStorageUnitStatementTestCase;
