This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 823f0c4247c Refactor package structure of database.core.metadata
(#27521)
823f0c4247c is described below
commit 823f0c4247c816a644a1b5ae3d5c7b78e03b1dd7
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 28 10:19:31 2023 +0800
Refactor package structure of database.core.metadata (#27521)
* Refactor package structure of database.core.metadata
* Refactor package structure of database.core.metadata
---
.../metadata/EncryptMetaDataReviseEngineTest.java | 6 +++---
.../sharding/metadata/TableMetaDataViolation.java | 2 +-
.../reviser/column/ShardingColumnGeneratedReviser.java | 2 +-
.../reviser/constraint/ShardingConstraintReviser.java | 2 +-
.../metadata/reviser/index/ShardingIndexReviser.java | 2 +-
.../schema/ShardingSchemaTableAggregationReviser.java | 2 +-
.../metadata/ShardingMetaDataReviseEngineTest.java | 6 +++---
.../database/schema/builder/GenericSchemaBuilder.java | 14 +++++++-------
.../database/schema/builder/SystemSchemaBuilder.java | 2 +-
.../database/schema/reviser/MetaDataReviseEngine.java | 2 +-
.../schema/reviser/column/ColumnGeneratedReviser.java | 2 +-
.../schema/reviser/column/ColumnReviseEngine.java | 2 +-
.../reviser/constraint/ConstraintReviseEngine.java | 2 +-
.../schema/reviser/constraint/ConstraintReviser.java | 2 +-
.../database/schema/reviser/index/IndexReviseEngine.java | 2 +-
.../database/schema/reviser/index/IndexReviser.java | 2 +-
.../reviser/schema/SchemaMetaDataReviseEngine.java | 4 ++--
.../reviser/schema/SchemaTableAggregationReviser.java | 2 +-
.../schema/reviser/table/TableMetaDataReviseEngine.java | 2 +-
.../database/schema/util/SchemaMetaDataUtils.java | 2 +-
.../metadata/database/schema/util/SystemSchemaUtils.java | 2 +-
.../PostgreSQLShardingSphereStatisticsBuilder.java | 2 +-
.../schema/builder/GenericSchemaBuilderTest.java | 6 +++---
.../database/schema/model/TableMetaDataTest.java | 4 ++--
.../database/schema/util/SchemaMetaDataUtilsTest.java | 2 +-
.../core/connector/ConnectionPropertiesParser.java | 2 +-
.../data}/loader/DialectMetaDataLoader.java | 4 ++--
.../{dict => metadata/data}/loader/MetaDataLoader.java | 16 ++++++++--------
.../data}/loader/MetaDataLoaderConnection.java | 2 +-
.../data}/loader/MetaDataLoaderMaterial.java | 2 +-
.../data}/loader/type/ColumnMetaDataLoader.java | 4 ++--
.../data}/loader/type/IndexMetaDataLoader.java | 4 ++--
.../data}/loader/type/SchemaMetaDataLoader.java | 6 +++---
.../data}/loader/type/TableMetaDataLoader.java | 6 +++---
.../{dict => metadata/data}/model/ColumnMetaData.java | 2 +-
.../data}/model/ConstraintMetaData.java | 2 +-
.../{dict => metadata/data}/model/IndexMetaData.java | 2 +-
.../{dict => metadata/data}/model/SchemaMetaData.java | 2 +-
.../{dict => metadata/data}/model/TableMetaData.java | 2 +-
.../metadata/{ => database}/datatype/DataTypeLoader.java | 2 +-
.../{ => database}/datatype/DialectDataTypeLoader.java | 2 +-
.../{ => database}/system/DialectSystemDatabase.java | 2 +-
.../metadata/{ => database}/system/SystemDatabase.java | 2 +-
.../data/loader}/MetaDataLoaderConnectionTest.java | 3 +--
.../data}/loader/type/ColumnMetaDataLoaderTest.java | 4 ++--
.../data}/loader/type/IndexMetaDataLoaderTest.java | 4 ++--
.../data}/loader/type/TableMetaDataLoaderTest.java | 14 +++++++-------
.../infra/database/h2/H2MetaDataLoader.java | 12 ++++++------
.../infra/database/h2/H2SystemDatabase.java | 2 +-
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
....core.metadata.database.system.DialectSystemDatabase} | 0
.../infra/database/h2/H2MetaDataLoaderTest.java | 10 +++++-----
.../infra/database/mysql/MySQLDataTypeLoader.java | 2 +-
.../infra/database/mysql/MySQLMetaDataLoader.java | 14 +++++++-------
.../infra/database/mysql/MySQLSystemDatabase.java | 2 +-
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
...ore.metadata.database.datatype.DialectDataTypeLoader} | 0
....core.metadata.database.system.DialectSystemDatabase} | 0
.../infra/database/mysql/MySQLMetaDataLoaderTest.java | 10 +++++-----
.../database/mysql/MySQLSchemaMetaDataLoaderTest.java | 2 +-
.../infra/database/mysql/MySQLSystemDatabaseTest.java | 2 +-
.../database/opengauss/OpenGaussMetaDataLoader.java | 14 +++++++-------
.../database/opengauss/OpenGaussSystemDatabase.java | 2 +-
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
....core.metadata.database.system.DialectSystemDatabase} | 0
.../opengauss/OpenGaussSchemaMetaDataLoaderTest.java | 2 +-
.../database/opengauss/OpenGaussSystemDatabaseTest.java | 2 +-
.../infra/database/oracle/OracleMetaDataLoader.java | 14 +++++++-------
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
.../infra/database/oracle/OracleMetaDataLoaderTest.java | 10 +++++-----
.../database/postgresql/PostgreSQLMetaDataLoader.java | 16 ++++++++--------
.../database/postgresql/PostgreSQLSystemDatabase.java | 2 +-
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
....core.metadata.database.system.DialectSystemDatabase} | 0
.../postgresql/PostgreSQLMetaDataLoaderTest.java | 12 ++++++------
.../postgresql/PostgreSQLSchemaMetaDataLoaderTest.java | 2 +-
.../postgresql/PostgreSQLSystemDatabaseTest.java | 2 +-
.../database/sqlserver/SQLServerMetaDataLoader.java | 12 ++++++------
...base.core.metadata.data.loader.DialectMetaDataLoader} | 0
.../database/sqlserver/SQLServerMetaDataLoaderTest.java | 10 +++++-----
.../data/pipeline/cdc/util/CDCSchemaTableUtils.java | 2 +-
.../metadata/factory/ExternalMetaDataFactory.java | 2 +-
.../single/datanode/SingleTableDataNodeLoader.java | 2 +-
.../reviser/constraint/SingleConstraintReviser.java | 2 +-
.../metadata/reviser/index/SingleIndexReviser.java | 2 +-
.../single/metadata/SingleMetaDataReviseEngineTest.java | 8 ++++----
.../executor/enumerable/EnumerableScanExecutor.java | 2 +-
.../mysql/handler/admin/executor/ShowTablesExecutor.java | 2 +-
88 files changed, 172 insertions(+), 173 deletions(-)
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptMetaDataReviseEngineTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptMetaDataReviseEngineTest.java
index 58159c70a8b..e0e05e131f2 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptMetaDataReviseEngineTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptMetaDataReviseEngineTest.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.encrypt.rule.EncryptTable;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEngine;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.junit.jupiter.api.Test;
import java.sql.Types;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/TableMetaDataViolation.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/TableMetaDataViolation.java
index 03dabb7100d..d5cf7a3fafd 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/TableMetaDataViolation.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/TableMetaDataViolation.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.metadata;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
/**
* Table meta data violation.
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/column/ShardingColumnGeneratedReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/column/ShardingColumnGeneratedReviser.java
index c9ff19894ec..98bdf017286 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/column/ShardingColumnGeneratedReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/column/ShardingColumnGeneratedReviser.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sharding.metadata.reviser.column;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnGeneratedReviser;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
import org.apache.shardingsphere.sharding.rule.TableRule;
/**
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/constraint/ShardingConstraintReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/constraint/ShardingConstraintReviser.java
index 0fc2cb40864..a5bc44ab37e 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/constraint/ShardingConstraintReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/constraint/ShardingConstraintReviser.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.metadata.reviser.constraint;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constraint.ConstraintReviser;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviser.java
index b00355bccc6..9b33e3aea79 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviser.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.metadata.reviser.index;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.index.IndexReviser;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
index 6cf9a8ae43b..c59e2fa1c1f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sharding.metadata.reviser.schema;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.schema.SchemaTableAggregationReviser;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import
org.apache.shardingsphere.sharding.exception.metadata.InconsistentShardingTableMetaDataException;
import org.apache.shardingsphere.sharding.metadata.TableMetaDataViolation;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingMetaDataReviseEngineTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingMetaDataReviseEngineTest.java
index 7c75784b655..0f9039c9fb0 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingMetaDataReviseEngineTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingMetaDataReviseEngineTest.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.sharding.metadata;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
index 3e3b4b421ac..7230209dcf2 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
@@ -22,13 +22,13 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereConstraint;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereIndex;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
index a31074b8958..3c976bce94a 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
index aaf53238e83..38ca97223df 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.schema.SchemaMetaDataReviseEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnGeneratedReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnGeneratedReviser.java
index 60dca1b5c3c..b80c611ce99 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnGeneratedReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnGeneratedReviser.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
/**
* Column generated reviser.
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
index ab213ad5ec7..e096de1e426 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import javax.sql.DataSource;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviseEngine.java
index bd53e85f976..43b96126ed4 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviseEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constra
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Collection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviser.java
index 8c5a29f1519..bf63fa137f8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/constraint/ConstraintReviser.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constraint;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Optional;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
index 9a8df922ac9..b1f94bd3ef2 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.index;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Collection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviser.java
index 9c1564e7d6a..2674d137c37 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviser.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.metadata.database.schema.reviser.index;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Optional;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
index 754c6e75eb8..c1dc069fd11 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
@@ -22,8 +22,8 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.table.TableMetaDataReviseEngine;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.spi.type.ordered.OrderedSPILoader;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaTableAggregationReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaTableAggregationReviser.java
index 137862f3d2b..95c8634d8ca 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaTableAggregationReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaTableAggregationReviser.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.schema;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Collection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
index 059a50ce85c..c493a5be197 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.table;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnReviseEngine;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constraint.ConstraintReviseEngine;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
index 1c51102a87d..ecbb71462ba 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.datanode.DataNodes;
import org.apache.shardingsphere.infra.database.core.GlobalDataSourceRegistry;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.metadata.database.schema.exception.UnsupportedActualDataNodeStructureException;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderMaterial;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
index 3f89b148005..3ae710f380b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
index ea76e0f3cfa..beb3666f6d7 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/builder/dialect/PostgreSQLShardingSphereStatisticsBuilder.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.metadata.statistics.builder.dialect;
import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
index c6ab24bd524..d4ebb9eb951 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
@@ -21,9 +21,9 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.TableContainedFixtureRule;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/TableMetaDataTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/TableMetaDataTest.java
index 21f450f1c9a..0607030e6a6 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/TableMetaDataTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/TableMetaDataTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.infra.metadata.database.schema.model;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
index fac3045d5ca..94347e34f5c 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderMaterial;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/connector/ConnectionPropertiesParser.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/connector/ConnectionPropertiesParser.java
index 3dd0209f4f7..c924c5b197d 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/connector/ConnectionPropertiesParser.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/connector/ConnectionPropertiesParser.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
public interface ConnectionPropertiesParser extends DatabaseTypedSPI {
/**
- * Parse connection properties.
+ * Parse URL to connection properties.
*
* @param url URL of data source
* @param username username of data source
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/DialectMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/DialectMetaDataLoader.java
similarity index 90%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/DialectMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/DialectMetaDataLoader.java
index 88a3a850089..a97668e4373 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/DialectMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/DialectMetaDataLoader.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader;
+package org.apache.shardingsphere.infra.database.core.metadata.data.loader;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java
similarity index 88%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java
index 1bb8cd3e2e7..827698a309a 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoader.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader;
+package org.apache.shardingsphere.infra.database.core.metadata.data.loader;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.TableMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.TableMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import
org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnknownSQLException;
@@ -52,10 +52,10 @@ public final class MetaDataLoader {
0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new
ThreadFactoryBuilder().setDaemon(true).setNameFormat("ShardingSphere-SchemaMetaDataLoaderEngine-%d").build());
/**
- * Load schema meta data.
+ * Load meta data.
*
* @param materials meta data loader materials
- * @return schema meta data map
+ * @return meta data map
* @throws SQLException SQL exception
*/
public static Map<String, SchemaMetaData> load(final
Collection<MetaDataLoaderMaterial> materials) throws SQLException {
@@ -66,7 +66,7 @@ public final class MetaDataLoader {
}
try {
for (Future<Collection<SchemaMetaData>> each : futures) {
- mergeSchemaMetaDataMap(result, each.get());
+ merge(result, each.get());
}
} catch (final InterruptedException ex) {
Thread.currentThread().interrupt();
@@ -99,7 +99,7 @@ public final class MetaDataLoader {
return Collections.singletonList(new
SchemaMetaData(material.getDefaultSchemaName(), tableMetaData));
}
- private static void mergeSchemaMetaDataMap(final Map<String,
SchemaMetaData> schemaMetaDataMap, final Collection<SchemaMetaData>
addedSchemaMetaDataList) {
+ private static void merge(final Map<String, SchemaMetaData>
schemaMetaDataMap, final Collection<SchemaMetaData> addedSchemaMetaDataList) {
for (SchemaMetaData each : addedSchemaMetaDataList) {
SchemaMetaData schemaMetaData =
schemaMetaDataMap.computeIfAbsent(each.getName(), key -> new
SchemaMetaData(each.getName(), new LinkedList<>()));
schemaMetaData.getTables().addAll(each.getTables());
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnection.java
similarity index 99%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnection.java
index a23dc096854..9b3d4a20966 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader;
+package org.apache.shardingsphere.infra.database.core.metadata.data.loader;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderMaterial.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderMaterial.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
index 6ef415af5b7..44eace8a98b 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderMaterial.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderMaterial.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader;
+package org.apache.shardingsphere.infra.database.core.metadata.data.loader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoader.java
similarity index 96%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoader.java
index a1923336e35..a0f73ac056d 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import java.sql.Connection;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoader.java
similarity index 93%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoader.java
index cac0b697164..41db803a484 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
index 622b5646fdb..2e2f00e5432 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderConnection;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
similarity index 90%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
index 685960203a9..0baf99a63db 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderConnection;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ColumnMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ColumnMetaData.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ColumnMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ColumnMetaData.java
index a19167247b1..5e57cc9b8ab 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ColumnMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ColumnMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.model;
+package org.apache.shardingsphere.infra.database.core.metadata.data.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ConstraintMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ConstraintMetaData.java
similarity index 93%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ConstraintMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ConstraintMetaData.java
index 9e7471bc987..fded837be65 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/ConstraintMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/ConstraintMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.model;
+package org.apache.shardingsphere.infra.database.core.metadata.data.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/IndexMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/IndexMetaData.java
similarity index 93%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/IndexMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/IndexMetaData.java
index e7c05b3e8b9..d640fe26702 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/IndexMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/IndexMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.model;
+package org.apache.shardingsphere.infra.database.core.metadata.data.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/SchemaMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/SchemaMetaData.java
similarity index 93%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/SchemaMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/SchemaMetaData.java
index 64c2443634d..c8efe6d8065 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/SchemaMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/SchemaMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.model;
+package org.apache.shardingsphere.infra.database.core.metadata.data.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/TableMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/TableMetaData.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/TableMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/TableMetaData.java
index dee00b72021..7c53b381fba 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/model/TableMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/model/TableMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.model;
+package org.apache.shardingsphere.infra.database.core.metadata.data.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DataTypeLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
similarity index 99%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DataTypeLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
index 6f51ba6eb83..291d0f561a6 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DataTypeLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.datatype;
+package
org.apache.shardingsphere.infra.database.core.metadata.database.datatype;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DialectDataTypeLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
similarity index 98%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DialectDataTypeLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
index 648ac95e253..b079ff0ef7c 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DialectDataTypeLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.datatype;
+package
org.apache.shardingsphere.infra.database.core.metadata.database.datatype;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/DialectSystemDatabase.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/DialectSystemDatabase.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/DialectSystemDatabase.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/DialectSystemDatabase.java
index 36ee72b8a54..b9afe57a8fd 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/DialectSystemDatabase.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/DialectSystemDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.system;
+package org.apache.shardingsphere.infra.database.core.metadata.database.system;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/SystemDatabase.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/SystemDatabase.java
similarity index 95%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/SystemDatabase.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/SystemDatabase.java
index 7c48850f6ee..9de20bc187e 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/system/SystemDatabase.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/system/SystemDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.metadata.system;
+package org.apache.shardingsphere.infra.database.core.metadata.database.system;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
similarity index 95%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
index fed1576d27e..f83d954b4bb 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/MetaDataLoaderConnectionTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.adapter;
+package org.apache.shardingsphere.infra.database.core.metadata.data.loader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoaderTest.java
similarity index 96%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoaderTest.java
index 9ca8fe14412..7b962b1848b 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/ColumnMetaDataLoaderTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoaderTest.java
similarity index 92%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoaderTest.java
index 380a99a9168..f68d6d78a78 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/IndexMetaDataLoaderTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.junit.jupiter.api.Test;
import java.sql.Connection;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
similarity index 91%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
index 089b56d3616..6f6a01a4c41 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/TableMetaDataLoaderTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.type;
+package
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java
index dae0c3410a9..d618d6b533f 100644
---
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java
+++
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.infra.database.h2;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SystemDatabase.java
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SystemDatabase.java
index 5b4d618932b..cfd76930145 100644
---
a/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SystemDatabase.java
+++
b/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SystemDatabase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.h2;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import java.util.Collection;
import java.util.Collections;
diff --git
a/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
b/infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
similarity index 100%
rename from
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
rename to
infra/database/type/h2/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
diff --git
a/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoaderTest.java
b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoaderTest.java
index 3f18ef59067..d6727b875e6 100644
---
a/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoaderTest.java
+++
b/infra/database/type/h2/src/test/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoaderTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.infra.database.h2;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
index 5f5fe7e8f93..fb32d66e6b2 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.mysql;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DialectDataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DialectDataTypeLoader;
import java.sql.SQLException;
import java.sql.Types;
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java
index 6fcfb74d7c8..813aa388c04 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java
@@ -18,13 +18,13 @@
package org.apache.shardingsphere.infra.database.mysql;
import org.apache.shardingsphere.infra.database.core.GlobalDataSourceRegistry;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabase.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabase.java
index 0b6c3361a3f..f4726035c33 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabase.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.mysql;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import java.util.Collection;
import java.util.Collections;
diff --git
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.datatype.DialectDataTypeLoader
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DialectDataTypeLoader
similarity index 100%
rename from
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.datatype.DialectDataTypeLoader
rename to
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DialectDataTypeLoader
diff --git
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
similarity index 100%
rename from
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
rename to
infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoaderTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoaderTest.java
index a5a4a35581c..3a2a0f31834 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoaderTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoaderTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.infra.database.mysql;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
index 94cd08150a7..2637288572d 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.mysql;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabaseTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabaseTest.java
index 7e7edac3f43..ff3bb73706d 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabaseTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSystemDatabaseTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.mysql;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
index cad87f2284f..9008a1e4d6e 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
@@ -20,13 +20,13 @@ package org.apache.shardingsphere.infra.database.opengauss;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabase.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabase.java
index eb159a46e2d..7976cc4e3e8 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabase.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.opengauss;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
b/infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
similarity index 100%
rename from
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
rename to
infra/database/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
diff --git
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
index 5aa160c6cb0..63af7e24c5f 100644
---
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.opengauss;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabaseTest.java
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabaseTest.java
index b607fadd3ce..ea0155abd17 100644
---
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabaseTest.java
+++
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSystemDatabaseTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.opengauss;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
index 1a0939323c5..bae3b8e32eb 100644
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
+++
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.infra.database.oracle;
import com.google.common.collect.Lists;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderConnection;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoaderTest.java
b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoaderTest.java
index 2ba864fbb85..c50a6b98d6d 100644
---
a/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoaderTest.java
+++
b/infra/database/type/oracle/src/test/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoaderTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.infra.database.oracle;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
index d8a8ee2c605..e6b887d0791 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
@@ -19,15 +19,15 @@ package org.apache.shardingsphere.infra.database.postgresql;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabase.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabase.java
index 8062aa97594..e9ccfa85c3f 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabase.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.postgresql;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
b/infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
similarity index 100%
rename from
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase
rename to
infra/database/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoaderTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoaderTest.java
index cd84d88d879..88168fdea50 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoaderTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoaderTest.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.infra.database.postgresql;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
index 49e366a7335..d308f106f06 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.postgresql;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabaseTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabaseTest.java
index 8bda709f486..2fa33227da1 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabaseTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSystemDatabaseTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.postgresql;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java
b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java
index 8aeb67afc61..faec9390179 100644
---
a/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java
+++
b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.infra.database.sqlserver;
-import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
b/infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
similarity index 100%
rename from
infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader
rename to
infra/database/type/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
diff --git
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoaderTest.java
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoaderTest.java
index b6b93507861..0638bb88e93 100644
---
a/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoaderTest.java
+++
b/infra/database/type/sqlserver/src/test/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoaderTest.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.infra.database.sqlserver;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
index ce462f2b357..7228ba2d05a 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtils.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.data.pipeline.cdc.protocol.request.StreamDataRequestBody.SchemaTable;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.DialectSystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.DialectSystemDatabase;
import org.apache.shardingsphere.infra.exception.SchemaNotFoundException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/ExternalMetaDataFactory.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/ExternalMetaDataFactory.java
index 0b65ac8a457..af473642c20 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/ExternalMetaDataFactory.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/factory/ExternalMetaDataFactory.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
index ec8f641b5cb..4b4c75bdc5e 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.single.api.constant.SingleTableConstants;
import org.apache.shardingsphere.single.exception.SingleTablesLoadingException;
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
index 90ecb3e3c7f..beeb8678bc5 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.single.metadata.reviser.constraint;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constraint.ConstraintReviser;
-import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ConstraintMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
index eba046e691b..0cbb663808b 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.single.metadata.reviser.index;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.index.IndexReviser;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/SingleMetaDataReviseEngineTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/SingleMetaDataReviseEngineTest.java
index 87a48dd3aa5..3beacedd567 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/SingleMetaDataReviseEngineTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/metadata/SingleMetaDataReviseEngineTest.java
@@ -19,10 +19,10 @@ package org.apache.shardingsphere.single.metadata;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEngine;
-import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.jupiter.api.Test;
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
index 3a8c73fd0af..807635113a1 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.authority.rule.AuthorityRule;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.engine.SQLBindEngine;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
index 4ba799fd99c..beba3deaa09 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
