You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/04/07 15:50:57 UTC
[shardingsphere] branch master updated: Decouple TypedSPI & SingletonSPI (#16645)
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 d18f234fcca Decouple TypedSPI & SingletonSPI (#16645)
d18f234fcca is described below
commit d18f234fccafd8ffadf1b6d8850a3e5b5fe64ea0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Apr 7 23:50:49 2022 +0800
Decouple TypedSPI & SingletonSPI (#16645)
* Decouple TypedSPI & SingletonSPI
* Fix checkstyle
---
.../org/apache/shardingsphere/driver/state/DriverState.java | 5 ++---
.../shardingsphere/driver/state/DriverStateContext.java | 9 +++------
.../core/datasource/creator/PipelineDataSourceCreator.java | 5 ++---
.../datasource/creator/PipelineDataSourceCreatorFactory.java | 8 ++------
.../pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java | 9 +++------
.../data/pipeline/spi/check/datasource/DataSourceChecker.java | 5 ++---
.../communication/jdbc/statement/JDBCBackendStatement.java | 11 +++++------
.../statement/StatementMemoryStrictlyFetchSizeSetter.java | 5 ++---
8 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
index 773761d0205..b2cb3c5ad8b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverState.java
@@ -18,15 +18,14 @@
package org.apache.shardingsphere.driver.state;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
-import org.apache.shardingsphere.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.spi.type.typed.StatelessTypedSPI;
import java.sql.Connection;
/**
* Driver state.
*/
-public interface DriverState extends TypedSPI, SingletonSPI {
+public interface DriverState extends StatelessTypedSPI {
/**
* Get connection.
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
index dc7c59a62d6..5a831058a3d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/DriverStateContext.java
@@ -21,10 +21,9 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPIRegistry;
+import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
import java.sql.Connection;
-import java.util.Map;
/**
* Driver state context.
@@ -32,11 +31,8 @@ import java.util.Map;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DriverStateContext {
- private static final Map<String, DriverState> STATES;
-
static {
ShardingSphereServiceLoader.register(DriverState.class);
- STATES = SingletonSPIRegistry.getTypedSingletonInstancesMap(DriverState.class);
}
/**
@@ -47,6 +43,7 @@ public final class DriverStateContext {
* @return connection
*/
public static Connection getConnection(final String schemaName, final ContextManager contextManager) {
- return STATES.get(contextManager.getInstanceContext().getInstance().getState().getCurrentState().name()).getConnection(schemaName, contextManager);
+ return TypedSPIRegistry.getRegisteredService(DriverState.class,
+ contextManager.getInstanceContext().getInstance().getState().getCurrentState().name()).getConnection(schemaName, contextManager);
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
index fd25786dcaa..f1667550178 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreator.java
@@ -17,8 +17,7 @@
package org.apache.shardingsphere.data.pipeline.core.datasource.creator;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
-import org.apache.shardingsphere.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.spi.type.typed.StatelessTypedSPI;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -26,7 +25,7 @@ import java.sql.SQLException;
/**
* Pipeline data source creator.
*/
-public interface PipelineDataSourceCreator extends TypedSPI, SingletonSPI {
+public interface PipelineDataSourceCreator extends StatelessTypedSPI {
/**
* Create pipeline data source.
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
index 64f2f881122..fed12c64147 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/PipelineDataSourceCreatorFactory.java
@@ -18,9 +18,7 @@
package org.apache.shardingsphere.data.pipeline.core.datasource.creator;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPIRegistry;
-
-import java.util.Map;
+import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
/**
* Pipeline data source creator factory.
@@ -31,8 +29,6 @@ public final class PipelineDataSourceCreatorFactory {
ShardingSphereServiceLoader.register(PipelineDataSourceCreator.class);
}
- private static final Map<String, PipelineDataSourceCreator> DATA_SOURCE_CREATOR_MAP = SingletonSPIRegistry.getTypedSingletonInstancesMap(PipelineDataSourceCreator.class);
-
/**
* Get pipeline data source creator instance.
*
@@ -40,6 +36,6 @@ public final class PipelineDataSourceCreatorFactory {
* @return pipeline data source creator instance
*/
public static PipelineDataSourceCreator getInstance(final String type) {
- return DATA_SOURCE_CREATOR_MAP.get(type);
+ return TypedSPIRegistry.getRegisteredService(PipelineDataSourceCreator.class, type);
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
index e20ef72c72c..37a36729f70 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
@@ -40,14 +40,13 @@ import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChanne
import org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer;
import org.apache.shardingsphere.scaling.core.job.check.EnvironmentCheckerFactory;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPIRegistry;
+import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
import javax.sql.DataSource;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
/**
@@ -60,8 +59,6 @@ public final class RuleAlteredJobPreparer {
ShardingSphereServiceLoader.register(DataSourceChecker.class);
}
- private static final Map<String, DataSourceChecker> DATA_SOURCE_CHECKER_MAP = SingletonSPIRegistry.getTypedSingletonInstancesMap(DataSourceChecker.class);
-
private final InventoryTaskSplitter inventoryTaskSplitter = new InventoryTaskSplitter();
/**
@@ -108,7 +105,7 @@ public final class RuleAlteredJobPreparer {
}
private void checkSourceDataSource(final RuleAlteredJobContext jobContext, final PipelineDataSourceWrapper sourceDataSource) {
- DataSourceChecker dataSourceChecker = DATA_SOURCE_CHECKER_MAP.get(jobContext.getJobConfig().getHandleConfig().getSourceDatabaseType());
+ DataSourceChecker dataSourceChecker = TypedSPIRegistry.getRegisteredService(DataSourceChecker.class, jobContext.getJobConfig().getHandleConfig().getSourceDatabaseType());
Collection<PipelineDataSourceWrapper> sourceDataSources = Collections.singleton(sourceDataSource);
dataSourceChecker.checkConnection(sourceDataSources);
dataSourceChecker.checkPrivilege(sourceDataSources);
@@ -116,7 +113,7 @@ public final class RuleAlteredJobPreparer {
}
private void checkTargetDataSource(final RuleAlteredJobContext jobContext, final PipelineDataSourceWrapper targetDataSource) {
- DataSourceChecker dataSourceChecker = DATA_SOURCE_CHECKER_MAP.get(jobContext.getJobConfig().getHandleConfig().getTargetDatabaseType());
+ DataSourceChecker dataSourceChecker = TypedSPIRegistry.getRegisteredService(DataSourceChecker.class, jobContext.getJobConfig().getHandleConfig().getTargetDatabaseType());
Collection<PipelineDataSourceWrapper> targetDataSources = Collections.singletonList(targetDataSource);
dataSourceChecker.checkConnection(targetDataSources);
dataSourceChecker.checkTargetTable(targetDataSources, jobContext.getTaskConfig().getImporterConfig().getShardingColumnsMap().keySet());
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
index e1afaca53d5..5f77de29d31 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/datasource/DataSourceChecker.java
@@ -17,8 +17,7 @@
package org.apache.shardingsphere.data.pipeline.spi.check.datasource;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
-import org.apache.shardingsphere.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.spi.type.typed.StatelessTypedSPI;
import javax.sql.DataSource;
import java.util.Collection;
@@ -26,7 +25,7 @@ import java.util.Collection;
/**
* Data source checker.
*/
-public interface DataSourceChecker extends TypedSPI, SingletonSPI {
+public interface DataSourceChecker extends StatelessTypedSPI {
/**
* Check data source connections.
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
index 4d5ec0fb6ca..fff295e8dd9 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.Statemen
import org.apache.shardingsphere.proxy.backend.communication.SQLStatementSchemaHolder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPIRegistry;
+import org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -36,7 +36,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.util.List;
-import java.util.Map;
+import java.util.Optional;
/**
* JDBC backend statement.
@@ -49,8 +49,6 @@ public final class JDBCBackendStatement implements ExecutorJDBCStatementManager
ShardingSphereServiceLoader.register(StatementMemoryStrictlyFetchSizeSetter.class);
}
- private static final Map<String, StatementMemoryStrictlyFetchSizeSetter> FETCH_SIZE_SETTERS = SingletonSPIRegistry.getTypedSingletonInstancesMap(StatementMemoryStrictlyFetchSizeSetter.class);
-
private String schemaName;
@Override
@@ -85,8 +83,9 @@ public final class JDBCBackendStatement implements ExecutorJDBCStatementManager
private void setFetchSize(final Statement statement) throws SQLException {
DatabaseType databaseType = ProxyContext.getInstance().getContextManager().getMetaDataContexts()
.getMetaData(null == schemaName ? SQLStatementSchemaHolder.get() : schemaName).getResource().getDatabaseType();
- if (FETCH_SIZE_SETTERS.containsKey(databaseType.getName())) {
- FETCH_SIZE_SETTERS.get(databaseType.getName()).setFetchSize(statement);
+ Optional<StatementMemoryStrictlyFetchSizeSetter> fetchSizeSetter = TypedSPIRegistry.findRegisteredService(StatementMemoryStrictlyFetchSizeSetter.class, databaseType.getName());
+ if (fetchSizeSetter.isPresent()) {
+ fetchSizeSetter.get().setFetchSize(statement);
}
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/StatementMemoryStrictlyFetchSizeSetter.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/StatementMemoryStrictlyFetchSizeSetter.java
index c18de13c2bc..5c3202e6aa2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/StatementMemoryStrictlyFetchSizeSetter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/StatementMemoryStrictlyFetchSizeSetter.java
@@ -17,8 +17,7 @@
package org.apache.shardingsphere.proxy.backend.communication.jdbc.statement;
-import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
-import org.apache.shardingsphere.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.spi.type.typed.StatelessTypedSPI;
import java.sql.SQLException;
import java.sql.Statement;
@@ -26,7 +25,7 @@ import java.sql.Statement;
/**
* Statement memory strictly fetch size setter.
*/
-public interface StatementMemoryStrictlyFetchSizeSetter extends TypedSPI, SingletonSPI {
+public interface StatementMemoryStrictlyFetchSizeSetter extends StatelessTypedSPI {
/**
* Set fetch size.