This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 b23d70efe4c Revise DialectSchemaMetaDataLoader to
DialectMetaDataLoader (#27519)
b23d70efe4c is described below
commit b23d70efe4cc67fb58043ee1c0400e824b6e14bf
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 28 00:01:24 2023 +0800
Revise DialectSchemaMetaDataLoader to DialectMetaDataLoader (#27519)
---
docs/document/content/dev-manual/data-source.cn.md | 4 ++--
docs/document/content/dev-manual/data-source.en.md | 4 ++--
.../infra/database/core/dict/loader/MetaDataLoaderEngine.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/document/content/dev-manual/data-source.cn.md
b/docs/document/content/dev-manual/data-source.cn.md
index 5a262b8edc2..62acd5040c9 100644
--- a/docs/document/content/dev-manual/data-source.cn.md
+++ b/docs/document/content/dev-manual/data-source.cn.md
@@ -28,11 +28,11 @@ chapter = true
| H2 | H2 数据库 |
[`org.apache.shardingsphere.infra.database.h2.H2DatabaseType`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseType.java)
|
| openGauss | OpenGauss 数据库 |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseType.java)
|
-## DialectSchemaMetaDataLoader
+## DialectMetaDataLoader
### 全限定类名
-[`org.apache.shardingsphere.infra.database.core.dict.metadata.DialectSchemaMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/metadata/DialectSchemaMetaDataLoader.java)
+[`org.apache.shardingsphere.infra.database.core.dict.metadata.DialectMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/metadata/DialectMetaDataLoader.java)
### 定义
diff --git a/docs/document/content/dev-manual/data-source.en.md
b/docs/document/content/dev-manual/data-source.en.md
index 6ce74df6d3f..b2dc360aad8 100644
--- a/docs/document/content/dev-manual/data-source.en.md
+++ b/docs/document/content/dev-manual/data-source.en.md
@@ -28,11 +28,11 @@ Supported database types definition
| H2 | H2 database |
[`org.apache.shardingsphere.infra.database.h2.H2DatabaseType`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/h2/src/main/java/org/apache/shardingsphere/infra/database/h2/H2DatabaseType.java)
|
| openGauss | OpenGauss database |
[`org.apache.shardingsphere.infra.database.opengauss.OpenGaussDatabaseType`](https://github.com/apache/shardingsphere/blob/master/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/OpenGaussDatabaseType.java)
|
-## DialectSchemaMetaDataLoader
+## DialectMetaDataLoader
### Fully-qualified class name
-[`org.apache.shardingsphere.infra.database.core.dict.metadata.DialectSchemaMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/metadata/DialectSchemaMetaDataLoader.java)
+[`org.apache.shardingsphere.infra.database.core.dict.metadata.DialectMetaDataLoader`](https://github.com/apache/shardingsphere/blob/master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/dict/metadata/DialectMetaDataLoader.java)
### Definition
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/MetaDataLoaderEngine.java
index bba42bb134d..c4129390461 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/MetaDataLoaderEngine.java
@@ -80,10 +80,10 @@ public final class MetaDataLoaderEngine {
}
private static Collection<SchemaMetaData> load(final
MetaDataLoaderMaterial material) throws SQLException {
- Optional<DialectMetaDataLoader> dialectSchemaMetaDataLoader =
DatabaseTypedSPILoader.findService(DialectMetaDataLoader.class,
material.getStorageType());
- if (dialectSchemaMetaDataLoader.isPresent()) {
+ Optional<DialectMetaDataLoader> dialectMetaDataLoader =
DatabaseTypedSPILoader.findService(DialectMetaDataLoader.class,
material.getStorageType());
+ if (dialectMetaDataLoader.isPresent()) {
try {
- return
dialectSchemaMetaDataLoader.get().load(material.getDataSource(),
material.getActualTableNames(), material.getDefaultSchemaName());
+ return
dialectMetaDataLoader.get().load(material.getDataSource(),
material.getActualTableNames(), material.getDefaultSchemaName());
} catch (final SQLException ex) {
log.debug("Dialect load schema meta data error.", ex);
}