This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 27d6356a98a Move metadata loader to database module (#27485)
27d6356a98a is described below
commit 27d6356a98aed52bbe7e340c8a26fe8d3664c801
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 26 22:46:37 2023 +0800
Move metadata loader to database module (#27485)
---
.../metadata/EncryptMetaDataReviseEngineTest.java | 6 ++--
.../sharding/metadata/TableMetaDataViolation.java | 2 +-
.../column/ShardingColumnGeneratedReviser.java | 2 +-
.../constraint/ShardingConstraintReviser.java | 2 +-
.../reviser/index/ShardingIndexReviser.java | 2 +-
.../ShardingSchemaTableAggregationReviser.java | 2 +-
.../metadata/ShardingMetaDataReviseEngineTest.java | 6 ++--
.../pool/creator/DataSourcePoolCreator.java | 2 +-
.../schema/builder/GenericSchemaBuilder.java | 14 ++++----
.../schema/reviser/MetaDataReviseEngine.java | 2 +-
.../reviser/column/ColumnGeneratedReviser.java | 2 +-
.../schema/reviser/column/ColumnReviseEngine.java | 2 +-
.../reviser/constraint/ConstraintReviseEngine.java | 2 +-
.../reviser/constraint/ConstraintReviser.java | 2 +-
.../schema/reviser/index/IndexReviseEngine.java | 2 +-
.../schema/reviser/index/IndexReviser.java | 2 +-
.../reviser/schema/SchemaMetaDataReviseEngine.java | 4 +--
.../schema/SchemaTableAggregationReviser.java | 2 +-
.../reviser/table/TableMetaDataReviseEngine.java | 2 +-
.../database/schema/util/SchemaMetaDataUtils.java | 4 +--
...ta.loader.metadata.DialectSchemaMetaDataLoader} | 7 +++-
...ema.loader.metadata.DialectSchemaMetaDataLoader | 23 ------------
.../schema/builder/GenericSchemaBuilderTest.java | 6 ++--
.../MetaDataLoaderConnectionAdapterTest.java | 1 +
.../loader/common/ColumnMetaDataLoaderTest.java | 3 +-
.../loader/common/IndexMetaDataLoaderTest.java | 3 +-
.../loader/common/SchemaMetaDataLoaderTest.java | 1 +
.../loader/common/TableMetaDataLoaderTest.java | 12 +++----
.../dialect/H2SchemaMetaDataLoaderTest.java | 10 +++---
.../dialect/MySQLSchemaMetaDataLoaderTest.java | 10 +++---
.../dialect/OracleSchemaMetaDataLoaderTest.java | 10 +++---
.../PostgreSQLSchemaMetaDataLoaderTest.java | 12 +++----
.../dialect/SQLServerSchemaMetaDataLoaderTest.java | 10 +++---
.../database/schema/model/TableMetaDataTest.java | 4 +--
.../schema/util/SchemaMetaDataUtilsTest.java | 2 +-
.../database/core}/GlobalDataSourceRegistry.java | 2 +-
.../adapter/MetaDataLoaderConnectionAdapter.java | 2 +-
.../loader/common/ColumnMetaDataLoader.java | 4 +--
.../loader/common/IndexMetaDataLoader.java | 4 +--
.../loader/common/SchemaMetaDataLoader.java | 4 +--
.../loader/common/TableMetaDataLoader.java | 6 ++--
.../metadata/DialectSchemaMetaDataLoader.java | 4 +--
.../metadata/SchemaMetaDataLoaderEngine.java | 8 ++---
.../metadata/SchemaMetaDataLoaderMaterial.java | 2 +-
.../metadata/dialect/H2SchemaMetaDataLoader.java | 12 +++----
.../dialect/MySQLSchemaMetaDataLoader.java | 16 ++++-----
.../dialect/OpenGaussSchemaMetaDataLoader.java | 14 ++++----
.../dialect/OracleSchemaMetaDataLoader.java | 14 ++++----
.../dialect/PostgreSQLSchemaMetaDataLoader.java | 16 ++++-----
.../dialect/SQLServerSchemaMetaDataLoader.java | 12 +++----
.../metadata}/loader/model/ColumnMetaData.java | 2 +-
.../metadata}/loader/model/ConstraintMetaData.java | 2 +-
.../core/metadata}/loader/model/IndexMetaData.java | 2 +-
.../metadata}/loader/model/SchemaMetaData.java | 2 +-
.../core/metadata}/loader/model/TableMetaData.java | 2 +-
.../database/oracle/OracleDataTypeLoader.java | 41 ----------------------
.../single/datanode/SingleTableDataNodeLoader.java | 2 +-
.../constraint/SingleConstraintReviser.java | 2 +-
.../metadata/reviser/index/SingleIndexReviser.java | 2 +-
.../metadata/SingleMetaDataReviseEngineTest.java | 8 ++---
.../jdbc/datasource/JDBCBackendDataSource.java | 2 +-
61 files changed, 155 insertions(+), 210 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 67090bcb8f4..a18a9ffbc3a 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.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 f09ac8f2b48..8f997da126d 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.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 0090c08c129..99d06f4398b 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.metadata.database.schema.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 2079d91b00f..f08476dbd7d 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.metadata.database.schema.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 c314b12beb5..fceec39f3a4 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.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 6df65874b78..8410ea912b5 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.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 caadafdbf88..10186fa7663 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.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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/datasource/pool/creator/DataSourcePoolCreator.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
index b18f9a28184..0ad81fe99dc 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMe
import
org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaDataReflection;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import
org.apache.shardingsphere.infra.datasource.props.custom.CustomDataSourceProperties;
-import
org.apache.shardingsphere.infra.datasource.registry.GlobalDataSourceRegistry;
+import org.apache.shardingsphere.infra.database.core.GlobalDataSourceRegistry;
import
org.apache.shardingsphere.infra.datasource.storage.StorageNodeProperties;
import org.apache.shardingsphere.infra.datasource.storage.StorageResource;
import
org.apache.shardingsphere.infra.datasource.storage.StorageResourceWithProperties;
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 e96290e5695..9a0b6f2656d 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.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderEngine;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderMaterial;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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/reviser/MetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
index 1f8b555cce7..83f821c0b88 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.metadata.database.schema.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 b798a4d8caf..a05a97f7aee 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.metadata.database.schema.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 a6afb61e544..b7dfdc38e3a 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.metadata.database.schema.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 a710499557a..5fba55475e8 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.metadata.database.schema.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 69cdd58bdf7..9099690e7ee 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.metadata.database.schema.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 7412ea031fe..bf7a30c6adf 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.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 76967012ede..8356fb96913 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.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 cb196fb8728..3ca5a1ec3ac 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.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 3ecded783aa..634c61e8a4a 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.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 843ffa22634..61028998ec2 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.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 b01981bea63..e9acfeaa140 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
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodes;
-import
org.apache.shardingsphere.infra.datasource.registry.GlobalDataSourceRegistry;
+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.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderMaterial;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import javax.sql.DataSource;
diff --git
a/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.datatype.DialectDataTypeLoader
b/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader
similarity index 55%
rename from
infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.datatype.DialectDataTypeLoader
rename to
infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader
index d3ce9fdb658..6904a47df3f 100644
---
a/infra/database/type/oracle/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.datatype.DialectDataTypeLoader
+++
b/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader
@@ -15,4 +15,9 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.database.oracle.OracleDataTypeLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.PostgreSQLSchemaMetaDataLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.MySQLSchemaMetaDataLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.OpenGaussSchemaMetaDataLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.SQLServerSchemaMetaDataLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.OracleSchemaMetaDataLoader
+org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect.H2SchemaMetaDataLoader
diff --git
a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader
b/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader
deleted file mode 100644
index c30c8e22560..00000000000
---
a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.PostgreSQLSchemaMetaDataLoader
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.MySQLSchemaMetaDataLoader
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.OpenGaussSchemaMetaDataLoader
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.SQLServerSchemaMetaDataLoader
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.OracleSchemaMetaDataLoader
-org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect.H2SchemaMetaDataLoader
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 297198a348c..086684a12d1 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.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderEngine;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
index ae393e2ab45..341e14fdb4b 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
@@ -17,6 +17,7 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.adapter;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.adapter.MetaDataLoaderConnectionAdapter;
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/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoaderTest.java
index bff04df93e0..e7650f0c3be 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoaderTest.java
@@ -17,8 +17,9 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.ColumnMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoaderTest.java
index c18d9a00fa0..e7a2390f62f 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoaderTest.java
@@ -17,7 +17,8 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.IndexMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
import org.junit.jupiter.api.Test;
import java.sql.Connection;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
index 3cc222fd93a..01628d71693 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoaderTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.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/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoaderTest.java
index 7290a217b28..f5d0bee5f69 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoaderTest.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderEngine;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderMaterial;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
index 89c5b859548..f3c66fd14f8 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoaderTest.java
@@ -18,11 +18,11 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoaderTest.java
index 37bba050032..0a9891b5b50 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoaderTest.java
@@ -18,11 +18,11 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoaderTest.java
index 46014a94f32..3f2d0e61a76 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoaderTest.java
@@ -18,11 +18,11 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
index efbe593db1a..3417dec2718 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoaderTest.java
@@ -18,12 +18,12 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoaderTest.java
index 1b32f9a3cbe..77bdd5766ec 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoaderTest.java
@@ -18,11 +18,11 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
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 2b10ad98964..ad607b2ecc6 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.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 f29150e9a26..fbb9e166587 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.metadata.database.schema.loader.metadata.SchemaMetaDataLoaderMaterial;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.SchemaMetaDataLoaderMaterial;
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/common/src/main/java/org/apache/shardingsphere/infra/datasource/registry/GlobalDataSourceRegistry.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
similarity index 96%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/registry/GlobalDataSourceRegistry.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
index bb5437f232c..a64594781a2 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/registry/GlobalDataSourceRegistry.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.datasource.registry;
+package org.apache.shardingsphere.infra.database.core;
import lombok.AccessLevel;
import lombok.Getter;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapter.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/adapter/MetaDataLoaderConnectionAdapter.java
similarity index 99%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapter.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/adapter/MetaDataLoaderConnectionAdapter.java
index 8e9792c93cb..10d4208ec45 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/adapter/MetaDataLoaderConnectionAdapter.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/adapter/MetaDataLoaderConnectionAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.adapter;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.adapter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/ColumnMetaDataLoader.java
similarity index 96%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/ColumnMetaDataLoader.java
index 1f8321ab874..f8b083dd153 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/ColumnMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/ColumnMetaDataLoader.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.common;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/IndexMetaDataLoader.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/IndexMetaDataLoader.java
index 2afd1564f4d..def85b95823 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/IndexMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/IndexMetaDataLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.common;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/SchemaMetaDataLoader.java
similarity index 96%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/SchemaMetaDataLoader.java
index f63941d0e86..9fd205374bf 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/SchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/SchemaMetaDataLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.common;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.adapter.MetaDataLoaderConnectionAdapter;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.adapter.MetaDataLoaderConnectionAdapter;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/TableMetaDataLoader.java
similarity index 90%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/TableMetaDataLoader.java
index 02a66bcbc1d..a209ea78aae 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/common/TableMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/common/TableMetaDataLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.common;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.common;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.adapter.MetaDataLoaderConnectionAdapter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.adapter.MetaDataLoaderConnectionAdapter;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/DialectSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/DialectSchemaMetaDataLoader.java
similarity index 89%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/DialectSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/DialectSchemaMetaDataLoader.java
index 04aa800a397..53357f17384 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/DialectSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/DialectSchemaMetaDataLoader.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.metadata;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderEngine.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderEngine.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderEngine.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderEngine.java
index 818844f7fc6..b362f3ab7a9 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderEngine.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderEngine.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.metadata;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.common.TableMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.TableMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import
org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnknownSQLException;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderMaterial.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderMaterial.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderMaterial.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderMaterial.java
index 83a639a4782..88a150a0ee5 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/SchemaMetaDataLoaderMaterial.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/SchemaMetaDataLoaderMaterial.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.metadata;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/H2SchemaMetaDataLoader.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/H2SchemaMetaDataLoader.java
index 560fb625b65..e71964f27d3 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/H2SchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/H2SchemaMetaDataLoader.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
similarity index 92%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
index bc738e7d9f0..892c5422ee8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/MySQLSchemaMetaDataLoader.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
-import
org.apache.shardingsphere.infra.datasource.registry.GlobalDataSourceRegistry;
+import org.apache.shardingsphere.infra.database.core.GlobalDataSourceRegistry;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
index 44d2b9c3d56..7c3dd82e44c 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OpenGaussSchemaMetaDataLoader.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
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.metadata.database.schema.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
index 1d3d8503592..8b589e7303a 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/OracleSchemaMetaDataLoader.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
import com.google.common.collect.Lists;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.adapter.MetaDataLoaderConnectionAdapter;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.adapter.MetaDataLoaderConnectionAdapter;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
index 865e0b53aa4..1c14349a6a9 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/PostgreSQLSchemaMetaDataLoader.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ConstraintMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.common.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
index de7fbcc6b7e..12e2b3f8989 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/metadata/dialect/SQLServerSchemaMetaDataLoader.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.dialect;
+package
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.dialect;
import org.apache.shardingsphere.infra.database.core.datatype.DataTypeLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.metadata.DialectSchemaMetaDataLoader;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.metadata.DialectSchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ColumnMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ColumnMetaData.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ColumnMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ColumnMetaData.java
index a694c741057..594b2d41f8c 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ColumnMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ColumnMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.model;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ConstraintMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ConstraintMetaData.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ConstraintMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ConstraintMetaData.java
index f927907f65a..74d37eaba91 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/ConstraintMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/ConstraintMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.model;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/IndexMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/IndexMetaData.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/IndexMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/IndexMetaData.java
index 65e88492134..f0c5ad659f6 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/IndexMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/IndexMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.model;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/SchemaMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/SchemaMetaData.java
similarity index 93%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/SchemaMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/SchemaMetaData.java
index 31ca36020a3..346717129f7 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/SchemaMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/SchemaMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.model;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/TableMetaData.java
similarity index 94%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/TableMetaData.java
index bada8a81c7d..e3194e4b1a8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/model/TableMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/loader/model/TableMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.loader.model;
+package org.apache.shardingsphere.infra.database.core.metadata.loader.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataTypeLoader.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataTypeLoader.java
deleted file mode 100644
index 3a4d6b9b819..00000000000
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataTypeLoader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.database.oracle;
-
-import
org.apache.shardingsphere.infra.database.core.datatype.DialectDataTypeLoader;
-
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Oracle data type loader.
- */
-public final class OracleDataTypeLoader implements DialectDataTypeLoader {
-
- @Override
- public Map<String, Integer> load() throws SQLException {
- return Collections.singletonMap("NUMBER", Types.NUMERIC);
- }
-
- @Override
- public String getDatabaseType() {
- return "Oracle";
- }
-}
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 df4d09a8491..3cafea907b9 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.metadata.database.schema.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.common.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 0dea9c999e5..15cd0a67b64 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.metadata.database.schema.loader.model.ConstraintMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 5a7d1c2d2c6..89c86f0c2d7 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.metadata.database.schema.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.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 227378a87c2..d5ee3416b9f 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.metadata.database.schema.loader.model.ColumnMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.ColumnMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.IndexMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.loader.model.TableMetaData;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.jupiter.api.Test;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
index 2db5c89b25f..ef4f34bbd3f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.infra.datasource.registry.GlobalDataSourceRegistry;
+import org.apache.shardingsphere.infra.database.core.GlobalDataSourceRegistry;
import
org.apache.shardingsphere.infra.exception.OverallConnectionNotEnoughException;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.proxy.backend.connector.BackendDataSource;
