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/05/01 10:10:18 UTC
[shardingsphere] branch master updated: Rename schemaName to databaseName in left code (#17252)
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 f65c34ad89d Rename schemaName to databaseName in left code (#17252)
f65c34ad89d is described below
commit f65c34ad89d0d4c007eb78b0dc3e04ffb09a0ed7
Author: Hongsheng Zhong <sa...@126.com>
AuthorDate: Sun May 1 18:10:12 2022 +0800
Rename schemaName to databaseName in left code (#17252)
---
.../dal/ShowColumnsStatementContextTest.java | 4 +--
.../shardingsphere/infra/datanode/DataNode.java | 1 +
.../exception/rule/AlgorithmInUsedException.java | 4 +--
.../rule/DuplicateAlgorithmException.java | 4 +--
.../rule/DuplicateKeyGeneratorException.java | 4 +--
.../rule/KeyGeneratorInUsedException.java | 4 +--
.../rule/RequiredKeyGeneratorMissedException.java | 4 +--
.../exception/rule/RuleDisabledException.java | 4 +--
.../exception/rule/RuleEnabledException.java | 4 +--
.../exception/rule/RuleInUsedException.java | 8 ++---
.../kernel/model/ExecutionGroupContext.java | 2 +-
.../sql/process/model/ExecuteProcessContext.java | 4 +--
.../model/yaml/YamlExecuteProcessContext.java | 4 +--
.../driver/executor/DriverExecutor.java | 8 ++---
.../driver/executor/DriverJDBCExecutor.java | 12 ++++----
.../batch/BatchPreparedStatementExecutor.java | 10 +++---
.../jdbc/adapter/AbstractResultSetAdapter.java | 2 +-
.../jdbc/adapter/AbstractStatementAdapter.java | 2 +-
.../jdbc/core/connection/ConnectionManager.java | 18 +++++------
.../core/connection/ShardingSphereConnection.java | 14 ++++++---
.../metadata/ShardingSphereDatabaseMetaData.java | 6 ++--
.../statement/ShardingSpherePreparedStatement.java | 34 ++++++++++----------
.../core/statement/ShardingSphereStatement.java | 36 +++++++++++-----------
.../shardingsphere/driver/state/DriverState.java | 4 +--
.../driver/state/DriverStateContext.java | 6 ++--
.../state/circuit/CircuitBreakDriverState.java | 2 +-
.../driver/state/lock/LockDriverState.java | 2 +-
.../driver/state/ok/OKDriverState.java | 4 +--
.../jdbc/adapter/PreparedStatementAdapterTest.java | 4 +--
.../ShardingSphereDatabaseMetaDataTest.java | 4 +--
.../UnsupportedOperationPreparedStatementTest.java | 4 +--
.../subscriber/ScalingRegistrySubscriber.java | 17 +++++-----
...vent.java => MetadataVersionPreparedEvent.java} | 6 ++--
.../ProcessRegistrySubscriberTestNoMock.java | 4 +--
.../StorageNodeStatusSubscriberTest.java | 18 +++++------
.../backend/communication/ProxySQLExecutor.java | 4 +--
.../communication/ReactiveProxySQLExecutor.java | 2 +-
.../jdbc/datasource/JDBCBackendDataSource.java | 30 +++++++++---------
.../mysql/executor/ShowProcessListExecutor.java | 2 +-
.../rdl/rule/RuleDefinitionBackendHandler.java | 4 +--
.../executor/ShowProcessListExecutorTest.java | 2 +-
.../AbstractSQLRewriterParameterizedTest.java | 14 ++++-----
.../EncryptSQLRewriterParameterizedTest.java | 4 +--
.../scenario/MixSQLRewriterParameterizedTest.java | 4 +--
.../ShardingSQLRewriterParameterizedTest.java | 4 +--
45 files changed, 173 insertions(+), 165 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dal/ShowColumnsStatementContextTest.java b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dal/ShowColumnsStatementContextTest.java
index af7784a9680..8b40f816c07 100644
--- a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dal/ShowColumnsStatementContextTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dal/ShowColumnsStatementContextTest.java
@@ -42,9 +42,9 @@ public final class ShowColumnsStatementContextTest {
public void assertNewInstance() {
MySQLShowColumnsStatement mySQLShowColumnsStatement = mock(MySQLShowColumnsStatement.class);
String tableName = "tbl_1";
- String schemaName = "sharding_db";
+ String databaseName = "sharding_db";
SimpleTableSegment table = new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue(tableName)));
- FromSchemaSegment fromSchema = new FromSchemaSegment(0, 0, new SchemaSegment(0, 0, new IdentifierValue(schemaName)));
+ FromSchemaSegment fromSchema = new FromSchemaSegment(0, 0, new SchemaSegment(0, 0, new IdentifierValue(databaseName)));
when(mySQLShowColumnsStatement.getTable()).thenReturn(table);
when(mySQLShowColumnsStatement.getFromSchema()).thenReturn(Optional.of(fromSchema));
ShowColumnsStatementContext actual = new ShowColumnsStatementContext(mySQLShowColumnsStatement);
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
index 4a798e3335f..0dc048f7bbb 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
@@ -42,6 +42,7 @@ public final class DataNode {
private final String tableName;
+ // TODO add final for schemaName
private String schemaName;
/**
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/AlgorithmInUsedException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/AlgorithmInUsedException.java
index 7387dfc684e..bff119d1fd5 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/AlgorithmInUsedException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/AlgorithmInUsedException.java
@@ -26,7 +26,7 @@ public final class AlgorithmInUsedException extends RuleDefinitionViolationExcep
private static final long serialVersionUID = -5748228542420285726L;
- public AlgorithmInUsedException(final String schemaName, final Collection<String> algorithmNames) {
- super(1116, String.format("Sharding algorithms `%s` in schema `%s` are still in used.", algorithmNames, schemaName));
+ public AlgorithmInUsedException(final String databaseName, final Collection<String> algorithmNames) {
+ super(1116, String.format("Sharding algorithms `%s` in database `%s` are still in used.", algorithmNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateAlgorithmException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateAlgorithmException.java
index 6a399c75646..5562ce53a15 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateAlgorithmException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateAlgorithmException.java
@@ -26,7 +26,7 @@ public final class DuplicateAlgorithmException extends RuleDefinitionViolationEx
private static final long serialVersionUID = 4382238091103015055L;
- public DuplicateAlgorithmException(final String ruleType, final String schemaName, final Collection<String> algorithmNames) {
- super(1122, String.format("Duplicate %s algorithm names `%s` in schema `%s`", ruleType, algorithmNames, schemaName));
+ public DuplicateAlgorithmException(final String ruleType, final String databaseName, final Collection<String> algorithmNames) {
+ super(1122, String.format("Duplicate %s algorithm names `%s` in database `%s`", ruleType, algorithmNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateKeyGeneratorException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateKeyGeneratorException.java
index d2fc0a55fcd..035b7ed31ea 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateKeyGeneratorException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/DuplicateKeyGeneratorException.java
@@ -26,7 +26,7 @@ public final class DuplicateKeyGeneratorException extends RuleDefinitionViolatio
private static final long serialVersionUID = 4965160371403179153L;
- public DuplicateKeyGeneratorException(final String ruleType, final String schemaName, final Collection<String> keyGeneratorNames) {
- super(1117, String.format("Duplicate %s key generator names `%s` in schema `%s`", ruleType, keyGeneratorNames, schemaName));
+ public DuplicateKeyGeneratorException(final String ruleType, final String databaseName, final Collection<String> keyGeneratorNames) {
+ super(1117, String.format("Duplicate %s key generator names `%s` in database `%s`", ruleType, keyGeneratorNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/KeyGeneratorInUsedException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/KeyGeneratorInUsedException.java
index 57460b50dce..facb546d9de 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/KeyGeneratorInUsedException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/KeyGeneratorInUsedException.java
@@ -26,7 +26,7 @@ public final class KeyGeneratorInUsedException extends RuleDefinitionViolationEx
private static final long serialVersionUID = 477511600241124319L;
- public KeyGeneratorInUsedException(final String ruleType, final String schemaName, final Collection<String> keyGeneratorNames) {
- super(1121, String.format("%s key generator `%s` in schema `%s` are still in used.", ruleType, keyGeneratorNames, schemaName));
+ public KeyGeneratorInUsedException(final String ruleType, final String databaseName, final Collection<String> keyGeneratorNames) {
+ super(1121, String.format("%s key generator `%s` in database `%s` are still in used.", ruleType, keyGeneratorNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RequiredKeyGeneratorMissedException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RequiredKeyGeneratorMissedException.java
index 03b16a109bb..44563d511b2 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RequiredKeyGeneratorMissedException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RequiredKeyGeneratorMissedException.java
@@ -23,7 +23,7 @@ public class RequiredKeyGeneratorMissedException extends RuleDefinitionViolation
private static final long serialVersionUID = -2391552466149640249L;
- public RequiredKeyGeneratorMissedException(final String type, final String schemaName, final Collection<String> keyGeneratorNames) {
- super(1118, String.format("%s key generator `%s` do not exist in schema `%s`.", type, keyGeneratorNames, schemaName));
+ public RequiredKeyGeneratorMissedException(final String type, final String databaseName, final Collection<String> keyGeneratorNames) {
+ super(1118, String.format("%s key generator `%s` do not exist in database `%s`.", type, keyGeneratorNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleDisabledException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleDisabledException.java
index 4063cece99f..f47a87fe114 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleDisabledException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleDisabledException.java
@@ -24,7 +24,7 @@ public final class RuleDisabledException extends RuleDefinitionViolationExceptio
private static final long serialVersionUID = -4024905659258386784L;
- public RuleDisabledException(final String ruleType, final String schemaName, final String ruleName) {
- super(1119, String.format("%s rule `%s` has been disabled in schema `%s`.", ruleType, ruleName, schemaName));
+ public RuleDisabledException(final String ruleType, final String databaseName, final String ruleName) {
+ super(1119, String.format("%s rule `%s` has been disabled in database `%s`.", ruleType, ruleName, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleEnabledException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleEnabledException.java
index 709869a5de9..b6e93baea6b 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleEnabledException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleEnabledException.java
@@ -24,7 +24,7 @@ public final class RuleEnabledException extends RuleDefinitionViolationException
private static final long serialVersionUID = 2381983504661441914L;
- public RuleEnabledException(final String ruleType, final String schemaName, final String ruleName) {
- super(1120, String.format("%s rule `%s` has been enabled in schema `%s`.", ruleType, ruleName, schemaName));
+ public RuleEnabledException(final String ruleType, final String databaseName, final String ruleName) {
+ super(1120, String.format("%s rule `%s` has been enabled in database `%s`.", ruleType, ruleName, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleInUsedException.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleInUsedException.java
index cc570136b53..4fee7572e9f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleInUsedException.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/exception/rule/RuleInUsedException.java
@@ -26,11 +26,11 @@ public final class RuleInUsedException extends RuleDefinitionViolationException
private static final long serialVersionUID = 3308787279125477660L;
- public RuleInUsedException(final String ruleType, final String schemaName) {
- super(1111, String.format("%s rule in schema `%s` is still in used.", ruleType, schemaName));
+ public RuleInUsedException(final String ruleType, final String databaseName) {
+ super(1111, String.format("%s rule in database `%s` is still in used.", ruleType, databaseName));
}
- public RuleInUsedException(final String ruleType, final String schemaName, final Collection<String> ruleNames) {
- super(1111, String.format("%s rules `%s` in schema `%s` are still in used.", ruleType, ruleNames, schemaName));
+ public RuleInUsedException(final String ruleType, final String databaseName, final Collection<String> ruleNames) {
+ super(1111, String.format("%s rules `%s` in database `%s` are still in used.", ruleType, ruleNames, databaseName));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/model/ExecutionGroupContext.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/model/ExecutionGroupContext.java
index 546db1cff12..30ec315c68c 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/model/ExecutionGroupContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/kernel/model/ExecutionGroupContext.java
@@ -40,7 +40,7 @@ public final class ExecutionGroupContext<T> {
private final String executionID = new UUID(ThreadLocalRandom.current().nextLong(), ThreadLocalRandom.current().nextLong()).toString();
- private volatile String schemaName;
+ private volatile String databaseName;
private volatile Grantee grantee;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
index cbca087a01f..0a42b6fa168 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/ExecuteProcessContext.java
@@ -34,7 +34,7 @@ public final class ExecuteProcessContext {
private final String executionID;
- private final String schemaName;
+ private final String databaseName;
private final String username;
@@ -49,7 +49,7 @@ public final class ExecuteProcessContext {
public ExecuteProcessContext(final String sql, final ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final ExecuteProcessConstants constants) {
this.executionID = executionGroupContext.getExecutionID();
this.sql = sql;
- this.schemaName = executionGroupContext.getSchemaName();
+ this.databaseName = executionGroupContext.getDatabaseName();
Grantee grantee = executionGroupContext.getGrantee();
this.username = null != grantee ? grantee.getUsername() : null;
this.hostname = null != grantee ? grantee.getHostname() : null;
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
index 46274410445..f135ff7227b 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/model/yaml/YamlExecuteProcessContext.java
@@ -36,7 +36,7 @@ public final class YamlExecuteProcessContext {
private String executionID;
- private String schemaName;
+ private String databaseName;
private String username;
@@ -50,7 +50,7 @@ public final class YamlExecuteProcessContext {
public YamlExecuteProcessContext(final ExecuteProcessContext executeProcessContext) {
executionID = executeProcessContext.getExecutionID();
- schemaName = executeProcessContext.getSchemaName();
+ databaseName = executeProcessContext.getDatabaseName();
username = executeProcessContext.getUsername();
hostname = executeProcessContext.getHostname();
sql = executeProcessContext.getSql();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
index 7cad797ff7e..a9e3e234733 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
@@ -46,11 +46,11 @@ public final class DriverExecutor implements AutoCloseable {
public DriverExecutor(final ShardingSphereConnection connection) {
MetaDataContexts metaDataContexts = connection.getContextManager().getMetaDataContexts();
JDBCExecutor jdbcExecutor = new JDBCExecutor(metaDataContexts.getExecutorEngine(), connection.isHoldTransaction());
- regularExecutor = new DriverJDBCExecutor(connection.getSchema(), metaDataContexts, jdbcExecutor);
+ regularExecutor = new DriverJDBCExecutor(connection.getDatabaseName(), metaDataContexts, jdbcExecutor);
rawExecutor = new RawExecutor(metaDataContexts.getExecutorEngine(), connection.isHoldTransaction(), metaDataContexts.getProps());
- DatabaseType databaseType = metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType();
- String schemaName = databaseType.getDefaultSchema(connection.getSchema());
- federationExecutor = FederationExecutorFactory.newInstance(connection.getSchema(), schemaName, metaDataContexts.getOptimizerContext(), metaDataContexts.getProps(), jdbcExecutor);
+ DatabaseType databaseType = metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType();
+ String schemaName = databaseType.getDefaultSchema(connection.getDatabaseName());
+ federationExecutor = FederationExecutorFactory.newInstance(connection.getDatabaseName(), schemaName, metaDataContexts.getOptimizerContext(), metaDataContexts.getProps(), jdbcExecutor);
trafficExecutor = new TrafficExecutor();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index 9aad27ae7ef..eab6ca895da 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
*/
public final class DriverJDBCExecutor {
- private final String schemaName;
+ private final String databaseName;
private final MetaDataContexts metaDataContexts;
@@ -53,12 +53,12 @@ public final class DriverJDBCExecutor {
private final MetaDataRefreshEngine metadataRefreshEngine;
- public DriverJDBCExecutor(final String schemaName, final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor) {
- this.schemaName = schemaName;
+ public DriverJDBCExecutor(final String databaseName, final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor) {
+ this.databaseName = databaseName;
this.metaDataContexts = metaDataContexts;
this.jdbcExecutor = jdbcExecutor;
- metadataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData(schemaName),
- metaDataContexts.getOptimizerContext().getFederationMetaData().getDatabases().get(schemaName),
+ metadataRefreshEngine = new MetaDataRefreshEngine(metaDataContexts.getMetaData(databaseName),
+ metaDataContexts.getOptimizerContext().getFederationMetaData().getDatabases().get(databaseName),
metaDataContexts.getOptimizerContext().getPlannerContexts(), metaDataContexts.getProps());
}
@@ -99,7 +99,7 @@ public final class DriverJDBCExecutor {
ExecuteProcessEngine.initialize(logicSQL, executionGroupContext, metaDataContexts.getProps());
SQLStatementContext<?> sqlStatementContext = logicSQL.getSqlStatementContext();
List<Integer> results = doExecute(executionGroupContext, sqlStatementContext, routeUnits, callback);
- int result = isNeedAccumulate(metaDataContexts.getMetaData(schemaName).getRuleMetaData().getRules(), sqlStatementContext) ? accumulate(results) : results.get(0);
+ int result = isNeedAccumulate(metaDataContexts.getMetaData(databaseName).getRuleMetaData().getRules(), sqlStatementContext) ? accumulate(results) : results.get(0);
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID());
return result;
} finally {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
index ae73d709598..adef45c1ef4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
@@ -59,10 +59,10 @@ public final class BatchPreparedStatementExecutor {
private int batchCount;
- private final String schemaName;
+ private final String databaseName;
- public BatchPreparedStatementExecutor(final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor, final String schemaName) {
- this.schemaName = schemaName;
+ public BatchPreparedStatementExecutor(final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor, final String databaseName) {
+ this.databaseName = databaseName;
this.metaDataContexts = metaDataContexts;
this.jdbcExecutor = jdbcExecutor;
executionGroupContext = new ExecutionGroupContext<>(new LinkedList<>());
@@ -134,7 +134,7 @@ public final class BatchPreparedStatementExecutor {
public int[] executeBatch(final SQLStatementContext<?> sqlStatementContext) throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<int[]> callback = new JDBCExecutorCallback<int[]>(
- metaDataContexts.getMetaData(schemaName).getResource().getDatabaseType(), sqlStatementContext.getSqlStatement(), isExceptionThrown) {
+ metaDataContexts.getMetaData(databaseName).getResource().getDatabaseType(), sqlStatementContext.getSqlStatement(), isExceptionThrown) {
@Override
protected int[] executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
@@ -155,7 +155,7 @@ public final class BatchPreparedStatementExecutor {
}
private boolean isNeedAccumulate(final SQLStatementContext<?> sqlStatementContext) {
- for (ShardingSphereRule each : metaDataContexts.getMetaData(schemaName).getRuleMetaData().getRules()) {
+ for (ShardingSphereRule each : metaDataContexts.getMetaData(databaseName).getRuleMetaData().getRules()) {
if (each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each).isNeedAccumulate(sqlStatementContext.getTablesContext().getTableNames())) {
return true;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
index 8928a4c8920..ea43422492d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractResultSetAdapter.java
@@ -69,7 +69,7 @@ public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperat
ShardingSphereConnection connection = statement instanceof ShardingSpherePreparedStatement
? ((ShardingSpherePreparedStatement) statement).getConnection()
: ((ShardingSphereStatement) statement).getConnection();
- return connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema());
+ return connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName());
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
index 625aa3630ff..6618c0769b5 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
@@ -195,7 +195,7 @@ public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperat
protected final void handleExceptionInTransaction(final ShardingSphereConnection connection, final MetaDataContexts metaDataContexts) {
if (connection.getConnectionManager().getConnectionTransaction().isInTransaction()) {
- DatabaseType databaseType = metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType();
+ DatabaseType databaseType = metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType();
if (databaseType instanceof PostgreSQLDatabaseType || databaseType instanceof OpenGaussDatabaseType) {
connection.getConnectionManager().getConnectionTransaction().setRollbackOnly(true);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
index fc4c0e61dd3..8ea67961f72 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
@@ -75,11 +75,11 @@ public final class ConnectionManager implements ExecutorJDBCConnectionManager, A
private final Random random = new SecureRandom();
- public ConnectionManager(final String schema, final ContextManager contextManager) {
- dataSourceMap.putAll(contextManager.getDataSourceMap(schema));
- dataSourceMap.putAll(getTrafficDataSourceMap(schema, contextManager));
- physicalDataSourceMap.putAll(contextManager.getDataSourceMap(schema));
- connectionTransaction = createConnectionTransaction(schema, contextManager);
+ public ConnectionManager(final String databaseName, final ContextManager contextManager) {
+ dataSourceMap.putAll(contextManager.getDataSourceMap(databaseName));
+ dataSourceMap.putAll(getTrafficDataSourceMap(databaseName, contextManager));
+ physicalDataSourceMap.putAll(contextManager.getDataSourceMap(databaseName));
+ connectionTransaction = createConnectionTransaction(databaseName, contextManager);
}
private Map<String, DataSource> getTrafficDataSourceMap(final String schema, final ContextManager contextManager) {
@@ -122,14 +122,14 @@ public final class ConnectionManager implements ExecutorJDBCConnectionManager, A
return String.format("%s//%s:%s/%s%s", jdbcUrlPrefix, instanceId.getIp(), instanceId.getUniqueSign(), schema, jdbcUrlSuffix);
}
- private ConnectionTransaction createConnectionTransaction(final String schemaName, final ContextManager contextManager) {
+ private ConnectionTransaction createConnectionTransaction(final String databaseName, final ContextManager contextManager) {
TransactionType type = TransactionTypeHolder.get();
if (null == type) {
Optional<TransactionRule> transactionRule = contextManager.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class);
- return transactionRule.map(optional -> new ConnectionTransaction(schemaName, optional, contextManager.getTransactionContexts()))
- .orElseGet(() -> new ConnectionTransaction(schemaName, contextManager.getTransactionContexts()));
+ return transactionRule.map(optional -> new ConnectionTransaction(databaseName, optional, contextManager.getTransactionContexts()))
+ .orElseGet(() -> new ConnectionTransaction(databaseName, contextManager.getTransactionContexts()));
}
- return new ConnectionTransaction(schemaName, type, contextManager.getTransactionContexts());
+ return new ConnectionTransaction(databaseName, type, contextManager.getTransactionContexts());
}
/**
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
index 389b1add5fe..f5b00911f3d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
@@ -39,7 +39,7 @@ import java.sql.Statement;
public final class ShardingSphereConnection extends AbstractConnectionAdapter {
@Getter
- private final String schema;
+ private final String databaseName;
@Getter
private final ContextManager contextManager;
@@ -55,10 +55,10 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter {
private volatile boolean closed;
- public ShardingSphereConnection(final String schema, final ContextManager contextManager) {
- this.schema = schema;
+ public ShardingSphereConnection(final String databaseName, final ContextManager contextManager) {
+ this.databaseName = databaseName;
this.contextManager = contextManager;
- connectionManager = new ConnectionManager(schema, contextManager);
+ connectionManager = new ConnectionManager(databaseName, contextManager);
}
/**
@@ -251,6 +251,12 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter {
return connectionManager.getRandomConnection().createArrayOf(typeName, elements);
}
+ @Override
+ public String getSchema() throws SQLException {
+ // TODO return databaseName for now in getSchema(), the same as before
+ return databaseName;
+ }
+
@Override
public boolean isClosed() {
return closed;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
index 5714123f940..31b4cb0a65a 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaData.java
@@ -51,10 +51,10 @@ public final class ShardingSphereDatabaseMetaData extends AdaptedDatabaseMetaDat
private DatabaseMetaData currentDatabaseMetaData;
public ShardingSphereDatabaseMetaData(final ShardingSphereConnection connection) {
- super(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema()).getResource().getCachedDatabaseMetaData());
+ super(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName()).getResource().getCachedDatabaseMetaData());
this.connection = connection;
- rules = connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema()).getRuleMetaData().getRules();
- dataSourcesMetaData = connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema()).getResource().getDataSourcesMetaData();
+ rules = connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules();
+ dataSourcesMetaData = connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName()).getResource().getDataSourcesMetaData();
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 6d63b761bd0..3a3e382c100 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -176,16 +176,16 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
Optional<SQLParserRule> sqlParserRule = metaDataContexts.getGlobalRuleMetaData().findSingleRule(SQLParserRule.class);
Preconditions.checkState(sqlParserRule.isPresent());
ShardingSphereSQLParserEngine sqlParserEngine = new ShardingSphereSQLParserEngine(
- DatabaseTypeRegistry.getTrunkDatabaseTypeName(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType()), sqlParserRule.get().toParserConfiguration());
+ DatabaseTypeRegistry.getTrunkDatabaseTypeName(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType()), sqlParserRule.get().toParserConfiguration());
sqlStatement = sqlParserEngine.parse(sql, true);
- sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaDataMap(), sqlStatement, connection.getSchema());
+ sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaDataMap(), sqlStatement, connection.getDatabaseName());
parameterMetaData = new ShardingSphereParameterMetaData(sqlStatement);
statementOption = returnGeneratedKeys ? new StatementOption(true) : new StatementOption(resultSetType, resultSetConcurrency, resultSetHoldability);
executor = new DriverExecutor(connection);
JDBCExecutor jdbcExecutor = new JDBCExecutor(metaDataContexts.getExecutorEngine(), connection.isHoldTransaction());
- batchPreparedStatementExecutor = new BatchPreparedStatementExecutor(metaDataContexts, jdbcExecutor, connection.getSchema());
+ batchPreparedStatementExecutor = new BatchPreparedStatementExecutor(metaDataContexts, jdbcExecutor, connection.getDatabaseName());
kernelProcessor = new KernelProcessor();
- statementsCacheable = isStatementsCacheable(metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getConfigurations());
+ statementsCacheable = isStatementsCacheable(metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getConfigurations());
trafficRule = metaDataContexts.getGlobalRuleMetaData().findSingleRule(TrafficRule.class).orElse(null);
statementManager = new StatementManager();
}
@@ -276,12 +276,12 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionGroupContext();
cacheStatements(executionGroupContext.getInputGroups());
return executor.getRegularExecutor().executeQuery(executionGroupContext, executionContext.getLogicSQL(),
- new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(), sqlStatement,
+ new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(), sqlStatement,
SQLExecutorExceptionHandler.isExceptionThrown()));
}
private ResultSet executeFederationQuery(final LogicSQL logicSQL) throws SQLException {
- PreparedStatementExecuteQueryCallback callback = new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(),
+ PreparedStatementExecuteQueryCallback callback = new PreparedStatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(),
sqlStatement, SQLExecutorExceptionHandler.isExceptionThrown());
FederationContext context = new FederationContext(false, logicSQL, metaDataContexts.getMetaDataMap());
return executor.getFederationExecutor().executeQuery(createDriverExecutionPrepareEngine(), callback, context);
@@ -290,7 +290,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine() {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return new DriverExecutionPrepareEngine<>(JDBCDriverType.PREPARED_STATEMENT, maxConnectionsSizePerQuery, connection.getConnectionManager(), statementManager,
- statementOption, metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules());
+ statementOption, metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules());
}
@Override
@@ -334,7 +334,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private JDBCExecutorCallback<Integer> createExecuteUpdateCallback() {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Integer>(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
+ return new JDBCExecutorCallback<Integer>(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
@Override
protected Integer executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
@@ -385,7 +385,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
private boolean hasRawExecutionRule() {
- for (ShardingSphereRule each : metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules()) {
+ for (ShardingSphereRule each : metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules()) {
if (each instanceof RawExecutionRule) {
return true;
}
@@ -395,7 +395,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private ExecutionGroupContext<RawSQLExecutionUnit> createRawExecutionGroupContext() throws SQLException {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
- return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules())
+ return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules())
.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
@@ -406,7 +406,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private JDBCExecutorCallback<Boolean> createExecuteCallback() {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
- return new JDBCExecutorCallback<Boolean>(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
+ return new JDBCExecutorCallback<Boolean>(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
@Override
protected Boolean executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
@@ -467,8 +467,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private ExecutionContext createExecutionContext(final LogicSQL logicSQL) {
SQLCheckEngine.check(logicSQL.getSqlStatementContext().getSqlStatement(), logicSQL.getParameters(),
- metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules(), connection.getSchema(), metaDataContexts.getMetaDataMap(), null);
- ExecutionContext result = kernelProcessor.generateExecutionContext(logicSQL, metaDataContexts.getMetaData(connection.getSchema()), metaDataContexts.getProps());
+ metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules(), connection.getDatabaseName(), metaDataContexts.getMetaDataMap(), null);
+ ExecutionContext result = kernelProcessor.generateExecutionContext(logicSQL, metaDataContexts.getMetaData(connection.getDatabaseName()), metaDataContexts.getProps());
findGeneratedKey(result).ifPresent(generatedKey -> generatedValues.addAll(generatedKey.getGeneratedValues()));
return result;
}
@@ -482,8 +482,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
private MergedResult mergeQuery(final List<QueryResult> queryResults) throws SQLException {
- ShardingSphereMetaData metaData = metaDataContexts.getMetaData(connection.getSchema());
- MergeEngine mergeEngine = new MergeEngine(connection.getSchema(), metaData.getResource().getDatabaseType(), metaData,
+ ShardingSphereMetaData metaData = metaDataContexts.getMetaData(connection.getDatabaseName());
+ MergeEngine mergeEngine = new MergeEngine(connection.getDatabaseName(), metaData.getResource().getDatabaseType(), metaData,
metaDataContexts.getProps(), metaData.getRuleMetaData().getRules());
return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
}
@@ -569,7 +569,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private void initBatchPreparedStatementExecutor() throws SQLException {
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(
JDBCDriverType.PREPARED_STATEMENT, metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY),
- connection.getConnectionManager(), statementManager, statementOption, metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules());
+ connection.getConnectionManager(), statementManager, statementOption, metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules());
List<ExecutionUnit> executionUnits = new ArrayList<>(batchPreparedStatementExecutor.getBatchExecutionUnits().size());
for (BatchExecutionUnit each : batchPreparedStatementExecutor.getBatchExecutionUnits()) {
ExecutionUnit executionUnit = each.getExecutionUnit();
@@ -615,7 +615,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
@Override
public boolean isAccumulate() {
- return metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream()
+ return metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
.anyMatch(each -> each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each)
.isNeedAccumulate(executionContext.getSqlStatementContext().getTablesContext().getTableNames()));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 47e338035f1..cdddbde6273 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -194,19 +194,19 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private List<QueryResult> executeQuery0() throws SQLException {
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(),
new RawSQLExecutorCallback()).stream().map(each -> (QueryResult) each).collect(Collectors.toList());
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionContext();
cacheStatements(executionGroupContext.getInputGroups());
- StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(),
+ StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(),
executionContext.getSqlStatementContext().getSqlStatement(), SQLExecutorExceptionHandler.isExceptionThrown());
return executor.getRegularExecutor().executeQuery(executionGroupContext, executionContext.getLogicSQL(), callback);
}
private ResultSet executeFederationQuery(final LogicSQL logicSQL) throws SQLException {
- StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(),
+ StatementExecuteQueryCallback callback = new StatementExecuteQueryCallback(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(),
executionContext.getSqlStatementContext().getSqlStatement(), SQLExecutorExceptionHandler.isExceptionThrown());
FederationContext context = new FederationContext(false, logicSQL, metaDataContexts.getMetaDataMap());
return executor.getFederationExecutor().executeQuery(createDriverExecutionPrepareEngine(), callback, context);
@@ -215,7 +215,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> createDriverExecutionPrepareEngine() {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, maxConnectionsSizePerQuery, connection.getConnectionManager(), statementManager,
- statementOption, metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules());
+ statementOption, metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules());
}
@Override
@@ -228,7 +228,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, Statement::executeUpdate);
}
executionContext = createExecutionContext(logicSQL);
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(), new RawSQLExecutorCallback()));
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionContext();
@@ -256,7 +256,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, autoGeneratedKeys));
}
executionContext = createExecutionContext(logicSQL);
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(), new RawSQLExecutorCallback()));
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionContext();
@@ -282,7 +282,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnIndexes));
}
executionContext = createExecutionContext(logicSQL);
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(), new RawSQLExecutorCallback()));
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroups = createExecutionContext();
@@ -308,7 +308,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> statement.executeUpdate(actualSQL, columnNames));
}
executionContext = createExecutionContext(logicSQL);
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
return accumulate(executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(), new RawSQLExecutorCallback()));
}
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = createExecutionContext();
@@ -327,7 +327,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<Integer> callback = new JDBCExecutorCallback<Integer>(
- metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(), sqlStatementContext.getSqlStatement(), isExceptionThrown) {
+ metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(), sqlStatementContext.getSqlStatement(), isExceptionThrown) {
@Override
protected Integer executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
@@ -399,7 +399,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
final SQLStatement sqlStatement, final Collection<RouteUnit> routeUnits) throws SQLException {
boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<Boolean> jdbcExecutorCallback = new JDBCExecutorCallback<Boolean>(
- metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
+ metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType(), sqlStatement, isExceptionThrown) {
@Override
protected Boolean executeSQL(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
@@ -423,7 +423,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return executor.getTrafficExecutor().execute(executionUnit, (statement, actualSQL) -> callback.execute(actualSQL, statement));
}
executionContext = createExecutionContext(logicSQL);
- if (metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
+ if (metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
// TODO process getStatement
Collection<ExecuteResult> results = executor.getRawExecutor().execute(createRawExecutionContext(), executionContext.getLogicSQL(), new RawSQLExecutorCallback());
return results.iterator().next() instanceof QueryResult;
@@ -458,9 +458,9 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private LogicSQL createLogicSQL(final String sql) {
SQLParserRule sqlParserRule = findSQLParserRule();
ShardingSphereSQLParserEngine sqlParserEngine = new ShardingSphereSQLParserEngine(
- DatabaseTypeRegistry.getTrunkDatabaseTypeName(metaDataContexts.getMetaData(connection.getSchema()).getResource().getDatabaseType()), sqlParserRule.toParserConfiguration());
+ DatabaseTypeRegistry.getTrunkDatabaseTypeName(metaDataContexts.getMetaData(connection.getDatabaseName()).getResource().getDatabaseType()), sqlParserRule.toParserConfiguration());
SQLStatement sqlStatement = sqlParserEngine.parse(sql, false);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaDataMap(), sqlStatement, connection.getSchema());
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataContexts.getMetaDataMap(), sqlStatement, connection.getDatabaseName());
return new LogicSQL(sqlStatementContext, sql, Collections.emptyList());
}
@@ -473,8 +473,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private ExecutionContext createExecutionContext(final LogicSQL logicSQL) throws SQLException {
clearStatements();
SQLCheckEngine.check(logicSQL.getSqlStatementContext().getSqlStatement(), logicSQL.getParameters(),
- metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules(), connection.getSchema(), metaDataContexts.getMetaDataMap(), null);
- return kernelProcessor.generateExecutionContext(logicSQL, metaDataContexts.getMetaData(connection.getSchema()), metaDataContexts.getProps());
+ metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules(), connection.getDatabaseName(), metaDataContexts.getMetaDataMap(), null);
+ return kernelProcessor.generateExecutionContext(logicSQL, metaDataContexts.getMetaData(connection.getDatabaseName()), metaDataContexts.getProps());
}
private ExecutionGroupContext<JDBCExecutionUnit> createExecutionContext() throws SQLException {
@@ -484,7 +484,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private ExecutionGroupContext<RawSQLExecutionUnit> createRawExecutionContext() throws SQLException {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
- return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules())
+ return new RawExecutionPrepareEngine(maxConnectionsSizePerQuery, metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules())
.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
@@ -547,7 +547,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
private MergedResult mergeQuery(final List<QueryResult> queryResults) throws SQLException {
- ShardingSphereMetaData metaData = metaDataContexts.getMetaData(connection.getSchema());
+ ShardingSphereMetaData metaData = metaDataContexts.getMetaData(connection.getDatabaseName());
MergeEngine mergeEngine = new MergeEngine(DefaultSchema.LOGIC_NAME, metaData.getResource().getDatabaseType(), metaData,
metaDataContexts.getProps(), metaData.getRuleMetaData().getRules());
return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
@@ -572,7 +572,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
@Override
public boolean isAccumulate() {
- return metaDataContexts.getMetaData(connection.getSchema()).getRuleMetaData().getRules().stream()
+ return metaDataContexts.getMetaData(connection.getDatabaseName()).getRuleMetaData().getRules().stream()
.anyMatch(each -> each instanceof DataNodeContainedRule && ((DataNodeContainedRule) each)
.isNeedAccumulate(executionContext.getSqlStatementContext().getTablesContext().getTableNames()));
}
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 b2cb3c5ad8b..2bc5c9fedc8 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
@@ -30,9 +30,9 @@ public interface DriverState extends StatelessTypedSPI {
/**
* Get connection.
*
- * @param schemaName schema name
+ * @param databaseName database name
* @param contextManager context manager
* @return connection
*/
- Connection getConnection(String schemaName, ContextManager contextManager);
+ Connection getConnection(String databaseName, ContextManager contextManager);
}
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 0fdb4102916..c9cf5194e45 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
@@ -32,11 +32,11 @@ public final class DriverStateContext {
/**
* Get connection.
*
- * @param schemaName schema name
+ * @param databaseName database name
* @param contextManager context manager
* @return connection
*/
- public static Connection getConnection(final String schemaName, final ContextManager contextManager) {
- return DriverStateFactory.newInstance(contextManager.getInstanceContext().getInstance().getState().getCurrentState()).getConnection(schemaName, contextManager);
+ public static Connection getConnection(final String databaseName, final ContextManager contextManager) {
+ return DriverStateFactory.newInstance(contextManager.getInstanceContext().getInstance().getState().getCurrentState()).getConnection(databaseName, contextManager);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
index a2ed6c58d9d..aeba242c0b3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
@@ -29,7 +29,7 @@ import java.sql.Connection;
public final class CircuitBreakDriverState implements DriverState {
@Override
- public Connection getConnection(final String schemaName, final ContextManager contextManager) {
+ public Connection getConnection(final String databaseName, final ContextManager contextManager) {
return new CircuitBreakerDataSource().getConnection();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
index 4578d262824..4389a9dc078 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
@@ -28,7 +28,7 @@ import java.sql.Connection;
public final class LockDriverState implements DriverState {
@Override
- public Connection getConnection(final String schemaName, final ContextManager contextManager) {
+ public Connection getConnection(final String databaseName, final ContextManager contextManager) {
// TODO
throw new UnsupportedOperationException("LockDriverState");
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
index e9d33a81d4f..f2dc10227ee 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
@@ -29,8 +29,8 @@ import java.sql.Connection;
public final class OKDriverState implements DriverState {
@Override
- public Connection getConnection(final String schemaName, final ContextManager contextManager) {
- return new ShardingSphereConnection(schemaName, contextManager);
+ public Connection getConnection(final String databaseName, final ContextManager contextManager) {
+ return new ShardingSphereConnection(databaseName, contextManager);
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
index eabd4176c6a..8f69260a81c 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
@@ -63,8 +63,8 @@ public final class PreparedStatementAdapterTest {
@Before
public void setUp() throws SQLException {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
- when(connection.getSchema()).thenReturn(DefaultSchema.LOGIC_NAME);
- when(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema()).getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
+ when(connection.getDatabaseName()).thenReturn(DefaultSchema.LOGIC_NAME);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName()).getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
when(connection.getContextManager().getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(SQLParserRule.class)).thenReturn(Optional.of(sqlParserRule));
when(connection.getContextManager().getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TrafficRule.class)).thenReturn(Optional.of(trafficRule));
shardingSpherePreparedStatement = new ShardingSpherePreparedStatement(connection, "SELECT 1");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
index 652d07f2fc7..33129301d97 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
@@ -92,9 +92,9 @@ public final class ShardingSphereDatabaseMetaDataTest {
when(shardingSphereConnection.getConnectionManager().getRandomConnection()).thenReturn(connection);
when(shardingSphereConnection.getContextManager().getMetaDataContexts()).thenReturn(metaDataContexts);
when(shardingSphereConnection.getContextManager().getDataSourceMap(DefaultSchema.LOGIC_NAME)).thenReturn(dataSourceMap);
- when(shardingSphereConnection.getSchema()).thenReturn(DefaultSchema.LOGIC_NAME);
+ when(shardingSphereConnection.getDatabaseName()).thenReturn(DefaultSchema.LOGIC_NAME);
ShardingSphereMetaData metaData = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
- when(metaDataContexts.getMetaData(shardingSphereConnection.getSchema())).thenReturn(metaData);
+ when(metaDataContexts.getMetaData(shardingSphereConnection.getDatabaseName())).thenReturn(metaData);
when(metaData.getResource().getCachedDatabaseMetaData()).thenReturn(cachedDatabaseMetaData);
ShardingRule shardingRule = mockShardingRule();
when(metaData.getRuleMetaData().getRules()).thenReturn(Collections.singleton(shardingRule));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
index 710d639a578..09c5eae5f5d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java
@@ -49,8 +49,8 @@ public final class UnsupportedOperationPreparedStatementTest {
@Before
public void setUp() throws SQLException {
ShardingSphereConnection connection = mock(ShardingSphereConnection.class, RETURNS_DEEP_STUBS);
- when(connection.getSchema()).thenReturn(DefaultSchema.LOGIC_NAME);
- when(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getSchema()).getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
+ when(connection.getDatabaseName()).thenReturn(DefaultSchema.LOGIC_NAME);
+ when(connection.getContextManager().getMetaDataContexts().getMetaData(connection.getDatabaseName()).getResource().getDatabaseType()).thenReturn(new MySQLDatabaseType());
when(connection.getContextManager().getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(SQLParserRule.class)).thenReturn(Optional.of(sqlParserRule));
when(connection.getContextManager().getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TrafficRule.class)).thenReturn(Optional.of(trafficRule));
shardingSpherePreparedStatement = new ShardingSpherePreparedStatement(connection, "SELECT 1");
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
index 282f8c854d9..8b0ae3b29ae 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/cache/subscriber/ScalingRegistrySubscriber.java
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.cache.event.StartScalingEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.ScalingTaskFinishedEvent;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.SchemaVersionPreparedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.MetadataVersionPreparedEvent;
import org.apache.shardingsphere.mode.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.metadata.persist.service.DatabaseVersionPersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -52,14 +52,15 @@ public final class ScalingRegistrySubscriber {
* @param event Schema version prepared event.
*/
@Subscribe
- public void startScaling(final SchemaVersionPreparedEvent event) {
- String activeVersion = databaseVersionPersistService.getDatabaseActiveVersion(event.getSchemaName()).get();
- String sourceDataSource = repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath(event.getSchemaName(), activeVersion));
- String targetDataSource = repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath(event.getSchemaName(), event.getVersion()));
- String sourceRule = repository.get(DatabaseMetaDataNode.getRulePath(event.getSchemaName(), activeVersion));
- String targetRule = repository.get(DatabaseMetaDataNode.getRulePath(event.getSchemaName(), event.getVersion()));
+ public void startScaling(final MetadataVersionPreparedEvent event) {
+ String databaseName = event.getDatabaseName();
+ String activeVersion = databaseVersionPersistService.getDatabaseActiveVersion(databaseName).get();
+ String sourceDataSource = repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, activeVersion));
+ String targetDataSource = repository.get(DatabaseMetaDataNode.getMetaDataDataSourcePath(databaseName, event.getVersion()));
+ String sourceRule = repository.get(DatabaseMetaDataNode.getRulePath(databaseName, activeVersion));
+ String targetRule = repository.get(DatabaseMetaDataNode.getRulePath(databaseName, event.getVersion()));
log.info("start scaling job, locked the schema name, event={}", event);
- StartScalingEvent startScalingEvent = new StartScalingEvent(event.getSchemaName(), sourceDataSource, sourceRule, targetDataSource, targetRule,
+ StartScalingEvent startScalingEvent = new StartScalingEvent(databaseName, sourceDataSource, sourceRule, targetDataSource, targetRule,
Integer.parseInt(activeVersion), Integer.parseInt(event.getVersion()));
ShardingSphereEventBus.getInstance().post(startScalingEvent);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/SchemaVersionPreparedEvent.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/MetadataVersionPreparedEvent.java
similarity index 89%
rename from shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/SchemaVersionPreparedEvent.java
rename to shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/MetadataVersionPreparedEvent.java
index 99dfafca8e5..7fe82ba8f43 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/SchemaVersionPreparedEvent.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/config/event/version/MetadataVersionPreparedEvent.java
@@ -22,14 +22,14 @@ import lombok.RequiredArgsConstructor;
import lombok.ToString;
/**
- * Schema version prepared event.
+ * Metadata version prepared event.
*/
@RequiredArgsConstructor
@Getter
@ToString
-public final class SchemaVersionPreparedEvent {
+public final class MetadataVersionPreparedEvent {
private final String version;
- private final String schemaName;
+ private final String databaseName;
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTestNoMock.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscrib [...]
index be9bfc12ac8..0150f219527 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTestNoMock.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTestNoMock.java
@@ -60,7 +60,7 @@ public final class ProcessRegistrySubscriberTestNoMock {
Collection<ExecutionGroup<JDBCExecutionUnit>> inputGroups = new LinkedList<>();
inputGroups.add(new ExecutionGroup<>(Collections.singletonList(new JDBCExecutionUnit(executionUnit, ConnectionMode.MEMORY_STRICTLY, null))));
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext = new ExecutionGroupContext<>(inputGroups);
- executionGroupContext.setSchemaName("sharding_db");
+ executionGroupContext.setDatabaseName("sharding_db");
executionGroupContext.setGrantee(new Grantee("sharding", "127.0.0.1"));
return new ExecuteProcessContext("sql1", executionGroupContext, ExecuteProcessConstants.EXECUTE_STATUS_START);
}
@@ -95,7 +95,7 @@ public final class ProcessRegistrySubscriberTestNoMock {
assertThat(yamlExecuteProcessContext.getExecutionID(), is(executionID));
assertNotNull(yamlExecuteProcessContext.getStartTimeMillis());
assertThat(yamlExecuteProcessContext.getStartTimeMillis(), is(executeProcessContext.getStartTimeMillis()));
- assertThat(yamlExecuteProcessContext.getSchemaName(), is("sharding_db"));
+ assertThat(yamlExecuteProcessContext.getDatabaseName(), is("sharding_db"));
assertThat(yamlExecuteProcessContext.getUsername(), is("sharding"));
assertThat(yamlExecuteProcessContext.getHostname(), is("127.0.0.1"));
assertThat(yamlExecuteProcessContext.getSql(), is("sql1"));
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/subscriber/StorageNodeStatusSubscriberTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/subscriber/StorageNodeSt [...]
index 362ad74bf2b..8cfd988a36e 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/subscriber/StorageNodeStatusSubscriberTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/subscriber/StorageNodeStatusSubscriberTest.java
@@ -41,34 +41,34 @@ public final class StorageNodeStatusSubscriberTest {
@Test
public void assertUpdateDataSourceDisabledState() {
- String schemaName = "replica_query_db";
+ String databaseName = "replica_query_db";
String groupName = "readwrite_ds";
String dataSourceName = "replica_ds_0";
StorageNodeDataSource storageNodeDataSource = new StorageNodeDataSource(StorageNodeRole.MEMBER, StorageNodeStatus.DISABLED);
- DataSourceDisabledEvent dataSourceDisabledEvent = new DataSourceDisabledEvent(schemaName, groupName, dataSourceName, storageNodeDataSource);
+ DataSourceDisabledEvent dataSourceDisabledEvent = new DataSourceDisabledEvent(databaseName, groupName, dataSourceName, storageNodeDataSource);
new StorageNodeStatusSubscriber(repository).update(dataSourceDisabledEvent);
- verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(schemaName, groupName, dataSourceName)), YamlEngine.marshal(storageNodeDataSource));
+ verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(databaseName, groupName, dataSourceName)), YamlEngine.marshal(storageNodeDataSource));
}
@Test
public void assertUpdateDataSourceEnabledState() {
- String schemaName = "replica_query_db";
+ String databaseName = "replica_query_db";
String groupName = "readwrite_ds";
String dataSourceName = "replica_ds_0";
StorageNodeDataSource storageNodeDataSource = new StorageNodeDataSource(StorageNodeRole.MEMBER, StorageNodeStatus.ENABLED);
- DataSourceDisabledEvent dataSourceDisabledEvent = new DataSourceDisabledEvent(schemaName, groupName, dataSourceName, storageNodeDataSource);
+ DataSourceDisabledEvent dataSourceDisabledEvent = new DataSourceDisabledEvent(databaseName, groupName, dataSourceName, storageNodeDataSource);
new StorageNodeStatusSubscriber(repository).update(dataSourceDisabledEvent);
- verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(schemaName, groupName, dataSourceName)), YamlEngine.marshal(storageNodeDataSource));
+ verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(databaseName, groupName, dataSourceName)), YamlEngine.marshal(storageNodeDataSource));
}
@Test
public void assertUpdatePrimaryDataSourceState() {
- String schemaName = "replica_query_db";
+ String databaseName = "replica_query_db";
String groupName = "readwrite_ds";
String dataSourceName = "replica_ds_0";
- PrimaryDataSourceChangedEvent event = new PrimaryDataSourceChangedEvent(new QualifiedDatabase(schemaName, groupName, dataSourceName));
+ PrimaryDataSourceChangedEvent event = new PrimaryDataSourceChangedEvent(new QualifiedDatabase(databaseName, groupName, dataSourceName));
new StorageNodeStatusSubscriber(repository).update(event);
- verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(schemaName, groupName, dataSourceName)),
+ verify(repository).persist(StorageStatusNode.getStatusPath(new QualifiedDatabase(databaseName, groupName, dataSourceName)),
YamlEngine.marshal(new StorageNodeDataSource(StorageNodeRole.PRIMARY, StorageNodeStatus.ENABLED)));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
index 65bc7f77b9a..68d60cdec3e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
@@ -142,7 +142,7 @@ public final class ProxySQLExecutor {
} catch (final SQLException ex) {
return getSaneExecuteResults(executionContext, ex);
}
- executionGroupContext.setSchemaName(backendConnection.getConnectionSession().getDatabaseName());
+ executionGroupContext.setDatabaseName(backendConnection.getConnectionSession().getDatabaseName());
executionGroupContext.setGrantee(backendConnection.getConnectionSession().getGrantee());
// TODO handle query header
return rawExecutor.execute(executionGroupContext, executionContext.getLogicSQL(), new RawSQLExecutorCallback());
@@ -159,7 +159,7 @@ public final class ProxySQLExecutor {
} catch (final SQLException ex) {
return getSaneExecuteResults(executionContext, ex);
}
- executionGroupContext.setSchemaName(backendConnection.getConnectionSession().getDatabaseName());
+ executionGroupContext.setDatabaseName(backendConnection.getConnectionSession().getDatabaseName());
executionGroupContext.setGrantee(backendConnection.getConnectionSession().getGrantee());
return jdbcExecutor.execute(executionContext.getLogicSQL(), executionGroupContext, isReturnGeneratedKeys, isExceptionThrown);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
index 5e03d2c80af..02c0a1fee9a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java
@@ -113,7 +113,7 @@ public final class ReactiveProxySQLExecutor {
} catch (final SQLException ex) {
return Future.succeededFuture(getSaneExecuteResults(executionContext, ex));
}
- executionGroupContext.setSchemaName(backendConnection.getConnectionSession().getDatabaseName());
+ executionGroupContext.setDatabaseName(backendConnection.getConnectionSession().getDatabaseName());
executionGroupContext.setGrantee(backendConnection.getConnectionSession().getGrantee());
return reactiveExecutor.execute(executionContext.getLogicSQL(), executionGroupContext);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
index 6393743c1ff..9f2dd4668ca 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
@@ -43,21 +43,21 @@ public final class JDBCBackendDataSource implements BackendDataSource {
/**
* Get connections.
*
- * @param schemaName scheme name
+ * @param databaseName database name
* @param dataSourceName data source name
* @param connectionSize size of connections to get
* @param connectionMode connection mode
* @return connections
* @throws SQLException SQL exception
*/
- public List<Connection> getConnections(final String schemaName, final String dataSourceName, final int connectionSize, final ConnectionMode connectionMode) throws SQLException {
- return getConnections(schemaName, dataSourceName, connectionSize, connectionMode, getTransactionRule().getDefaultType());
+ public List<Connection> getConnections(final String databaseName, final String dataSourceName, final int connectionSize, final ConnectionMode connectionMode) throws SQLException {
+ return getConnections(databaseName, dataSourceName, connectionSize, connectionMode, getTransactionRule().getDefaultType());
}
/**
* Get connections.
*
- * @param schemaName scheme name
+ * @param databaseName database name
* @param dataSourceName data source name
* @param connectionSize size of connections to be get
* @param connectionMode connection mode
@@ -66,9 +66,9 @@ public final class JDBCBackendDataSource implements BackendDataSource {
* @throws SQLException SQL exception
*/
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
- public List<Connection> getConnections(final String schemaName, final String dataSourceName,
+ public List<Connection> getConnections(final String databaseName, final String dataSourceName,
final int connectionSize, final ConnectionMode connectionMode, final TransactionType transactionType) throws SQLException {
- DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(schemaName).getResource().getDataSources().get(dataSourceName);
+ DataSource dataSource = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData(databaseName).getResource().getDataSources().get(dataSourceName);
if (dataSourceName.contains(".")) {
String dataSourceStr = dataSourceName.split("\\.")[0];
if (GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().containsKey(dataSourceStr)) {
@@ -77,22 +77,22 @@ public final class JDBCBackendDataSource implements BackendDataSource {
}
Preconditions.checkNotNull(dataSource, "Can not get connection from datasource %s.", dataSourceName);
if (1 == connectionSize) {
- return Collections.singletonList(createConnection(schemaName, dataSourceName, dataSource, transactionType));
+ return Collections.singletonList(createConnection(databaseName, dataSourceName, dataSource, transactionType));
}
if (ConnectionMode.CONNECTION_STRICTLY == connectionMode) {
- return createConnections(schemaName, dataSourceName, dataSource, connectionSize, transactionType);
+ return createConnections(databaseName, dataSourceName, dataSource, connectionSize, transactionType);
}
synchronized (dataSource) {
- return createConnections(schemaName, dataSourceName, dataSource, connectionSize, transactionType);
+ return createConnections(databaseName, dataSourceName, dataSource, connectionSize, transactionType);
}
}
- private List<Connection> createConnections(final String schemaName, final String dataSourceName,
+ private List<Connection> createConnections(final String databaseName, final String dataSourceName,
final DataSource dataSource, final int connectionSize, final TransactionType transactionType) throws SQLException {
List<Connection> result = new ArrayList<>(connectionSize);
for (int i = 0; i < connectionSize; i++) {
try {
- result.add(createConnection(schemaName, dataSourceName, dataSource, transactionType));
+ result.add(createConnection(databaseName, dataSourceName, dataSource, transactionType));
} catch (final SQLException ex) {
for (Connection each : result) {
each.close();
@@ -104,13 +104,13 @@ public final class JDBCBackendDataSource implements BackendDataSource {
return result;
}
- private Connection createConnection(final String schemaName, final String dataSourceName, final DataSource dataSource, final TransactionType transactionType) throws SQLException {
+ private Connection createConnection(final String databaseName, final String dataSourceName, final DataSource dataSource, final TransactionType transactionType) throws SQLException {
ShardingSphereTransactionManager transactionManager =
- ProxyContext.getInstance().getContextManager().getTransactionContexts().getEngines().get(schemaName).getTransactionManager(transactionType);
+ ProxyContext.getInstance().getContextManager().getTransactionContexts().getEngines().get(databaseName).getTransactionManager(transactionType);
Connection result = isInTransaction(transactionManager) ? transactionManager.getConnection(dataSourceName) : dataSource.getConnection();
if (dataSourceName.contains(".")) {
- String databaseName = dataSourceName.split("\\.")[1];
- result.setCatalog(databaseName);
+ String catalog = dataSourceName.split("\\.")[1];
+ result.setCatalog(catalog);
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutor.java
index c212d737ed6..6dade1a8812 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutor.java
@@ -93,7 +93,7 @@ public final class ShowProcessListExecutor implements DatabaseAdminQueryExecutor
rowValues.add(processContext.getExecutionID());
rowValues.add(processContext.getUsername());
rowValues.add(processContext.getHostname());
- rowValues.add(processContext.getSchemaName());
+ rowValues.add(processContext.getDatabaseName());
rowValues.add("Execute");
rowValues.add(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - processContext.getStartTimeMillis()));
int processDoneCount = processContext.getUnitStatuses().stream().map(processUnit -> ExecuteProcessConstants.EXECUTE_STATUS_DONE == processUnit.getStatus() ? 1 : 0).reduce(0, Integer::sum);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index cbe38cedfab..c4bfcdf5349 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater;
import org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdaterFactory;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.SchemaVersionPreparedEvent;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.version.MetadataVersionPreparedEvent;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -150,7 +150,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
}
metaDataPersistService.get().getDatabaseRulePersistService().persist(shardingSphereMetaData.getDatabaseName(), newVersion.get(),
buildAlteredRuleConfigurations(shardingSphereMetaData, sqlStatement, updater, currentRuleConfig, preprocessor));
- ShardingSphereEventBus.getInstance().post(new SchemaVersionPreparedEvent(newVersion.get(), shardingSphereMetaData.getDatabaseName()));
+ ShardingSphereEventBus.getInstance().post(new MetadataVersionPreparedEvent(newVersion.get(), shardingSphereMetaData.getDatabaseName()));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutorTest.java
index 61204e3bd52..4045b0e37e8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/ShowProcessListExecutorTest.java
@@ -50,7 +50,7 @@ public final class ShowProcessListExecutorTest {
+ "- executionID: f6c2336a-63ba-41bf-941e-2e3504eb2c80\n"
+ " sql: alter table t_order add column a varchar(64) after order_id\n"
+ " startTimeMillis: 1617939785160\n"
- + " schemaName: sharding_db\n"
+ + " databaseName: sharding_db\n"
+ " username: sharding\n"
+ " hostname: 127.0.0.1\n"
+ " unitStatuses:\n"
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
index 4d2130f134b..42238585934 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/AbstractSQLRewriterParameterizedTest.java
@@ -107,20 +107,20 @@ public abstract class AbstractSQLRewriterParameterizedTest {
ShardingSphereResource resource = mock(ShardingSphereResource.class);
DatabaseType databaseType = DatabaseTypeRegistry.getActualDatabaseType(getTestParameters().getDatabaseType());
when(resource.getDatabaseType()).thenReturn(databaseType);
- String schemaName = databaseType.getDefaultSchema(DefaultSchema.LOGIC_NAME);
- Map<String, ShardingSphereSchema> schemas = mockSchemas(schemaName);
- ShardingSphereMetaData metaData = new ShardingSphereMetaData(schemaName, resource, new ShardingSphereRuleMetaData(Collections.emptyList(), rules), schemas);
+ String databaseName = databaseType.getDefaultSchema(DefaultSchema.LOGIC_NAME);
+ Map<String, ShardingSphereSchema> schemas = mockSchemas(databaseName);
+ ShardingSphereMetaData metaData = new ShardingSphereMetaData(databaseName, resource, new ShardingSphereRuleMetaData(Collections.emptyList(), rules), schemas);
Map<String, ShardingSphereMetaData> metaDataMap = new HashMap<>(2, 1);
- metaDataMap.put(schemaName, metaData);
+ metaDataMap.put(databaseName, metaData);
SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(metaDataMap,
- sqlStatementParserEngine.parse(getTestParameters().getInputSQL(), false), schemaName);
+ sqlStatementParserEngine.parse(getTestParameters().getInputSQL(), false), databaseName);
if (sqlStatementContext instanceof ParameterAware) {
((ParameterAware) sqlStatementContext).setUpParameters(getTestParameters().getInputParameters());
}
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
ConfigurationProperties props = new ConfigurationProperties(rootConfig.getProps());
RouteContext routeContext = new SQLRouteEngine(rules, props).route(logicSQL, metaData);
- SQLRewriteEntry sqlRewriteEntry = new SQLRewriteEntry(schemaName, schemas, props, rules);
+ SQLRewriteEntry sqlRewriteEntry = new SQLRewriteEntry(databaseName, schemas, props, rules);
SQLRewriteResult sqlRewriteResult = sqlRewriteEntry.rewrite(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), sqlStatementContext, routeContext);
return sqlRewriteResult instanceof GenericSQLRewriteResult
? Collections.singletonList(((GenericSQLRewriteResult) sqlRewriteResult).getSqlRewriteUnit())
@@ -131,7 +131,7 @@ public abstract class AbstractSQLRewriterParameterizedTest {
protected abstract YamlRootConfiguration createRootConfiguration() throws IOException;
- protected abstract Map<String, ShardingSphereSchema> mockSchemas(String schemaName);
+ protected abstract Map<String, ShardingSphereSchema> mockSchemas(String databaseName);
protected abstract void mockRules(Collection<ShardingSphereRule> rules);
}
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
index abd41c842b5..8ac8e8da14a 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
@@ -71,14 +71,14 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
}
@Override
- protected Map<String, ShardingSphereSchema> mockSchemas(final String schemaName) {
+ protected Map<String, ShardingSphereSchema> mockSchemas(final String databaseName) {
ShardingSphereSchema result = mock(ShardingSphereSchema.class);
when(result.getAllColumnNames("t_account")).thenReturn(Arrays.asList("account_id", "certificate_number", "password", "amount", "status"));
when(result.getAllColumnNames("t_account_bak")).thenReturn(Arrays.asList("account_id", "certificate_number", "password", "amount", "status"));
when(result.getAllColumnNames("t_account_detail")).thenReturn(Arrays.asList("account_id", "certificate_number", "password", "amount", "status"));
when(result.getAllColumnNames("t_order")).thenReturn(Arrays.asList("ORDER_ID", "USER_ID", "CONTENT"));
when(result.get("t_order")).thenReturn(new TableMetaData("t_order", Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
- return Collections.singletonMap(schemaName, result);
+ return Collections.singletonMap(databaseName, result);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
index 4464c52663a..e96be893030 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
@@ -68,7 +68,7 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
}
@Override
- protected Map<String, ShardingSphereSchema> mockSchemas(final String schemaName) {
+ protected Map<String, ShardingSphereSchema> mockSchemas(final String databaseName) {
ShardingSphereSchema result = mock(ShardingSphereSchema.class);
when(result.getAllTableNames()).thenReturn(Arrays.asList("t_account", "t_account_bak", "t_account_detail"));
TableMetaData accountTableMetaData = mock(TableMetaData.class);
@@ -85,7 +85,7 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
when(result.get("t_account_detail")).thenReturn(mock(TableMetaData.class));
when(result.getAllColumnNames("t_account")).thenReturn(Arrays.asList("account_id", "password", "amount", "status"));
when(result.getAllColumnNames("t_account_bak")).thenReturn(Arrays.asList("account_id", "password", "amount", "status"));
- return Collections.singletonMap(schemaName, result);
+ return Collections.singletonMap(databaseName, result);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
index 11445458fea..7d665b918db 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
+++ b/shardingsphere-test/shardingsphere-rewrite-test/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
@@ -80,7 +80,7 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
}
@Override
- protected Map<String, ShardingSphereSchema> mockSchemas(final String schemaName) {
+ protected Map<String, ShardingSphereSchema> mockSchemas(final String databaseName) {
ShardingSphereSchema result = mock(ShardingSphereSchema.class);
when(result.getAllTableNames()).thenReturn(Arrays.asList("t_account", "t_account_detail"));
TableMetaData accountTableMetaData = mock(TableMetaData.class);
@@ -96,7 +96,7 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
when(result.getAllColumnNames("t_user")).thenReturn(new ArrayList<>(Arrays.asList("id", "content")));
when(result.getAllColumnNames("t_user_extend")).thenReturn(new ArrayList<>(Arrays.asList("user_id", "content")));
when(result.containsColumn("t_account", "account_id")).thenReturn(true);
- return Collections.singletonMap(schemaName, result);
+ return Collections.singletonMap(databaseName, result);
}
private Map<String, ColumnMetaData> createColumnMetaDataMap() {