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 bb359f23f81 Rename DialectSQLFederationFunctionRegister and
DialectSQLFederationColumnTypeConverter (#37315)
bb359f23f81 is described below
commit bb359f23f81f8eb279cd7e804f2cd6e3a924b37d
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 9 22:22:09 2025 +0800
Rename DialectSQLFederationFunctionRegister and
DialectSQLFederationColumnTypeConverter (#37315)
* Rename DialectSQLFederationFunctionRegister and
DialectSQLFederationColumnTypeConverter
* Rename DialectSQLFederationFunctionRegister and
DialectSQLFederationColumnTypeConverter
* Rename DialectSQLFederationFunctionRegister and
DialectSQLFederationColumnTypeConverter
---
.../reachability-metadata.json | 30 +++++++++++-----------
.../reachability-metadata.json | 6 ++---
.../context/schema/CalciteSchemaBuilder.java | 6 ++---
...a => DialectSQLFederationFunctionRegister.java} | 4 +--
.../resultset/SQLFederationResultSet.java | 6 ++---
.../resultset/SQLFederationResultSetMetaData.java | 6 ++---
...> DialectSQLFederationColumnTypeConverter.java} | 4 +--
.../impl/StandardSQLFederationProcessorTest.java | 6 ++---
.../SQLFederationResultSetMetaDataTest.java | 8 +++---
...ctSQLFederationColumnTypeConverterFixture.java} | 4 +--
...verter.DialectSQLFederationColumnTypeConverter} | 2 +-
.../MySQLSQLFederationColumnTypeConverter.java | 4 +--
.../mysql/MySQLSQLFederationFunctionRegister.java | 4 +--
....function.DialectSQLFederationFunctionRegister} | 0
...verter.DialectSQLFederationColumnTypeConverter} | 0
.../MySQLSQLFederationColumnTypeConverterTest.java | 6 +++--
.../OpenGaussSQLFederationFunctionRegister.java | 6 ++---
....function.DialectSQLFederationFunctionRegister} | 0
.../PostgreSQLSQLFederationFunctionRegister.java | 4 +--
....function.DialectSQLFederationFunctionRegister} | 0
20 files changed, 54 insertions(+), 52 deletions(-)
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index f681c2e4ecf..1bc14a4582a 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -10181,43 +10181,43 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
- "type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.H2ConnectionConfigBuilder"
+ "type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
- "type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.MySQLConnectionConfigBuilder"
+ "type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.OpenGaussConnectionConfigBuilder"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.OracleConnectionConfigBuilder"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.PostgreSQLConnectionConfigBuilder"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.SQL92ConnectionConfigBuilder"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.impl.SQLServerConnectionConfigBuilder"
},
@@ -10384,7 +10384,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.MySQLFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.mysql.MySQLSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.impl.MySQLBinFunction"
},
@@ -10402,19 +10402,19 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.OpenGaussFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.opengauss.OpenGaussSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.impl.OpenGaussSystemFunction"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.OpenGaussFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.opengauss.OpenGaussSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.impl.PostgreSQLSystemFunction"
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.PostgreSQLFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.postgresql.PostgreSQLSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.impl.PostgreSQLSystemFunction"
},
@@ -12080,9 +12080,9 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilderFactory"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.SQLFederationConnectionConfigBuilderFactory"
},
- "glob":
"META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.ConnectionConfigBuilder"
+ "glob":
"META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.context.connection.config.DialectSQLFederationConnectionConfigBuilder"
},
{
"condition": {
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reachability-metadata.json
index 91d89603de0..411e6407ef8 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reachability-metadata.json
@@ -438,21 +438,21 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.MySQLFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.mysql.MySQLSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.impl.MySQLBinFunction",
"allPublicMethods": true
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.OpenGaussFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.opengauss.OpenGaussSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.impl.OpenGaussSystemFunction",
"allPublicMethods": true
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.PostgreSQLFunctionRegister"
+ "typeReached":
"org.apache.shardingsphere.sqlfederation.postgresql.PostgreSQLSQLFederationFunctionRegister"
},
"type":
"org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.impl.PostgreSQLSystemFunction",
"allPublicMethods": true
diff --git
a/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/context/schema/CalciteSchemaBuilder.java
b/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/context/schema/CalciteSchemaBuilder.java
index 32a7811212a..83ebc1884d6 100644
---
a/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/context/schema/CalciteSchemaBuilder.java
+++
b/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/context/schema/CalciteSchemaBuilder.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.sqlfederation.compiler.metadata.schema.SQLFederationDatabase;
import
org.apache.shardingsphere.sqlfederation.compiler.metadata.schema.SQLFederationSchema;
-import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister;
+import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister;
import java.util.Collection;
import java.util.Optional;
@@ -83,13 +83,13 @@ public final class CalciteSchemaBuilder {
private static void registerFunction(final CalciteSchema calciteSchema,
final DatabaseType databaseType) {
for (CalciteSchema each : calciteSchema.getSubSchemaMap().values()) {
-
DatabaseTypedSPILoader.findService(SQLFederationFunctionRegister.class,
databaseType).ifPresent(optional -> optional.registerFunction(each.plus(),
each.getName()));
+
DatabaseTypedSPILoader.findService(DialectSQLFederationFunctionRegister.class,
databaseType).ifPresent(optional -> optional.registerFunction(each.plus(),
each.getName()));
}
}
private static void registerFunction(final Collection<CalciteSchema>
subSchemas, final DatabaseType databaseType) {
for (CalciteSchema each : subSchemas) {
-
DatabaseTypedSPILoader.findService(SQLFederationFunctionRegister.class,
databaseType).ifPresent(optional -> optional.registerFunction(each.plus(),
each.getName()));
+
DatabaseTypedSPILoader.findService(DialectSQLFederationFunctionRegister.class,
databaseType).ifPresent(optional -> optional.registerFunction(each.plus(),
each.getName()));
}
}
diff --git
a/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/SQLFederationFunctionRegister.java
b/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/DialectSQLFederationFunctionRegister.java
similarity index 91%
rename from
kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/SQLFederationFunctionRegister.java
rename to
kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/DialectSQLFederationFunctionRegister.java
index daf340f0a38..b27498a7ec1 100644
---
a/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/SQLFederationFunctionRegister.java
+++
b/kernel/sql-federation/compiler/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/sql/function/DialectSQLFederationFunctionRegister.java
@@ -22,10 +22,10 @@ import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
/**
- * SQL federation function register.
+ * Dialect SQL federation function register.
*/
@SingletonSPI
-public interface SQLFederationFunctionRegister extends DatabaseTypedSPI {
+public interface DialectSQLFederationFunctionRegister extends DatabaseTypedSPI
{
/**
* Register function.
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
index 922e99216b4..09ef0ec02c7 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtils;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessEngine;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
import java.io.InputStream;
import java.io.Reader;
@@ -73,7 +73,7 @@ public final class SQLFederationResultSet extends
AbstractUnsupportedOperationSQ
private final SQLFederationResultSetMetaData resultSetMetaData;
- private final SQLFederationColumnTypeConverter columnTypeConverter;
+ private final DialectSQLFederationColumnTypeConverter columnTypeConverter;
private final String processId;
@@ -87,7 +87,7 @@ public final class SQLFederationResultSet extends
AbstractUnsupportedOperationSQ
final RelDataType resultColumnType, final
String processId) {
this.enumerator = enumerator;
this.processId = processId;
- columnTypeConverter =
DatabaseTypedSPILoader.findService(SQLFederationColumnTypeConverter.class,
databaseType).orElse(null);
+ columnTypeConverter =
DatabaseTypedSPILoader.findService(DialectSQLFederationColumnTypeConverter.class,
databaseType).orElse(null);
columnLabelAndIndexes = new
CaseInsensitiveMap<>(expandProjections.size(), 1F);
Map<Integer, String> indexAndColumnLabels = new
CaseInsensitiveMap<>(expandProjections.size(), 1F);
handleColumnLabelAndIndex(columnLabelAndIndexes, indexAndColumnLabels,
expandProjections);
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
index afb2a7f17f3..f1794a6f197 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaData.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
import
org.apache.shardingsphere.sqlfederation.compiler.sql.type.SQLFederationDataTypeFactory;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
import java.math.BigInteger;
import java.sql.ResultSetMetaData;
@@ -54,10 +54,10 @@ public final class SQLFederationResultSetMetaData extends
SQLFederationWrapperAd
private final Map<Integer, String> indexAndColumnLabels;
- private final SQLFederationColumnTypeConverter columnTypeConverter;
+ private final DialectSQLFederationColumnTypeConverter columnTypeConverter;
public SQLFederationResultSetMetaData(final Schema sqlFederationSchema,
final List<Projection> expandProjections, final DatabaseType databaseType,
final RelDataType resultColumnType,
- final Map<Integer, String>
indexAndColumnLabels, final SQLFederationColumnTypeConverter
columnTypeConverter) {
+ final Map<Integer, String>
indexAndColumnLabels, final DialectSQLFederationColumnTypeConverter
columnTypeConverter) {
this.sqlFederationSchema = sqlFederationSchema;
typeFactory = SQLFederationDataTypeFactory.getInstance();
this.expandProjections = expandProjections;
diff --git
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/SQLFederationColumnTypeConverter.java
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/DialectSQLFederationColumnTypeConverter.java
similarity index 91%
rename from
kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/SQLFederationColumnTypeConverter.java
rename to
kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/DialectSQLFederationColumnTypeConverter.java
index 65562b0c59c..1426639ff2d 100644
---
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/SQLFederationColumnTypeConverter.java
+++
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/converter/DialectSQLFederationColumnTypeConverter.java
@@ -22,10 +22,10 @@ import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
/**
- * SQL federation column type converter.
+ * Dialect SQL federation column type converter.
*/
@SingletonSPI
-public interface SQLFederationColumnTypeConverter extends DatabaseTypedSPI {
+public interface DialectSQLFederationColumnTypeConverter extends
DatabaseTypedSPI {
/**
* Convert column value.
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/processor/impl/StandardSQLFederationProcessorTest.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/processor/impl/StandardSQLFederationProcessorTest.java
index f879c78fc61..ae959414fbe 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/processor/impl/StandardSQLFederationProcessorTest.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/engine/processor/impl/StandardSQLFederationProcessorTest.java
@@ -49,7 +49,7 @@ import
org.apache.shardingsphere.sqlfederation.compiler.rel.converter.SQLFederat
import org.apache.shardingsphere.sqlfederation.context.SQLFederationContext;
import
org.apache.shardingsphere.sqlfederation.engine.processor.SQLFederationProcessor;
import
org.apache.shardingsphere.sqlfederation.resultset.SQLFederationResultSet;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
@@ -224,7 +224,7 @@ class StandardSQLFederationProcessorTest {
MockedStatic<DatabaseTypedSPILoader> mockedSpiLoader =
mockStatic(DatabaseTypedSPILoader.class)) {
ignoredInterpretable.when(() ->
EnumerableInterpretable.toBindable(any(Map.class), any(), any(),
any())).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
- .getService(eq(SQLFederationColumnTypeConverter.class),
any(DatabaseType.class))).thenReturn(mock(SQLFederationColumnTypeConverter.class));
+
.getService(eq(DialectSQLFederationColumnTypeConverter.class),
any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
ResultSet result = processor.executePlan(prepareEngine, callback,
executionPlan, converter, federationContext, rootSchema);
((SQLFederationResultSet) result).close();
}
@@ -264,7 +264,7 @@ class StandardSQLFederationProcessorTest {
MockedStatic<DatabaseTypedSPILoader> mockedSpiLoader =
mockStatic(DatabaseTypedSPILoader.class)) {
ignoredInterpretable.when(() ->
EnumerableInterpretable.toBindable(any(Map.class), any(), any(),
any())).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
- .getService(eq(SQLFederationColumnTypeConverter.class),
any(DatabaseType.class))).thenReturn(mock(SQLFederationColumnTypeConverter.class));
+
.getService(eq(DialectSQLFederationColumnTypeConverter.class),
any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
ResultSet previewResult = processor.executePlan(prepareEngine,
callback, executionPlan, converter, federationContext, rootSchema);
((SQLFederationResultSet) previewResult).close();
ResultSet normalResult = processor.executePlan(prepareEngine,
callback, executionPlan, converter, federationContext, rootSchema);
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaDataTest.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaDataTest.java
index 919f9060b0e..3eb67ce70d4 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaDataTest.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSetMetaDataTest.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.ColumnProjection;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
import org.junit.jupiter.api.Test;
import java.math.BigInteger;
@@ -299,7 +299,7 @@ class SQLFederationResultSetMetaDataTest {
void assertGetColumnTypeForRegularType() {
RelDataType intType = mock(RelDataType.class);
when(intType.getSqlTypeName()).thenReturn(SqlTypeName.INTEGER);
- SQLFederationColumnTypeConverter converter =
mock(SQLFederationColumnTypeConverter.class);
+ DialectSQLFederationColumnTypeConverter converter =
mock(DialectSQLFederationColumnTypeConverter.class);
when(converter.convertColumnType(intType.getSqlTypeName())).thenReturn(Types.INTEGER);
SQLFederationResultSetMetaData metaData = new
SQLFederationResultSetMetaData(
mock(), Collections.emptyList(), databaseType,
createResultType(new String[]{"foo_col"}, intType), Collections.singletonMap(1,
"foo_label"), converter);
@@ -310,7 +310,7 @@ class SQLFederationResultSetMetaDataTest {
void assertGetColumnTypeNameWithMapping() {
RelDataType intType = mock(RelDataType.class);
when(intType.getSqlTypeName()).thenReturn(SqlTypeName.INTEGER);
- SQLFederationColumnTypeConverter converter =
mock(SQLFederationColumnTypeConverter.class);
+ DialectSQLFederationColumnTypeConverter converter =
mock(DialectSQLFederationColumnTypeConverter.class);
when(converter.convertColumnType(intType.getSqlTypeName())).thenReturn(Types.INTEGER);
SQLFederationResultSetMetaData metaData = new
SQLFederationResultSetMetaData(
mock(), Collections.emptyList(), databaseType,
createResultType(new String[]{"foo_col"}, intType), Collections.singletonMap(1,
"foo_label"), converter);
@@ -321,7 +321,7 @@ class SQLFederationResultSetMetaDataTest {
void assertGetColumnTypeNameWithoutMapping() {
RelDataType varcharType = mock(RelDataType.class);
when(varcharType.getSqlTypeName()).thenReturn(SqlTypeName.VARCHAR);
- SQLFederationColumnTypeConverter converter =
mock(SQLFederationColumnTypeConverter.class);
+ DialectSQLFederationColumnTypeConverter converter =
mock(DialectSQLFederationColumnTypeConverter.class);
when(converter.convertColumnType(varcharType.getSqlTypeName())).thenReturn(999);
SQLFederationResultSetMetaData metaData = new
SQLFederationResultSetMetaData(
mock(), Collections.emptyList(), databaseType,
createResultType(new String[]{"foo_col"}, varcharType),
Collections.singletonMap(1, "foo_label"), converter);
diff --git
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/SQLFederationColumnTypeConverterFixture.java
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/DialectSQLFederationColumnTypeConverterFixture.java
similarity index 89%
rename from
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/SQLFederationColumnTypeConverterFixture.java
rename to
kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/DialectSQLFederationColumnTypeConverterFixture.java
index 802b14019e8..bf50e4d45e1 100644
---
a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/SQLFederationColumnTypeConverterFixture.java
+++
b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/resultset/fixture/converter/DialectSQLFederationColumnTypeConverterFixture.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.sqlfederation.resultset.fixture.converter;
import org.apache.calcite.sql.type.SqlTypeName;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
-public final class SQLFederationColumnTypeConverterFixture implements
SQLFederationColumnTypeConverter {
+public final class DialectSQLFederationColumnTypeConverterFixture implements
DialectSQLFederationColumnTypeConverter {
@Override
public Object convertColumnValue(final Object columnValue) {
diff --git
a/kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
b/kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter
similarity index 94%
rename from
kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
rename to
kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter
index be5ddc4baa6..3e891e96910 100644
---
a/kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter
+++
b/kernel/sql-federation/core/src/test/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.sqlfederation.resultset.fixture.converter.SQLFederationColumnTypeConverterFixture
+org.apache.shardingsphere.sqlfederation.resultset.fixture.converter.DialectSQLFederationColumnTypeConverterFixture
diff --git
a/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverter.java
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverter.java
index 70047c030ad..d8d5a38c5ae 100644
---
a/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverter.java
+++
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverter.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.sqlfederation.mysql;
import org.apache.calcite.sql.type.SqlTypeName;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
/**
* SQL federation column type converter for MySQL.
*/
-public final class MySQLSQLFederationColumnTypeConverter implements
SQLFederationColumnTypeConverter {
+public final class MySQLSQLFederationColumnTypeConverter implements
DialectSQLFederationColumnTypeConverter {
@Override
public Object convertColumnValue(final Object columnValue) {
diff --git
a/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationFunctionRegister.java
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationFunctionRegister.java
index 4c2b00d41dd..413daf7c6c2 100644
---
a/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationFunctionRegister.java
+++
b/kernel/sql-federation/dialect/mysql/src/main/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationFunctionRegister.java
@@ -20,13 +20,13 @@ package org.apache.shardingsphere.sqlfederation.mysql;
import org.apache.calcite.runtime.SqlFunctions;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
-import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister;
+import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister;
import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.mysql.impl.MySQLBinFunction;
/**
* SQL federation function register for MySQL.
*/
-public final class MySQLSQLFederationFunctionRegister implements
SQLFederationFunctionRegister {
+public final class MySQLSQLFederationFunctionRegister implements
DialectSQLFederationFunctionRegister {
@Override
public void registerFunction(final SchemaPlus schemaPlus, final String
schemaName) {
diff --git
a/kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
b/kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
similarity index 100%
rename from
kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
rename to
kernel/sql-federation/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
diff --git
a/kernel/sql-federation/dialect/mysql/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.DialectSQLFederationColumnTypeConverter
similarity index 100%
rename from
kernel/sql-federation/dialect/mysql/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.DialectSQLFederationColumnTypeConverter
diff --git
a/kernel/sql-federation/dialect/mysql/src/test/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverterTest.java
b/kernel/sql-federation/dialect/mysql/src/test/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverterTest.java
index 2c967cd1776..978d3a4533f 100644
---
a/kernel/sql-federation/dialect/mysql/src/test/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverterTest.java
+++
b/kernel/sql-federation/dialect/mysql/src/test/java/org/apache/shardingsphere/sqlfederation/mysql/MySQLSQLFederationColumnTypeConverterTest.java
@@ -21,7 +21,7 @@ import org.apache.calcite.sql.type.SqlTypeName;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sqlfederation.resultset.converter.SQLFederationColumnTypeConverter;
+import
org.apache.shardingsphere.sqlfederation.resultset.converter.DialectSQLFederationColumnTypeConverter;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -34,7 +34,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
class MySQLSQLFederationColumnTypeConverterTest {
- private final SQLFederationColumnTypeConverter converter =
DatabaseTypedSPILoader.getService(SQLFederationColumnTypeConverter.class,
TypedSPILoader.getService(DatabaseType.class, "MySQL"));
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
+
+ private final DialectSQLFederationColumnTypeConverter converter =
DatabaseTypedSPILoader.getService(DialectSQLFederationColumnTypeConverter.class,
databaseType);
@ParameterizedTest(name = "{0}")
@MethodSource("convertValueSource")
diff --git
a/kernel/sql-federation/dialect/opengauss/src/main/java/org/apache/shardingsphere/sqlfederation/opengauss/OpenGaussSQLFederationFunctionRegister.java
b/kernel/sql-federation/dialect/opengauss/src/main/java/org/apache/shardingsphere/sqlfederation/opengauss/OpenGaussSQLFederationFunctionRegister.java
index d961e8eb756..d7c01733e61 100644
---
a/kernel/sql-federation/dialect/opengauss/src/main/java/org/apache/shardingsphere/sqlfederation/opengauss/OpenGaussSQLFederationFunctionRegister.java
+++
b/kernel/sql-federation/dialect/opengauss/src/main/java/org/apache/shardingsphere/sqlfederation/opengauss/OpenGaussSQLFederationFunctionRegister.java
@@ -19,16 +19,16 @@ package org.apache.shardingsphere.sqlfederation.opengauss;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
-import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister;
+import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister;
import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.opengauss.impl.OpenGaussSystemFunction;
import
org.apache.shardingsphere.sqlfederation.postgresql.PostgreSQLSQLFederationFunctionRegister;
/**
* SQL federation function register for opengauss.
*/
-public final class OpenGaussSQLFederationFunctionRegister implements
SQLFederationFunctionRegister {
+public final class OpenGaussSQLFederationFunctionRegister implements
DialectSQLFederationFunctionRegister {
- private final SQLFederationFunctionRegister delegate = new
PostgreSQLSQLFederationFunctionRegister();
+ private final DialectSQLFederationFunctionRegister delegate = new
PostgreSQLSQLFederationFunctionRegister();
@Override
public void registerFunction(final SchemaPlus schemaPlus, final String
schemaName) {
diff --git
a/kernel/sql-federation/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
b/kernel/sql-federation/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
similarity index 100%
rename from
kernel/sql-federation/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
rename to
kernel/sql-federation/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
diff --git
a/kernel/sql-federation/dialect/postgresql/src/main/java/org/apache/shardingsphere/sqlfederation/postgresql/PostgreSQLSQLFederationFunctionRegister.java
b/kernel/sql-federation/dialect/postgresql/src/main/java/org/apache/shardingsphere/sqlfederation/postgresql/PostgreSQLSQLFederationFunctionRegister.java
index b2bee98c522..a1f392d7b2f 100644
---
a/kernel/sql-federation/dialect/postgresql/src/main/java/org/apache/shardingsphere/sqlfederation/postgresql/PostgreSQLSQLFederationFunctionRegister.java
+++
b/kernel/sql-federation/dialect/postgresql/src/main/java/org/apache/shardingsphere/sqlfederation/postgresql/PostgreSQLSQLFederationFunctionRegister.java
@@ -19,13 +19,13 @@ package org.apache.shardingsphere.sqlfederation.postgresql;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.impl.ScalarFunctionImpl;
-import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister;
+import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister;
import
org.apache.shardingsphere.sqlfederation.compiler.sql.function.postgresql.impl.PostgreSQLSystemFunction;
/**
* SQL federation function register for PostgreSQL.
*/
-public final class PostgreSQLSQLFederationFunctionRegister implements
SQLFederationFunctionRegister {
+public final class PostgreSQLSQLFederationFunctionRegister implements
DialectSQLFederationFunctionRegister {
@Override
public void registerFunction(final SchemaPlus schemaPlus, final String
schemaName) {
diff --git
a/kernel/sql-federation/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
b/kernel/sql-federation/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
similarity index 100%
rename from
kernel/sql-federation/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.SQLFederationFunctionRegister
rename to
kernel/sql-federation/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.sqlfederation.compiler.sql.function.DialectSQLFederationFunctionRegister
