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 2020/10/02 03:42:01 UTC
[shardingsphere] branch master updated: Use
schemaContexts.getDefaultSchemaContext() instead of
schemaContexts.getSchemaContextMap().get(DefaultSchema.LOGIC_NAME) (#7685)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 1d03779 Use schemaContexts.getDefaultSchemaContext() instead of schemaContexts.getSchemaContextMap().get(DefaultSchema.LOGIC_NAME) (#7685)
1d03779 is described below
commit 1d03779e4cb0a825780a548a12de36037552e4b8
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Oct 2 11:41:39 2020 +0800
Use schemaContexts.getDefaultSchemaContext() instead of schemaContexts.getSchemaContextMap().get(DefaultSchema.LOGIC_NAME) (#7685)
---
.../driver/jdbc/core/datasource/ShardingSphereDataSource.java | 2 +-
.../internal/datasource/GovernanceShardingSphereDataSource.java | 2 +-
2 files changed, 2 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 36eadd1..85e60b5 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
@@ -100,7 +100,7 @@ public final class ShardingSphereDataSource extends AbstractUnsupportedOperation
* @return data sources
*/
public Map<String, DataSource> getDataSourceMap() {
- return schemaContexts.getSchemaContextMap().get(DefaultSchema.LOGIC_NAME).getSchema().getDataSources();
+ return schemaContexts.getDefaultSchemaContext().getSchema().getDataSources();
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
index 71d7128..6614109 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
@@ -152,6 +152,6 @@ public final class GovernanceShardingSphereDataSource extends AbstractUnsupporte
}
private Map<String, DataSource> getDataSourceMap() {
- return schemaContexts.getSchemaContextMap().get(DefaultSchema.LOGIC_NAME).getSchema().getDataSources();
+ return schemaContexts.getDefaultSchemaContext().getSchema().getDataSources();
}
}