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 55cc71ded3f Add shardingsphere-sql-federation-mysql module (#37308)
55cc71ded3f is described below
commit 55cc71ded3f04fed1ce4000d25db08a58a9484be
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 9 12:13:11 2025 +0800
Add shardingsphere-sql-federation-mysql module (#37308)
* Remove default SQLFederationColumnTypeConverter's impl
* Remove default SQLFederationColumnTypeConverter's impl
* Add shardingsphere-sql-federation-mysql module
* Fix conflicts
---
distribution/bom/pom.xml | 5 +++++
jdbc-dialect/mariadb/pom.xml | 6 ++++++
jdbc-dialect/mysql/pom.xml | 6 ++++++
kernel/sql-federation/{ => dialect/mysql}/pom.xml | 13 ++-----------
.../sqlfederation/mysql}/MySQLColumnTypeConverter.java | 4 ++--
...esultset.converter.SQLFederationColumnTypeConverter | 2 +-
kernel/sql-federation/{ => dialect}/pom.xml | 18 +++++++++++-------
kernel/sql-federation/pom.xml | 1 +
proxy/dialect/mariadb/pom.xml | 6 ++++++
proxy/dialect/mysql/pom.xml | 6 ++++++
10 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/distribution/bom/pom.xml b/distribution/bom/pom.xml
index 3c683f3374f..7aab00d4cee 100644
--- a/distribution/bom/pom.xml
+++ b/distribution/bom/pom.xml
@@ -650,6 +650,11 @@
<artifactId>shardingsphere-sql-federation-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sql-parser-api</artifactId>
diff --git a/jdbc-dialect/mariadb/pom.xml b/jdbc-dialect/mariadb/pom.xml
index b8dd3a4e8c2..7a307dc84fd 100644
--- a/jdbc-dialect/mariadb/pom.xml
+++ b/jdbc-dialect/mariadb/pom.xml
@@ -57,5 +57,11 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/jdbc-dialect/mysql/pom.xml b/jdbc-dialect/mysql/pom.xml
index e9cafd39533..f21677a6cef 100644
--- a/jdbc-dialect/mysql/pom.xml
+++ b/jdbc-dialect/mysql/pom.xml
@@ -51,5 +51,11 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/kernel/sql-federation/pom.xml
b/kernel/sql-federation/dialect/mysql/pom.xml
similarity index 79%
copy from kernel/sql-federation/pom.xml
copy to kernel/sql-federation/dialect/mysql/pom.xml
index c44f4573228..6802228625c 100644
--- a/kernel/sql-federation/pom.xml
+++ b/kernel/sql-federation/dialect/mysql/pom.xml
@@ -20,18 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-kernel</artifactId>
+ <artifactId>shardingsphere-sql-federation-dialect</artifactId>
<version>5.5.3-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-sql-federation</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
<name>${project.artifactId}</name>
-
- <modules>
- <module>api</module>
- <module>core</module>
- <module>distsql</module>
- <module>compiler</module>
- <module>executor</module>
- </modules>
</project>
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/impl/MySQLColumnTypeConverter.java
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLColumnTypeConverter.java
similarity index 94%
rename from
kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/impl/MySQLColumnTypeConverter.java
rename to
kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLColumnTypeConverter.java
index b069c686281..6de9991e7ac 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/impl/MySQLColumnTypeConverter.java
+++
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLColumnTypeConverter.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sqlfederation.resultset.converter.impl;
+package org.apache.shardingsphere.sqlfederation.mysql;
import org.apache.calcite.sql.type.SqlTypeName;
import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
/**
- * MySQL column type converter.
+ * Column type converter for MySQL.
*/
public final class MySQLColumnTypeConverter implements
SQLFederationColumnTypeConverter {
diff --git
a/kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
b/kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
similarity index 89%
rename from
kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
rename to
kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
index eced0c7ac36..a344a512e58 100644
---
a/kernel/sql-federation/core/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
+++
b/kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.sqlfederation.resultset.converter.impl.MySQLColumnTypeConverter
+org.apache.shardingsphere.sqlfederation.mysql.MySQLColumnTypeConverter
diff --git a/kernel/sql-federation/pom.xml
b/kernel/sql-federation/dialect/pom.xml
similarity index 75%
copy from kernel/sql-federation/pom.xml
copy to kernel/sql-federation/dialect/pom.xml
index c44f4573228..7df6dfc6508 100644
--- a/kernel/sql-federation/pom.xml
+++ b/kernel/sql-federation/dialect/pom.xml
@@ -20,18 +20,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-kernel</artifactId>
+ <artifactId>shardingsphere-sql-federation</artifactId>
<version>5.5.3-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-sql-federation</artifactId>
+ <artifactId>shardingsphere-sql-federation-dialect</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<modules>
- <module>api</module>
- <module>core</module>
- <module>distsql</module>
- <module>compiler</module>
- <module>executor</module>
+ <module>mysql</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/kernel/sql-federation/pom.xml b/kernel/sql-federation/pom.xml
index c44f4573228..ed12661a5a4 100644
--- a/kernel/sql-federation/pom.xml
+++ b/kernel/sql-federation/pom.xml
@@ -33,5 +33,6 @@
<module>distsql</module>
<module>compiler</module>
<module>executor</module>
+ <module>dialect</module>
</modules>
</project>
diff --git a/proxy/dialect/mariadb/pom.xml b/proxy/dialect/mariadb/pom.xml
index abb006907ab..bf09d4f71d0 100644
--- a/proxy/dialect/mariadb/pom.xml
+++ b/proxy/dialect/mariadb/pom.xml
@@ -57,6 +57,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-protocol-mysql</artifactId>
diff --git a/proxy/dialect/mysql/pom.xml b/proxy/dialect/mysql/pom.xml
index c0f737b5f8b..24a44aa16bc 100644
--- a/proxy/dialect/mysql/pom.xml
+++ b/proxy/dialect/mysql/pom.xml
@@ -51,6 +51,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-federation-mysql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-protocol-mysql</artifactId>
