You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/04/06 03:08:07 UTC
[shardingsphere] branch master updated: Remove useless props in OptimizerSQLDialectBuilder and modify OptimizerSQLDialectBuilder interface to StatelessTypedSPI (#16612)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 1bd559a189d Remove useless props in OptimizerSQLDialectBuilder and modify OptimizerSQLDialectBuilder interface to StatelessTypedSPI (#16612)
1bd559a189d is described below
commit 1bd559a189d2b104b93a146980078610c518ae46
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed Apr 6 11:07:56 2022 +0800
Remove useless props in OptimizerSQLDialectBuilder and modify OptimizerSQLDialectBuilder interface to StatelessTypedSPI (#16612)
---
.../optimizer/context/parser/OptimizerParserContextFactory.java | 2 +-
.../optimizer/context/parser/dialect/OptimizerSQLDialectBuilder.java | 4 ++--
.../context/parser/dialect/OptimizerSQLDialectBuilderFactory.java | 5 ++---
.../parameterized/engine/SQLNodeConvertEngineParameterizedTest.java | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
index 92fd2935c4a..24a00e244fa 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/OptimizerParserContextFactory.java
@@ -54,7 +54,7 @@ public final class OptimizerParserContextFactory {
private static Properties createSQLDialectProperties(final DatabaseType databaseType) {
Properties result = new Properties();
result.setProperty(CalciteConnectionProperty.TIME_ZONE.camelName(), "UTC");
- result.putAll(OptimizerSQLDialectBuilderFactory.build(databaseType, result));
+ result.putAll(OptimizerSQLDialectBuilderFactory.build(databaseType));
return result;
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilder.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilder.java
index 8ef897eb6ca..58dac6f4e83 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilder.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.infra.federation.optimizer.context.parser.dialect;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
-import org.apache.shardingsphere.spi.type.typed.StatefulTypedSPI;
+import org.apache.shardingsphere.spi.type.typed.StatelessTypedSPI;
import java.util.Properties;
/**
* Optimizer SQL dialect properties builder.
*/
-public interface OptimizerSQLDialectBuilder extends StatefulTypedSPI, RequiredSPI {
+public interface OptimizerSQLDialectBuilder extends StatelessTypedSPI, RequiredSPI {
/**
* Build optimizer SQL dialect properties.
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilderFactory.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilderFactory.java
index 17b79c06647..57c13be4dce 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilderFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/parser/dialect/OptimizerSQLDialectBuilderFactory.java
@@ -37,13 +37,12 @@ public final class OptimizerSQLDialectBuilderFactory {
* Build optimizer SQL dialect properties.
*
* @param databaseType database type
- * @param props properties to be built
* @return built properties
*/
- public static Properties build(final DatabaseType databaseType, final Properties props) {
+ public static Properties build(final DatabaseType databaseType) {
OptimizerSQLDialectBuilder builder = null == databaseType
? RequiredSPIRegistry.getRegisteredService(OptimizerSQLDialectBuilder.class)
- : TypedSPIRegistry.getRegisteredService(OptimizerSQLDialectBuilder.class, databaseType.getName(), props);
+ : TypedSPIRegistry.getRegisteredService(OptimizerSQLDialectBuilder.class, databaseType.getName());
return builder.build();
}
}
diff --git a/shardingsphere-test/shardingsphere-optimize-test/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConvertEngineParameterizedTest.java b/shardingsphere-test/shardingsphere-optimize-test/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConvertEngineParameterizedTest.java
index 7b389d4f00e..cee6f99587d 100644
--- a/shardingsphere-test/shardingsphere-optimize-test/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConvertEngineParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-optimize-test/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConvertEngineParameterizedTest.java
@@ -162,7 +162,7 @@ public final class SQLNodeConvertEngineParameterizedTest {
private Properties createSQLDialectProperties(final DatabaseType databaseType) {
Properties result = new Properties();
result.setProperty(CalciteConnectionProperty.TIME_ZONE.camelName(), "UTC");
- result.putAll(OptimizerSQLDialectBuilderFactory.build(databaseType, result));
+ result.putAll(OptimizerSQLDialectBuilderFactory.build(databaseType));
return result;
}