This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 30e122c Refactor RDLCreateUpdater.buildToBeCreatedRuleConfiguration()
(#11149)
30e122c is described below
commit 30e122c68d4df03273774aa8774642de8355b7df
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 4 20:46:55 2021 +0800
Refactor RDLCreateUpdater.buildToBeCreatedRuleConfiguration() (#11149)
---
.../handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
.../distsql/handler/update/CreateEncryptRuleStatementUpdater.java | 2 +-
.../handler/update/CreateReadwriteSplittingRuleStatementUpdater.java | 2 +-
.../handler/update/CreateShardingBindingTableRuleStatementUpdater.java | 2 +-
.../update/CreateShardingBroadcastTableRuleStatementUpdater.java | 2 +-
.../handler/update/CreateShardingTableRuleStatementUpdater.java | 2 +-
.../apache/shardingsphere/infra/distsql/update/RDLCreateUpdater.java | 3 +--
.../proxy/backend/text/distsql/rdl/RDLBackendHandler.java | 2 +-
8 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseD
[...]
index ff030ba..1ffdcfa 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
@@ -96,7 +96,7 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RDLCre
}
@Override
- public DatabaseDiscoveryRuleConfiguration
buildToBeCreatedRuleConfiguration(final String schemaName, final
CreateDatabaseDiscoveryRuleStatement sqlStatement) {
+ public DatabaseDiscoveryRuleConfiguration
buildToBeCreatedRuleConfiguration(final CreateDatabaseDiscoveryRuleStatement
sqlStatement) {
return
DatabaseDiscoveryRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
index ab3b5fe..eac873d 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java
@@ -75,7 +75,7 @@ public final class CreateEncryptRuleStatementUpdater
implements RDLCreateUpdater
}
@Override
- public EncryptRuleConfiguration buildToBeCreatedRuleConfiguration(final
String schemaName, final CreateEncryptRuleStatement sqlStatement) {
+ public EncryptRuleConfiguration buildToBeCreatedRuleConfiguration(final
CreateEncryptRuleStatement sqlStatement) {
return EncryptRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/
[...]
index f39645d..23146cc 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
@@ -93,7 +93,7 @@ public final class
CreateReadwriteSplittingRuleStatementUpdater implements RDLCr
}
@Override
- public ReadwriteSplittingRuleConfiguration
buildToBeCreatedRuleConfiguration(final String schemaName, final
CreateReadwriteSplittingRuleStatement sqlStatement) {
+ public ReadwriteSplittingRuleConfiguration
buildToBeCreatedRuleConfiguration(final CreateReadwriteSplittingRuleStatement
sqlStatement) {
return
ReadwriteSplittingRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpd
[...]
index 2154c3d..4f6803a 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBindingTableRuleStatementUpdater.java
@@ -88,7 +88,7 @@ public final class
CreateShardingBindingTableRuleStatementUpdater implements RDL
}
@Override
- public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
String schemaName, final CreateShardingBindingTableRulesStatement sqlStatement)
{
+ public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
CreateShardingBindingTableRulesStatement sqlStatement) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
for (BindingTableRuleSegment each : sqlStatement.getRules()) {
result.getBindingTableGroups().add(each.getTableGroups());
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatemen
[...]
index 591efda..d15a924 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingBroadcastTableRuleStatementUpdater.java
@@ -42,7 +42,7 @@ public final class
CreateShardingBroadcastTableRuleStatementUpdater implements R
}
@Override
- public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
String schemaName, final CreateShardingBroadcastTableRulesStatement
sqlStatement) {
+ public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
CreateShardingBroadcastTableRulesStatement sqlStatement) {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
result.setBroadcastTables(sqlStatement.getTables());
return result;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
index f2b26e8..8ed1e02 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java
@@ -117,7 +117,7 @@ public final class CreateShardingTableRuleStatementUpdater
implements RDLCreateU
}
@Override
- public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
String schemaName, final CreateShardingTableRuleStatement sqlStatement) {
+ public ShardingRuleConfiguration buildToBeCreatedRuleConfiguration(final
CreateShardingTableRuleStatement sqlStatement) {
return ShardingRuleStatementConverter.convert(sqlStatement.getRules());
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/update/RDLCreateUpdater.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/update/RDLCreateUpdater.java
index 2bc081b..f29023d 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/update/RDLCreateUpdater.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/update/RDLCreateUpdater.java
@@ -31,11 +31,10 @@ public interface RDLCreateUpdater<T extends SQLStatement, R
extends RuleConfigur
/**
* Build to be created rule configuration.
*
- * @param schemaName schema name
* @param sqlStatement SQL statement
* @return built to be created rule configuration
*/
- RuleConfiguration buildToBeCreatedRuleConfiguration(String schemaName, T
sqlStatement);
+ RuleConfiguration buildToBeCreatedRuleConfiguration(T sqlStatement);
/**
* Update current rule configuration.
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
index 5275ef8..ec3a4b0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandler.java
@@ -88,7 +88,7 @@ public final class RDLBackendHandler<T extends SQLStatement>
extends SchemaRequi
@SuppressWarnings({"rawtypes", "unchecked"})
private void processCreate(final String schemaName, final T sqlStatement,
final RDLCreateUpdater updater, final RuleConfiguration currentRuleConfig) {
- RuleConfiguration toBeCreatedRuleConfig =
updater.buildToBeCreatedRuleConfiguration(schemaName, sqlStatement);
+ RuleConfiguration toBeCreatedRuleConfig =
updater.buildToBeCreatedRuleConfiguration(sqlStatement);
if (null == currentRuleConfig) {
ProxyContext.getInstance().getMetaData(schemaName).getRuleMetaData().getConfigurations().add(toBeCreatedRuleConfig);
} else {
