This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b17f7dc475e Refactor DataTypeLoader (#27555)
b17f7dc475e is described below
commit b17f7dc475ecc4cfffa77fddf917574323c1cf90
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 29 15:02:45 2023 +0800
Refactor DataTypeLoader (#27555)
---
docs/document/content/dev-manual/data-source.cn.md | 16 -------
docs/document/content/dev-manual/data-source.en.md | 16 -------
.../metadata/database/DialectDatabaseMetaData.java | 11 +++++
.../metadata/database/datatype/DataTypeLoader.java | 17 ++-----
.../database/datatype/DialectDataTypeLoader.java | 39 ----------------
.../infra/database/mysql/MySQLDataTypeLoader.java | 52 ----------------------
.../database/mysql/MySQLDatabaseMetaData.java | 19 ++++++++
...core.metadata.data.loader.DialectMetaDataLoader | 18 --------
8 files changed, 33 insertions(+), 155 deletions(-)
diff --git a/docs/document/content/dev-manual/data-source.cn.md
b/docs/document/content/dev-manual/data-source.cn.md
index 00012f5b6e5..8c6b0b856bf 100644
--- a/docs/document/content/dev-manual/data-source.cn.md
+++ b/docs/document/content/dev-manual/data-source.cn.md
@@ -49,22 +49,6 @@ chapter = true
| 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
-
-### 全限定类名
-
-[`org.apache.shardingsphere.infra.database.core.metadata.database.DialectDataTypeLoader`](https://github.com/apache/shardingsphere/blob//master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.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)
|
-
## DataSourcePoolMetaData
### 全限定类名
diff --git a/docs/document/content/dev-manual/data-source.en.md
b/docs/document/content/dev-manual/data-source.en.md
index b3805b9e50c..de94c81fce0 100644
--- a/docs/document/content/dev-manual/data-source.en.md
+++ b/docs/document/content/dev-manual/data-source.en.md
@@ -49,22 +49,6 @@ Use SQL dialect to load meta data rapidly
| 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.database.DialectDataTypeLoader`](https://github.com/apache/shardingsphere/blob//master/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/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)
|
-
## DataSourcePoolMetaData
### Fully-qualified class name
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
index 21f83c41051..27482ef6c8e 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/DialectDatabaseMetaData.java
@@ -24,6 +24,8 @@ import
org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Map;
import java.util.Optional;
/**
@@ -39,6 +41,15 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
*/
QuoteCharacter getQuoteCharacter();
+ /**
+ * Get extra data types.
+ *
+ * @return extra data type map
+ */
+ default Map<String, Integer> getExtraDataTypes() {
+ return Collections.emptyMap();
+ }
+
/**
* Get default nulls order type.
*
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
index 291d0f561a6..6a7d84be54f 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DataTypeLoader.java
@@ -17,15 +17,14 @@
package
org.apache.shardingsphere.infra.database.core.metadata.database.datatype;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
import java.util.TreeMap;
/**
@@ -43,7 +42,7 @@ public final class DataTypeLoader {
*/
public Map<String, Integer> load(final DatabaseMetaData databaseMetaData,
final DatabaseType databaseType) throws SQLException {
Map<String, Integer> result = loadStandardDataTypes(databaseMetaData);
- result.putAll(loadDialectDataTypes(databaseType));
+
result.putAll(DatabaseTypedSPILoader.getService(DialectDatabaseMetaData.class,
databaseType).getExtraDataTypes());
return result;
}
@@ -56,14 +55,4 @@ public final class DataTypeLoader {
}
return result;
}
-
- private Map<String, Integer> loadDialectDataTypes(final DatabaseType
databaseType) throws SQLException {
- Optional<DialectDataTypeLoader> loader =
DatabaseTypedSPILoader.findService(DialectDataTypeLoader.class, databaseType);
- if (!loader.isPresent()) {
- return Collections.emptyMap();
- }
- Map<String, Integer> result = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- result.putAll(loader.get().load());
- return result;
- }
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
deleted file mode 100644
index b079ff0ef7c..00000000000
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/datatype/DialectDataTypeLoader.java
+++ /dev/null
@@ -1,39 +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.core.metadata.database.datatype;
-
-import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
-import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-/**
- * Dialect data type loader.
- */
-@SingletonSPI
-public interface DialectDataTypeLoader extends DatabaseTypedSPI {
-
- /**
- * Load data type.
- *
- * @return data type map
- * @throws SQLException SQL exception
- */
- Map<String, Integer> load() throws SQLException;
-}
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
deleted file mode 100644
index fb32d66e6b2..00000000000
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDataTypeLoader.java
+++ /dev/null
@@ -1,52 +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.mysql;
-
-import
org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DialectDataTypeLoader;
-
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * MySQL data type loader.
- */
-public final class MySQLDataTypeLoader implements DialectDataTypeLoader {
-
- @Override
- public Map<String, Integer> load() throws SQLException {
- Map<String, Integer> result = new HashMap<>(10, 1F);
- result.putIfAbsent("JSON", Types.LONGVARCHAR);
- result.putIfAbsent("GEOMETRY", Types.BINARY);
- result.putIfAbsent("GEOMETRYCOLLECTION", Types.BINARY);
- result.putIfAbsent("YEAR", Types.DATE);
- result.putIfAbsent("POINT", Types.BINARY);
- result.putIfAbsent("MULTIPOINT", Types.BINARY);
- result.putIfAbsent("POLYGON", Types.BINARY);
- result.putIfAbsent("MULTIPOLYGON", Types.BINARY);
- result.putIfAbsent("LINESTRING", Types.BINARY);
- result.putIfAbsent("MULTILINESTRING", Types.BINARY);
- return result;
- }
-
- @Override
- public String getDatabaseType() {
- return "MySQL";
- }
-}
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseMetaData.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseMetaData.java
index a6ba7d10366..9b10c879574 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseMetaData.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/MySQLDatabaseMetaData.java
@@ -21,8 +21,11 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDa
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
+import java.sql.Types;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
/**
@@ -53,6 +56,22 @@ public final class MySQLDatabaseMetaData implements
DialectDatabaseMetaData {
return QuoteCharacter.BACK_QUOTE;
}
+ @Override
+ public Map<String, Integer> getExtraDataTypes() {
+ Map<String, Integer> result = new HashMap<>(10, 1F);
+ result.put("JSON", Types.LONGVARCHAR);
+ result.put("GEOMETRY", Types.BINARY);
+ result.put("GEOMETRYCOLLECTION", Types.BINARY);
+ result.put("YEAR", Types.DATE);
+ result.put("POINT", Types.BINARY);
+ result.put("MULTIPOINT", Types.BINARY);
+ result.put("POLYGON", Types.BINARY);
+ result.put("MULTIPOLYGON", Types.BINARY);
+ result.put("LINESTRING", Types.BINARY);
+ result.put("MULTILINESTRING", Types.BINARY);
+ return result;
+ }
+
@Override
public NullsOrderType getDefaultNullsOrderType() {
return NullsOrderType.FIRST;
diff --git
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
b/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
deleted file mode 100644
index f87d1c82719..00000000000
---
a/infra/database/type/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.database.core.metadata.data.loader.DialectMetaDataLoader
+++ /dev/null
@@ -1,18 +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.database.mysql.MySQLMetaDataLoader
