This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 01f76c911c7 Rename MetaDataLoaderConnection (#27520)
01f76c911c7 is described below
commit 01f76c911c7caeaebb47d935f3f62962223c598c
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 28 00:35:49 2023 +0800
Rename MetaDataLoaderConnection (#27520)
* Rename MetaDataLoaderConnection
* Rename MetaDataLoaderConnection
* Rename MetaDataLoaderConnection
---
docs/document/content/dev-manual/data-source.cn.md | 24 ++++++++--------
docs/document/content/dev-manual/data-source.en.md | 33 ++++++++++++++++------
.../schema/builder/GenericSchemaBuilder.java | 8 +++---
.../database/schema/util/SchemaMetaDataUtils.java | 8 +++---
.../schema/builder/GenericSchemaBuilderTest.java | 10 +++----
.../schema/util/SchemaMetaDataUtilsTest.java | 6 ++--
...taDataLoaderEngine.java => MetaDataLoader.java} | 14 ++++-----
...nAdapter.java => MetaDataLoaderConnection.java} | 6 ++--
.../{common => type}/ColumnMetaDataLoader.java | 2 +-
.../{common => type}/IndexMetaDataLoader.java | 2 +-
.../{common => type}/SchemaMetaDataLoader.java | 10 +++----
.../{common => type}/TableMetaDataLoader.java | 10 +++----
...Test.java => MetaDataLoaderConnectionTest.java} | 23 +++++++--------
.../{common => type}/ColumnMetaDataLoaderTest.java | 2 +-
.../{common => type}/IndexMetaDataLoaderTest.java | 2 +-
.../{common => type}/TableMetaDataLoaderTest.java | 8 +++---
.../mysql/MySQLSchemaMetaDataLoaderTest.java | 2 +-
.../opengauss/OpenGaussMetaDataLoader.java | 2 +-
.../OpenGaussSchemaMetaDataLoaderTest.java | 2 +-
.../database/oracle/OracleMetaDataLoader.java | 4 +--
.../postgresql/PostgreSQLMetaDataLoader.java | 2 +-
.../PostgreSQLSchemaMetaDataLoaderTest.java | 2 +-
.../single/datanode/SingleTableDataNodeLoader.java | 2 +-
23 files changed, 101 insertions(+), 83 deletions(-)
diff --git a/docs/document/content/dev-manual/data-source.cn.md
b/docs/document/content/dev-manual/data-source.cn.md
index 62acd5040c9..f133c219de5 100644
--- a/docs/document/content/dev-manual/data-source.cn.md
+++ b/docs/document/content/dev-manual/data-source.cn.md
@@ -40,14 +40,14 @@ chapter = true
### 已知实现
-| *配置标识* | *详细说明* | *全限定类名*
|
-|------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| MySQL | 使用 MySQL 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.mysql.MySQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoader.java)
|
-| Oracle | 使用 Oracle 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.oracle.OracleMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleSchemaMetaDataLoader.java)
|
-| PostgreSQL | 使用 PostgreSQL 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.postgresql.PostgreSQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoader.java)
|
-| SQLServer | 使用 SQLServer 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.sqlserver.SQLServerMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerSchemaMetaDataLoader.java)
|
-| H2 | 使用 H2 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.h2.H2MetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SchemaMetaDataLoader.java)
|
-| openGauss | 使用 OpenGauss 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoader.java)
|
+| *配置标识* | *详细说明* | *全限定类名*
|
+|------------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| MySQL | 使用 MySQL 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.mysql.MySQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java)
|
+| Oracle | 使用 Oracle 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.oracle.OracleMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java)
|
+| PostgreSQL | 使用 PostgreSQL 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.postgresql.PostgreSQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java)
|
+| SQLServer | 使用 SQLServer 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.sqlserver.SQLServerMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java)
|
+| H2 | 使用 H2 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.h2.H2MetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java)
|
+| openGauss | 使用 OpenGauss 方言加载元数据 |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java)
|
## DialectDataTypeLoader
@@ -61,10 +61,10 @@ chapter = true
### 已知实现
-| *配置标识* | *详细说明* | *全限定类名*
|
-|--------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| MySQL | MySQL 数据类型加载器 |
[`org.apache.shardingsphere.infra.database.mysql.MySQLDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoader.java)
|
-| Oracle | Oracle 数据类型加载器 |
[`org.apache.shardingsphere.infra.database.oracle.OracleDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleSchemaMetaDataLoader.java)
|
+| *配置标识* | *详细说明* | *全限定类名*
|
+|--------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| MySQL | MySQL 数据类型加载器 |
[`org.apache.shardingsphere.infra.database.mysql.MySQLDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java)
|
+| Oracle | Oracle 数据类型加载器 |
[`org.apache.shardingsphere.infra.database.oracle.OracleDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataTypeLoader.java)
|
## DataSourcePoolMetaData
diff --git a/docs/document/content/dev-manual/data-source.en.md
b/docs/document/content/dev-manual/data-source.en.md
index b2dc360aad8..3020f5a54c7 100644
--- a/docs/document/content/dev-manual/data-source.en.md
+++ b/docs/document/content/dev-manual/data-source.en.md
@@ -40,14 +40,31 @@ Use SQL dialect to load meta data rapidly
### Implementation classes
-| *Configuration Type* | *Description* |
*Fully-qualified class name*
|
-|----------------------|------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| MySQL | Use MySQL dialect to load meta data |
[`org.apache.shardingsphere.infra.database.mysql.MySQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoader.java)
|
-| Oracle | Use Oracle dialect to load meta data |
[`org.apache.shardingsphere.infra.database.oracle.OracleMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleSchemaMetaDataLoader.java)
|
-| PostgreSQL | Use PostgreSQL dialect to load meta data |
[`org.apache.shardingsphere.infra.database.postgresql.PostgreSQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoader.java)
|
-| SQLServer | Use SQLServer dialect to load meta data |
[`org.apache.shardingsphere.infra.database.sqlserver.SQLServerMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerSchemaMetaDataLoader.java)
|
-| H2 | Use H2 dialect to load meta data |
[`org.apache.shardingsphere.infra.database.h2.H2MetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2SchemaMetaDataLoader.java)
|
-| openGauss | Use OpenGauss dialect to load meta data |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoader.java)
|
+| *Configuration Type* | *Description* |
*Fully-qualified class name*
|
+|----------------------|------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| MySQL | Use MySQL dialect to load meta data |
[`org.apache.shardingsphere.infra.database.mysql.MySQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLMetaDataLoader.java)
|
+| Oracle | Use Oracle dialect to load meta data |
[`org.apache.shardingsphere.infra.database.oracle.OracleMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java)
|
+| PostgreSQL | Use PostgreSQL dialect to load meta data |
[`org.apache.shardingsphere.infra.database.postgresql.PostgreSQLMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java)
|
+| SQLServer | Use SQLServer dialect to load meta data |
[`org.apache.shardingsphere.infra.database.sqlserver.SQLServerMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/SQLServerMetaDataLoader.java)
|
+| H2 | Use H2 dialect to load meta data |
[`org.apache.shardingsphere.infra.database.h2.H2MetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2MetaDataLoader.java)
|
+| openGauss | Use OpenGauss dialect to load meta data |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java)
|
+
+## DialectDataTypeLoader
+
+### Fully-qualified class name
+
+[`org.apache.shardingsphere.infra.database.core.metadata.datatype.DialectDataTypeLoader`](https://github.com/apache/shardingsphere/blob//master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/datatype/DialectDataTypeLoader.java)
+
+### Definition
+
+Data type loader
+
+### Implementation classes
+
+| *Configuration Type* | *Description* | *Fully-qualified class
name*
|
+|----------------------|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| MySQL | MySQL data type loader |
[`org.apache.shardingsphere.infra.database.mysql.MySQLDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java)
|
+| Oracle | Oracle data type loader |
[`org.apache.shardingsphere.infra.database.oracle.OracleDataTypeLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleDataTypeLoader.java)
|
## DataSourcePoolMetaData
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 076296ddc8c..3e3b4b421ac 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,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
@@ -98,11 +98,11 @@ public final class GenericSchemaBuilder {
private static Map<String, SchemaMetaData> loadSchemas(final
Collection<String> tableNames, final GenericSchemaBuilderMaterial material)
throws SQLException {
boolean checkMetaDataEnable =
material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_METADATA_ENABLED);
- Collection<MetaDataLoaderMaterial> metaDataLoaderMaterials =
SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(tableNames, material,
checkMetaDataEnable);
- if (metaDataLoaderMaterials.isEmpty()) {
+ Collection<MetaDataLoaderMaterial> materials =
SchemaMetaDataUtils.getMetaDataLoaderMaterials(tableNames, material,
checkMetaDataEnable);
+ if (materials.isEmpty()) {
return Collections.emptyMap();
}
- return MetaDataLoaderEngine.load(metaDataLoaderMaterials);
+ return MetaDataLoader.load(materials);
}
private static Map<String, SchemaMetaData> translate(final Map<String,
SchemaMetaData> schemaMetaDataMap, final GenericSchemaBuilderMaterial material)
{
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 aacd9f41578..1c51102a87d 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
@@ -43,15 +43,15 @@ import java.util.stream.Collectors;
public final class SchemaMetaDataUtils {
/**
- * Get schema meta data loader materials.
+ * Get meta data loader materials.
*
* @param tableNames table name collection
* @param material material
* @param checkMetaDataEnable check meta data enable config
- * @return schema meta data loader materials
+ * @return meta data loader materials
*/
- public static Collection<MetaDataLoaderMaterial>
getSchemaMetaDataLoaderMaterials(final Collection<String> tableNames,
-
final GenericSchemaBuilderMaterial material, final boolean
checkMetaDataEnable) {
+ public static Collection<MetaDataLoaderMaterial>
getMetaDataLoaderMaterials(final Collection<String> tableNames,
+
final GenericSchemaBuilderMaterial material, final boolean
checkMetaDataEnable) {
Map<String, Collection<String>> dataSourceTableGroups = new
LinkedHashMap<>();
Collection<DatabaseType> notSupportThreeTierStructureStorageTypes =
getNotSupportThreeTierStructureStorageTypes(material.getStorageTypes().values());
DataNodes dataNodes = new DataNodes(material.getRules());
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 a6684a32416..c6ab24bd524 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,7 +21,7 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.TableContainedFixtureRule;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings(MetaDataLoaderEngine.class)
+@StaticMockSettings(MetaDataLoader.class)
class GenericSchemaBuilderTest {
private GenericSchemaBuilderMaterial material;
@@ -65,21 +65,21 @@ class GenericSchemaBuilderTest {
@Test
void assertLoadWithExistedTableName() throws SQLException {
Collection<String> tableNames =
Collections.singletonList("data_node_routed_table1");
-
when(MetaDataLoaderEngine.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
+
when(MetaDataLoader.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
assertFalse(GenericSchemaBuilder.build(tableNames,
material).get(DefaultDatabase.LOGIC_NAME).getTables().isEmpty());
}
@Test
void assertLoadWithNotExistedTableName() throws SQLException {
Collection<String> tableNames =
Collections.singletonList("invalid_table");
-
when(MetaDataLoaderEngine.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
+
when(MetaDataLoader.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
assertTrue(GenericSchemaBuilder.build(tableNames,
material).get(DefaultDatabase.LOGIC_NAME).getTables().isEmpty());
}
@Test
void assertLoadAllTables() throws SQLException {
Collection<String> tableNames =
Arrays.asList("data_node_routed_table1", "data_node_routed_table2");
-
when(MetaDataLoaderEngine.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
+
when(MetaDataLoader.load(any())).thenReturn(createSchemaMetaDataMap(tableNames,
material));
Map<String, ShardingSphereSchema> actual =
GenericSchemaBuilder.build(tableNames, material);
assertThat(actual.size(), is(1));
assertTables(new
ShardingSphereSchema(actual.values().iterator().next().getTables(),
Collections.emptyMap()).getTables());
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 4c1f297ed6f..fac3045d5ca 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
@@ -49,7 +49,7 @@ class SchemaMetaDataUtilsTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_order")).thenReturn(mockShardingDataNodes());
GenericSchemaBuilderMaterial material = new
GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(),
mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule,
mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class),
"sharding_db");
- Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"),
material, true);
+ Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getMetaDataLoaderMaterials(Collections.singleton("t_order"),
material, true);
assertThat(actual.size(), is(2));
Iterator<MetaDataLoaderMaterial> iterator = actual.iterator();
MetaDataLoaderMaterial firstMaterial = iterator.next();
@@ -66,7 +66,7 @@ class SchemaMetaDataUtilsTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_order")).thenReturn(mockShardingDataNodes());
GenericSchemaBuilderMaterial material = new
GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(),
mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule,
mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class),
"sharding_db");
- Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"),
material, false);
+ Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getMetaDataLoaderMaterials(Collections.singleton("t_order"),
material, false);
assertThat(actual.size(), is(1));
Iterator<MetaDataLoaderMaterial> iterator = actual.iterator();
MetaDataLoaderMaterial firstMaterial = iterator.next();
@@ -80,7 +80,7 @@ class SchemaMetaDataUtilsTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_single")).thenReturn(mockSingleTableDataNodes());
GenericSchemaBuilderMaterial material = new
GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(),
mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule,
mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class),
"public");
- Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_single"),
material, false);
+ Collection<MetaDataLoaderMaterial> actual =
SchemaMetaDataUtils.getMetaDataLoaderMaterials(Collections.singleton("t_single"),
material, false);
assertThat(actual.size(), is(1));
Iterator<MetaDataLoaderMaterial> iterator = actual.iterator();
MetaDataLoaderMaterial firstMaterial = iterator.next();
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderEngine.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
similarity index 90%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderEngine.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
index c4129390461..1bb8cd3e2e7 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderEngine.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoader.java
@@ -22,7 +22,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.TableMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.TableMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import
org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnknownSQLException;
@@ -42,11 +42,11 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
/**
- * Meta data loader engine.
+ * Meta data loader.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
-public final class MetaDataLoaderEngine {
+public final class MetaDataLoader {
private static final ExecutorService EXECUTOR_SERVICE = new
ThreadPoolExecutor(Runtime.getRuntime().availableProcessors() * 2,
Runtime.getRuntime().availableProcessors() * 2,
0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new
ThreadFactoryBuilder().setDaemon(true).setNameFormat("ShardingSphere-SchemaMetaDataLoaderEngine-%d").build());
@@ -54,7 +54,7 @@ public final class MetaDataLoaderEngine {
/**
* Load schema meta data.
*
- * @param materials schema meta data loader materials
+ * @param materials meta data loader materials
* @return schema meta data map
* @throws SQLException SQL exception
*/
@@ -80,10 +80,10 @@ public final class MetaDataLoaderEngine {
}
private static Collection<SchemaMetaData> load(final
MetaDataLoaderMaterial material) throws SQLException {
- Optional<DialectMetaDataLoader> dialectMetaDataLoader =
DatabaseTypedSPILoader.findService(DialectMetaDataLoader.class,
material.getStorageType());
- if (dialectMetaDataLoader.isPresent()) {
+ Optional<DialectMetaDataLoader> dialectLoader =
DatabaseTypedSPILoader.findService(DialectMetaDataLoader.class,
material.getStorageType());
+ if (dialectLoader.isPresent()) {
try {
- return
dialectMetaDataLoader.get().load(material.getDataSource(),
material.getActualTableNames(), material.getDefaultSchemaName());
+ return dialectLoader.get().load(material.getDataSource(),
material.getActualTableNames(), material.getDefaultSchemaName());
} catch (final SQLException ex) {
log.debug("Dialect load schema meta data error.", ex);
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapter.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
similarity index 98%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapter.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
index adc2f6b2d96..a23dc096854 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapter.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/MetaDataLoaderConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.adapter;
+package org.apache.shardingsphere.infra.database.core.dict.loader;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -40,10 +40,10 @@ import java.util.Properties;
import java.util.concurrent.Executor;
/**
- * Meta data loader connection adapter.
+ * Meta data loader connection.
*/
@RequiredArgsConstructor
-public final class MetaDataLoaderConnectionAdapter implements Connection {
+public final class MetaDataLoaderConnection implements Connection {
private final DatabaseType databaseType;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
similarity index 99%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
index ffde4f64f0e..a1923336e35 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
similarity index 99%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
index a1777ba2067..cac0b697164 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/SchemaMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
similarity index 94%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/SchemaMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
index c19fec85102..622b5646fdb 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/SchemaMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/SchemaMetaDataLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.infra.database.core.metadata.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.adapter.MetaDataLoaderConnectionAdapter;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -61,12 +61,12 @@ public final class SchemaMetaDataLoader {
* @throws SQLException SQL exception
*/
public static Map<String, Collection<String>> loadSchemaTableNames(final
String databaseName, final DatabaseType databaseType, final DataSource
dataSource) throws SQLException {
- try (MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, dataSource.getConnection())) {
- Collection<String> schemaNames =
loadSchemaNames(connectionAdapter, databaseType);
+ try (MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, dataSource.getConnection())) {
+ Collection<String> schemaNames = loadSchemaNames(connection,
databaseType);
Map<String, Collection<String>> result = new
HashMap<>(schemaNames.size(), 1F);
for (String each : schemaNames) {
String schemaName =
databaseType.getDefaultSchema().isPresent() ? each : databaseName;
- result.put(schemaName, loadTableNames(connectionAdapter,
each));
+ result.put(schemaName, loadTableNames(connection, each));
}
return result;
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
similarity index 84%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoader.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
index 40b1bc197b3..685960203a9 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.adapter.MetaDataLoaderConnectionAdapter;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.dict.model.TableMetaData;
@@ -46,11 +46,11 @@ public final class TableMetaDataLoader {
* @throws SQLException SQL exception
*/
public static Optional<TableMetaData> load(final DataSource dataSource,
final String tableNamePattern, final DatabaseType databaseType) throws
SQLException {
- try (MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, dataSource.getConnection())) {
+ try (MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, dataSource.getConnection())) {
String formattedTableNamePattern =
databaseType.formatTableNamePattern(tableNamePattern);
- return isTableExist(connectionAdapter, formattedTableNamePattern)
+ return isTableExist(connection, formattedTableNamePattern)
? Optional.of(new TableMetaData(tableNamePattern,
ColumnMetaDataLoader.load(
- connectionAdapter, formattedTableNamePattern,
databaseType), IndexMetaDataLoader.load(connectionAdapter,
formattedTableNamePattern), Collections.emptyList()))
+ connection, formattedTableNamePattern,
databaseType), IndexMetaDataLoader.load(connection, formattedTableNamePattern),
Collections.emptyList()))
: Optional.empty();
}
}
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
similarity index 72%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
index b385c2c6357..fed1576d27e 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionAdapterTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/adapter/MetaDataLoaderConnectionTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.database.core.dict.loader.adapter;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class MetaDataLoaderConnectionAdapterTest {
+class MetaDataLoaderConnectionTest {
private static final String TEST_CATALOG = "catalog";
@@ -47,35 +48,35 @@ class MetaDataLoaderConnectionAdapterTest {
@Test
void assertGetCatalog() throws SQLException {
when(connection.getCatalog()).thenReturn(TEST_CATALOG);
- MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, connection);
- assertThat(connectionAdapter.getCatalog(), is(TEST_CATALOG));
+ MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, this.connection);
+ assertThat(connection.getCatalog(), is(TEST_CATALOG));
}
@Test
void assertGetCatalogReturnNullWhenThrowsSQLException() throws
SQLException {
when(connection.getCatalog()).thenThrow(SQLException.class);
- MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, connection);
- assertNull(connectionAdapter.getCatalog());
+ MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, this.connection);
+ assertNull(connection.getCatalog());
}
@Test
void assertGetSchema() throws SQLException {
when(connection.getSchema()).thenReturn(TEST_SCHEMA);
- MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, connection);
- assertThat(connectionAdapter.getSchema(), is(TEST_SCHEMA));
+ MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, this.connection);
+ assertThat(connection.getSchema(), is(TEST_SCHEMA));
}
@Test
void assertGetSchemaByMySQLSPI() throws SQLException {
when(connection.getSchema()).thenReturn(TEST_SCHEMA);
- MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, connection);
- assertThat(connectionAdapter.getSchema(), is(TEST_SCHEMA));
+ MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, this.connection);
+ assertThat(connection.getSchema(), is(TEST_SCHEMA));
}
@Test
void assertGetSchemaReturnNullWhenThrowsSQLException() throws SQLException
{
when(connection.getSchema()).thenThrow(SQLException.class);
- MetaDataLoaderConnectionAdapter connectionAdapter = new
MetaDataLoaderConnectionAdapter(databaseType, connection);
- assertNull(connectionAdapter.getSchema());
+ MetaDataLoaderConnection connection = new
MetaDataLoaderConnection(databaseType, this.connection);
+ assertNull(connection.getSchema());
}
}
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
similarity index 99%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
index b991b41667b..9ca8fe14412 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/ColumnMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/ColumnMetaDataLoaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
similarity index 99%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
index 37a4610523c..380a99a9168 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/IndexMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/IndexMetaDataLoaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
import org.junit.jupiter.api.Test;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoaderTest.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
similarity index 96%
rename from
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoaderTest.java
rename to
infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
index af6bb85c257..089b56d3616 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/common/TableMetaDataLoaderTest.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/dict/loader/type/TableMetaDataLoaderTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.core.dict.loader.common;
+package org.apache.shardingsphere.infra.database.core.dict.loader.type;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderEngine;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderMaterial;
import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.dict.model.IndexMetaData;
@@ -108,7 +108,7 @@ class TableMetaDataLoaderTest {
void assertLoadWithExistedTable() throws SQLException {
DatabaseType databaseType = mock(DatabaseType.class,
RETURNS_DEEP_STUBS);
when(databaseType.formatTableNamePattern(TEST_TABLE)).thenReturn(TEST_TABLE);
- Map<String, SchemaMetaData> actual =
MetaDataLoaderEngine.load(Collections.singletonList(
+ Map<String, SchemaMetaData> actual =
MetaDataLoader.load(Collections.singletonList(
new
MetaDataLoaderMaterial(Collections.singletonList(TEST_TABLE), dataSource,
databaseType, "sharding_db")));
TableMetaData tableMetaData =
actual.get("sharding_db").getTables().iterator().next();
Collection<ColumnMetaData> columns = tableMetaData.getColumns();
@@ -131,7 +131,7 @@ class TableMetaDataLoaderTest {
@Test
void assertLoadWithNotExistedTable() throws SQLException {
- Map<String, SchemaMetaData> actual =
MetaDataLoaderEngine.load(Collections.singletonList(
+ Map<String, SchemaMetaData> actual =
MetaDataLoader.load(Collections.singletonList(
new
MetaDataLoaderMaterial(Collections.singletonList(TEST_TABLE), dataSource,
mock(DatabaseType.class), "sharding_db")));
assertFalse(actual.isEmpty());
assertTrue(actual.containsKey("sharding_db"));
diff --git
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
index c1169073dfa..94cd08150a7 100644
---
a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/MySQLSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.mysql;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
index de5bfe14074..cad87f2284f 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussMetaDataLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.database.opengauss;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
import
org.apache.shardingsphere.infra.database.core.dict.loader.DialectMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
diff --git
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
index 32da9b32026..5aa160c6cb0 100644
---
a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.opengauss;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
index 7ecc7e1dec6..1a0939323c5 100644
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
+++
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/OracleMetaDataLoader.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.oracle;
import com.google.common.collect.Lists;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.adapter.MetaDataLoaderConnectionAdapter;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.MetaDataLoaderConnection;
import org.apache.shardingsphere.infra.database.core.dict.model.ColumnMetaData;
import org.apache.shardingsphere.infra.database.core.dict.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -76,7 +76,7 @@ public final class OracleMetaDataLoader implements
DialectMetaDataLoader {
public Collection<SchemaMetaData> load(final DataSource dataSource, final
Collection<String> tables, final String defaultSchemaName) throws SQLException {
Map<String, Collection<ColumnMetaData>> columnMetaDataMap = new
HashMap<>(tables.size(), 1F);
Map<String, Collection<IndexMetaData>> indexMetaDataMap = new
HashMap<>(tables.size(), 1F);
- try (Connection connection = new
MetaDataLoaderConnectionAdapter(TypedSPILoader.getService(DatabaseType.class,
"Oracle"), dataSource.getConnection())) {
+ try (Connection connection = new
MetaDataLoaderConnection(TypedSPILoader.getService(DatabaseType.class,
"Oracle"), dataSource.getConnection())) {
for (List<String> each : Lists.partition(new ArrayList<>(tables),
MAX_EXPRESSION_SIZE)) {
columnMetaDataMap.putAll(loadColumnMetaDataMap(connection,
each));
indexMetaDataMap.putAll(loadIndexMetaData(connection, each));
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
index 44327c82519..d8a8ee2c605 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLMetaDataLoader.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.database.postgresql;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import
org.apache.shardingsphere.infra.database.core.dict.model.ConstraintMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.core.metadata.datatype.DataTypeLoader;
diff --git
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
index 02906d62582..49e366a7335 100644
---
a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
+++
b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/PostgreSQLSchemaMetaDataLoaderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.postgresql;
import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/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 ae4251b3358..ec8f641b5cb 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
-import
org.apache.shardingsphere.infra.database.core.dict.loader.common.SchemaMetaDataLoader;
+import
org.apache.shardingsphere.infra.database.core.dict.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.single.api.constant.SingleTableConstants;
import org.apache.shardingsphere.single.exception.SingleTablesLoadingException;
