This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6e52214454f Refactor package structure of mode.node.path.type.database
(#34907)
6e52214454f is described below
commit 6e52214454ff21696154f76f0cf89e63793b5359
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 6 15:20:18 2025 +0800
Refactor package structure of mode.node.path.type.database (#34907)
---
.../core/job/statistics/collect/StatisticsCollectJobWorker.java | 2 +-
.../mode/metadata/changed/RuleItemChangedNodePathBuilder.java | 4 ++--
.../mode/metadata/manager/rule/DatabaseRuleItemManager.java | 2 +-
.../persist/config/database/DataSourceUnitPersistService.java | 2 +-
.../metadata/persist/config/database/DatabaseRulePersistService.java | 4 ++--
.../persist/metadata/service/DatabaseMetaDataPersistService.java | 2 +-
.../persist/metadata/service/SchemaMetaDataPersistService.java | 2 +-
.../persist/metadata/service/TableMetaDataPersistService.java | 2 +-
.../metadata/persist/metadata/service/TableRowDataPersistService.java | 2 +-
.../metadata/persist/metadata/service/ViewMetaDataPersistService.java | 2 +-
.../mode/metadata/persist/statistics/StatisticsPersistService.java | 2 +-
.../mode/metadata/persist/version/VersionPersistServiceTest.java | 4 ++--
.../type/{ => database}/metadata/datasource/StorageNodeNodePath.java | 2 +-
.../type/{ => database}/metadata/datasource/StorageUnitNodePath.java | 2 +-
.../node/path/type/{ => database}/metadata/rule/DatabaseRuleItem.java | 2 +-
.../path/type/{ => database}/metadata/rule/DatabaseRuleNodePath.java | 2 +-
.../type/{ => database}/metadata/schema/TableMetadataNodePath.java | 2 +-
.../type/{ => database}/metadata/schema/ViewMetadataNodePath.java | 2 +-
.../path/type/{ => database}/statistics/StatisticsDataNodePath.java | 2 +-
.../path/type/{ => database}/statistics/StatisticsJobNodePath.java | 2 +-
.../mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java | 4 ++--
.../{ => database}/metadata/database/TableMetadataNodePathTest.java | 4 ++--
.../{ => database}/metadata/database/ViewMetadataNodePathTest.java | 4 ++--
.../path/type/{ => database}/metadata/rule/DatabaseRuleItemTest.java | 2 +-
.../type/{ => database}/metadata/rule/DatabaseRuleNodePathTest.java | 2 +-
.../type/{ => database}/metadata/storage/StorageNodeNodePathTest.java | 4 ++--
.../type/{ => database}/metadata/storage/StorageUnitNodePathTest.java | 4 ++--
.../type/{ => database}/statistics/StatisticsDataNodePathTest.java | 2 +-
.../type/{ => database}/statistics/StatisticsJobNodePathTest.java | 2 +-
.../mode/node/path/version/VersionNodePathParserTest.java | 2 +-
.../shardingsphere/mode/node/path/version/VersionNodePathTest.java | 2 +-
.../mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngineTest.java | 4 ++--
.../handler/database/datasource/StorageNodeChangedHandler.java | 2 +-
.../handler/database/datasource/StorageUnitChangedHandler.java | 2 +-
.../dispatch/handler/database/metadata/SchemaChangedHandler.java | 2 +-
.../dispatch/handler/database/metadata/TableChangedHandler.java | 2 +-
.../dispatch/handler/database/metadata/ViewChangedHandler.java | 4 ++--
.../handler/database/rule/RuleConfigurationChangedHandler.java | 4 ++--
.../dispatch/handler/global/type/DatabaseListenerChangedHandler.java | 2 +-
.../dispatch/handler/global/type/StatisticsChangedHandler.java | 2 +-
.../cluster/dispatch/listener/DataChangedEventListenerRegistry.java | 2 +-
.../dispatch/listener/type/DatabaseMetaDataChangedListener.java | 2 +-
.../handler/database/rule/RuleConfigurationChangedHandlerTest.java | 4 ++--
.../persist/service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../persist/service/StandaloneMetaDataManagerPersistServiceTest.java | 2 +-
45 files changed, 57 insertions(+), 57 deletions(-)
diff --git
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java
index 2076513d35b..be9ab5df1e3 100644
---
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java
+++
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration
import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.statistics.StatisticsJobNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsJobNodePath;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
index 402bf65d6f6..9b410e58665 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/RuleItemChangedNodePathBuilder.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mode.metadata.changed;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNode;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNodeGenerator;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
index ebd5b554fa8..78864bb1081 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.manager.ActiveVersionChecker;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.rule.RuleChangedItemType;
import
org.apache.shardingsphere.mode.spi.rule.RuleItemConfigurationChangedProcessor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index d6f9b255b56..152bb2986b7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.datasource.StorageUnitNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageUnitNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index 5854db4234a..d587e9ab076 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfigurati
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNode;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNodeGenerator;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
index e5c5b5bf598..db191093f4e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/DatabaseMetaDataPersistService.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.mode.metadata.persist.metadata.service;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
index f1347587711..011aa91ae6f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/SchemaMetaDataPersistService.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
index 6a939d7510f..1dd0e0c6e58 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlTableSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
index e3d9c174a7b..c0578ffa25a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableRowDataPersistService.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
import
org.apache.shardingsphere.infra.yaml.data.swapper.YamlRowStatisticsSwapper;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.statistics.StatisticsDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDataNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.ArrayList;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
index fd5fd0fac23..8a8eff2cac5 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.version.VersionPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
index 57e19fe25e1..9f0b7cc4ce5 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/statistics/StatisticsPersistService.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics;
import
org.apache.shardingsphere.infra.yaml.data.swapper.YamlRowStatisticsSwapper;
import
org.apache.shardingsphere.mode.metadata.persist.metadata.service.TableRowDataPersistService;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.statistics.StatisticsDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDataNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.ArrayList;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/VersionPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/VersionPersistServiceTest.java
index b000a424672..8b25281fe78 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/VersionPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/version/VersionPersistServiceTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.mode.metadata.persist.version;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageNodeNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
similarity index 95%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageNodeNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
index e6ae621afc7..7441b19168d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageNodeNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.datasource;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageUnitNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
similarity index 95%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageUnitNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
index 40416bd8c59..412fb90c21c 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/datasource/StorageUnitNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.datasource;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItem.java
similarity index 94%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItem.java
index 963da6445bc..f1fc7f19602 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItem.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItem.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.rule;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
similarity index 96%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
index f0c0c7a45d2..246428f0f67 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.rule;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/TableMetadataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
similarity index 97%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/TableMetadataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
index f17f7eb0495..b958bdb1f98 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/TableMetadataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetadataNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.schema;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.schema;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/ViewMetadataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
similarity index 96%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/ViewMetadataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
index 6f10cfb1bca..04198326e3c 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/metadata/schema/ViewMetadataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetadataNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.schema;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.schema;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
similarity index 97%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
index 8668daa8173..5f7a83013b2 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.statistics;
+package org.apache.shardingsphere.mode.node.path.type.database.statistics;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePath.java
similarity index 93%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePath.java
index c3cb37cfaec..939c167cb7c 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.statistics;
+package org.apache.shardingsphere.mode.node.path.type.database.statistics;
import org.apache.shardingsphere.mode.node.path.NodePath;
import org.apache.shardingsphere.mode.node.path.NodePathEntity;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
index b871b190bb6..5ba6366780a 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
@@ -27,8 +27,8 @@ import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearchCriteria;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
import org.apache.shardingsphere.mode.node.path.type.global.GlobalRuleNodePath;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNode;
import org.apache.shardingsphere.mode.node.rule.node.DatabaseRuleNodeGenerator;
import
org.apache.shardingsphere.mode.node.rule.tuple.annotation.RuleNodeTupleEntity;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
similarity index 96%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
index 7cb4414e9bc..73da4417049 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/TableMetadataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/TableMetadataNodePathTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.database;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.database;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.junit.jupiter.api.Test;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/ViewMetadataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
similarity index 94%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/ViewMetadataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
index 4758ef7c54d..0d5cc1558fc 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/database/ViewMetadataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/database/ViewMetadataNodePathTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.database;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.database;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePath;
import org.junit.jupiter.api.Test;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItemTest.java
similarity index 94%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItemTest.java
index 7316d475773..48f2b87a2f5 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleItemTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleItemTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.rule;
import org.junit.jupiter.api.Test;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePathTest.java
similarity index 97%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePathTest.java
index b1c29c83aa2..33fde9ff040 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/rule/DatabaseRuleNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePathTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.rule;
+package org.apache.shardingsphere.mode.node.path.type.database.metadata.rule;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageNodeNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageNodeNodePathTest.java
similarity index 91%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageNodeNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageNodeNodePathTest.java
index 79f602fd229..7fb723270a0 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageNodeNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageNodeNodePathTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.storage;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.storage;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.datasource.StorageNodeNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageNodeNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageUnitNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageUnitNodePathTest.java
similarity index 91%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageUnitNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageUnitNodePathTest.java
index 97da3a7a2e5..ada4e077bd4 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/metadata/storage/StorageUnitNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/storage/StorageUnitNodePathTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.metadata.storage;
+package
org.apache.shardingsphere.mode.node.path.type.database.metadata.storage;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.datasource.StorageUnitNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageUnitNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePathTest.java
similarity index 98%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePathTest.java
index 8e4d66d1745..b406d142dbc 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsDataNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePathTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.statistics;
+package org.apache.shardingsphere.mode.node.path.type.database.statistics;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePathTest.java
similarity index 94%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePathTest.java
index 886d99a7686..76359430649 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/statistics/StatisticsJobNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsJobNodePathTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.type.statistics;
+package org.apache.shardingsphere.mode.node.path.type.database.statistics;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import org.junit.jupiter.api.Test;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParserTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParserTest.java
index 0fd3590a884..15c744cedf7 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParserTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathParserTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.node.path.version;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.junit.jupiter.api.Test;
import java.util.Optional;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
index 2089821cf48..2d82b2d6366 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/version/VersionNodePathTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.node.path.version;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngineTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngineTest.java
index 318758af561..3811adc1d89 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngineTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngineTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mode.node.rule.tuple;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import
org.apache.shardingsphere.mode.node.rule.tuple.fixture.leaf.YamlLeafRuleConfiguration;
import
org.apache.shardingsphere.mode.node.rule.tuple.fixture.node.YamlNodeRuleConfiguration;
import
org.apache.shardingsphere.mode.node.rule.tuple.fixture.node.YamlNodeRuleConfigurationEnum;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageNodeChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageNodeChangedHandler.java
index b688e47d7ec..0125ed253b1 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageNodeChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageNodeChangedHandler.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.DatabaseChangedHandler;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.datasource.StorageNodeNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageNodeNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageUnitChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageUnitChangedHandler.java
index aeae3252a84..d50a9508c24 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageUnitChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/datasource/StorageUnitChangedHandler.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.
import org.apache.shardingsphere.mode.metadata.manager.ActiveVersionChecker;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.datasource.StorageUnitNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.datasource.StorageUnitNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
import java.util.Collections;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
index c1788d25685..5c6b7cfe408 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/SchemaChangedHandler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.DatabaseChangedHandler;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
/**
* Schema changed handler.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
index 130ea1799f4..bdd3952b8f6 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/TableChangedHandler.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.mode.metadata.manager.ActiveVersionChecker;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
index 3608ba5762e..64eacae2c92 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/ViewChangedHandler.java
@@ -25,8 +25,8 @@ import
org.apache.shardingsphere.mode.metadata.manager.ActiveVersionChecker;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.ViewMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.ViewMetadataNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
index 2b7498e1593..afadc79a3e4 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandler.java
@@ -23,8 +23,8 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.DatabaseChangedHandler;
import
org.apache.shardingsphere.mode.metadata.changed.RuleItemChangedNodePathBuilder;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathPattern;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.mode.node.path.version.VersionNodePathParser;
import java.sql.SQLException;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
index 69840634cde..74fe1c5d6b2 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.databa
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import
org.apache.shardingsphere.mode.node.path.type.state.DatabaseListenerCoordinatorNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
index e2fad382775..d14e72c5881 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/StatisticsChangedHandler.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.Gl
import
org.apache.shardingsphere.mode.metadata.manager.statistics.StatisticsManager;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.statistics.StatisticsDataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDataNodePath;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
index 91c84265747..3e4d1b71dd5 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/DataChangedEventListenerRegistry.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.Gl
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.GlobalMetaDataChangedListener;
import
org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.util.Collection;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
index 94300a9ef48..bec79cdb01d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.metadata.TableChangedHandler;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database.rule.RuleConfigurationChangedHandler;
import
org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.schema.TableMetadataNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
import java.sql.SQLException;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
index 683ae0499a4..95b17f30547 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/rule/RuleConfigurationChangedHandlerTest.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.database
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleItem;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleItem;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index a56a8e0d1e3..d037675a5f8 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
import
org.apache.shardingsphere.mode.metadata.refresher.metadata.util.TableRefreshUtils;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index d0e0ddc2718..b07fc63647e 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.mode.metadata.changed.RuleItemChangedNodePathBu
import org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
-import
org.apache.shardingsphere.mode.node.path.type.metadata.rule.DatabaseRuleNodePath;
+import
org.apache.shardingsphere.mode.node.path.type.database.metadata.rule.DatabaseRuleNodePath;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.jupiter.api.BeforeEach;
