This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 ebbf163 Remove useless GovernanceShardingSphereDataSource (#11925)
ebbf163 is described below
commit ebbf163ed2b64ba4456d6f43e7abad8354f5846d
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Aug 20 19:53:02 2021 +0800
Remove useless GovernanceShardingSphereDataSource (#11925)
---
.../core/datasource/ShardingSphereDataSource.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 006ff5e..2c59285 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -37,6 +37,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -55,14 +56,28 @@ public final class ShardingSphereDataSource extends
AbstractUnsupportedOperation
private final ContextManager contextManager;
+ public ShardingSphereDataSource(final String schemaName, final
ModeConfiguration modeConfig) throws SQLException {
+ this.schemaName = schemaName;
+ contextManager = createContextManager(schemaName, modeConfig);
+ }
+
public ShardingSphereDataSource(final String schemaName, final
ModeConfiguration modeConfig, final Map<String, DataSource> dataSourceMap,
final Collection<RuleConfiguration>
ruleConfigs, final Properties props) throws SQLException {
this.schemaName = schemaName;
contextManager = createContextManager(schemaName, modeConfig,
dataSourceMap, ruleConfigs, props);
}
- private ContextManager createContextManager(final String schemaName, final
ModeConfiguration modeConfig,
- final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> ruleConfigs, final
Properties props) throws SQLException {
+ private ContextManager createContextManager(final String schemaName, final
ModeConfiguration modeConfig) throws SQLException {
+ ShardingSphereMode mode = ModeBuilderEngine.build(modeConfig);
+ Map<String, Map<String, DataSource>> dataSourcesMap =
Collections.singletonMap(schemaName, new HashMap<>());
+ Map<String, Collection<RuleConfiguration>> schemaRuleConfigs =
Collections.singletonMap(schemaName, Collections.emptyList());
+ Collection<RuleConfiguration> globalRuleConfigs =
Collections.emptyList();
+ ContextManagerBuilder builder =
TypedSPIRegistry.getRegisteredService(ContextManagerBuilder.class,
modeConfig.getType(), new Properties());
+ return builder.build(mode, dataSourcesMap, schemaRuleConfigs,
globalRuleConfigs, new Properties(), false);
+ }
+
+ private ContextManager createContextManager(final String schemaName, final
ModeConfiguration modeConfig, final Map<String, DataSource> dataSourceMap,
+ final
Collection<RuleConfiguration> ruleConfigs, final Properties props) throws
SQLException {
ShardingSphereMode mode = ModeBuilderEngine.build(modeConfig);
Map<String, Map<String, DataSource>> dataSourcesMap =
Collections.singletonMap(schemaName, dataSourceMap);
Map<String, Collection<RuleConfiguration>> schemaRuleConfigs =
Collections.singletonMap(
