This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 13e5868dc3c Schema name rename to database name. (#16887)
13e5868dc3c is described below
commit 13e5868dc3cbb185ac65c84ee21b6c01e1d3c8f5
Author: zhaojinchao <[email protected]>
AuthorDate: Sun Apr 17 22:52:37 2022 +0800
Schema name rename to database name. (#16887)
---
.../DatabaseDiscoveryRuleConfigurationChecker.java | 4 ++--
.../dbdiscovery/rule/DatabaseDiscoveryRule.java | 28 +++++++++++-----------
...orithmProvidedDatabaseDiscoveryRuleBuilder.java | 4 ++--
.../rule/builder/DatabaseDiscoveryRuleBuilder.java | 4 ++--
.../AbstractEncryptRuleConfigurationChecker.java | 4 ++--
.../AlgorithmProvidedEncryptRuleBuilder.java | 2 +-
.../encrypt/rule/builder/EncryptRuleBuilder.java | 2 +-
...ReadwriteSplittingRuleConfigurationChecker.java | 10 ++++----
...rithmProvidedReadwriteSplittingRuleBuilder.java | 2 +-
.../builder/ReadwriteSplittingRuleBuilder.java | 2 +-
.../AbstractShadowRuleConfigurationChecker.java | 2 +-
.../AlgorithmProvidedShadowRuleBuilder.java | 2 +-
.../shadow/rule/builder/ShadowRuleBuilder.java | 2 +-
.../AbstractShardingRuleConfigurationChecker.java | 4 ++--
.../AlgorithmProvidedShardingRuleBuilder.java | 2 +-
.../sharding/rule/builder/ShardingRuleBuilder.java | 2 +-
.../config/checker/RuleConfigurationChecker.java | 4 ++--
.../rule/builder/schema/SchemaRuleBuilder.java | 4 ++--
.../checker/RuleConfigurationCheckerFixture.java | 2 +-
.../fixture/TestShardingSphereRuleBuilder.java | 2 +-
.../rule/builder/SingleTableRuleBuilder.java | 2 +-
.../mode/metadata/fixture/FixtureRuleBuilder.java | 2 +-
.../fixture/RuleConfigurationFixtureChecker.java | 2 +-
.../fixture/TestRuleConfigurationChecker.java | 2 +-
24 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/checker/DatabaseDiscoveryRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/checker/DatabaseDiscoveryRuleConfigurationChecker.java
index e07b87710cf..220b747fb0f 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/checker/DatabaseDiscoveryRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/checker/DatabaseDiscoveryRuleConfigurationChecker.java
@@ -28,8 +28,8 @@ import
org.apache.shardingsphere.infra.config.checker.RuleConfigurationChecker;
public final class DatabaseDiscoveryRuleConfigurationChecker implements
RuleConfigurationChecker<DatabaseDiscoveryRuleConfiguration> {
@Override
- public void check(final String schemaName, final
DatabaseDiscoveryRuleConfiguration config) {
- config.getDataSources().forEach(each ->
Preconditions.checkState(!each.getDiscoveryTypeName().isEmpty(), "No available
database discovery rule configuration in schema `%s.", schemaName));
+ public void check(final String databaseName, final
DatabaseDiscoveryRuleConfiguration config) {
+ config.getDataSources().forEach(each ->
Preconditions.checkState(!each.getDiscoveryTypeName().isEmpty(), "No available
database discovery rule configuration in database `%s.", databaseName));
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
index 0798a4c6413..f905938caa9 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/DatabaseDiscoveryRule.java
@@ -68,21 +68,21 @@ public final class DatabaseDiscoveryRule implements
SchemaRule, DataSourceContai
@Getter
private final Map<String, DatabaseDiscoveryDataSourceRule> dataSourceRules;
- public DatabaseDiscoveryRule(final String schemaName, final Map<String,
DataSource> dataSourceMap, final DatabaseDiscoveryRuleConfiguration config) {
- this(schemaName, dataSourceMap, config.getDataSources(),
config.getDiscoveryHeartbeats(), getDiscoveryTypes(config.getDiscoveryTypes()));
+ public DatabaseDiscoveryRule(final String databaseName, final Map<String,
DataSource> dataSourceMap, final DatabaseDiscoveryRuleConfiguration config) {
+ this(databaseName, dataSourceMap, config.getDataSources(),
config.getDiscoveryHeartbeats(), getDiscoveryTypes(config.getDiscoveryTypes()));
}
- public DatabaseDiscoveryRule(final String schemaName, final Map<String,
DataSource> dataSourceMap, final
AlgorithmProvidedDatabaseDiscoveryRuleConfiguration config) {
- this(schemaName, dataSourceMap, config.getDataSources(),
config.getDiscoveryHeartbeats(), config.getDiscoveryTypes());
+ public DatabaseDiscoveryRule(final String databaseName, final Map<String,
DataSource> dataSourceMap, final
AlgorithmProvidedDatabaseDiscoveryRuleConfiguration config) {
+ this(databaseName, dataSourceMap, config.getDataSources(),
config.getDiscoveryHeartbeats(), config.getDiscoveryTypes());
}
- private DatabaseDiscoveryRule(final String schemaName, final Map<String,
DataSource> dataSourceMap, final
Collection<DatabaseDiscoveryDataSourceRuleConfiguration> dataSourceRuleConfigs,
+ private DatabaseDiscoveryRule(final String databaseName, final Map<String,
DataSource> dataSourceMap, final
Collection<DatabaseDiscoveryDataSourceRuleConfiguration> dataSourceRuleConfigs,
final Map<String,
DatabaseDiscoveryHeartBeatConfiguration> heartBeatConfig, final Map<String,
DatabaseDiscoveryType> discoveryTypes) {
this.discoveryTypes = discoveryTypes;
dataSourceRules = getDataSourceRules(dataSourceRuleConfigs,
heartBeatConfig);
- findMasterSlaveRelation(schemaName, dataSourceMap);
+ findMasterSlaveRelation(databaseName, dataSourceMap);
initAware();
- initHeartBeatJobs(schemaName, dataSourceMap);
+ initHeartBeatJobs(databaseName, dataSourceMap);
}
private static Map<String, DatabaseDiscoveryType> getDiscoveryTypes(final
Map<String, ShardingSphereAlgorithmConfiguration> discoveryTypesConfig) {
@@ -103,7 +103,7 @@ public final class DatabaseDiscoveryRule implements
SchemaRule, DataSourceContai
return result;
}
- private void findMasterSlaveRelation(final String schemaName, final
Map<String, DataSource> dataSourceMap) {
+ private void findMasterSlaveRelation(final String databaseName, final
Map<String, DataSource> dataSourceMap) {
for (Entry<String, DatabaseDiscoveryDataSourceRule> entry :
dataSourceRules.entrySet()) {
String groupName = entry.getKey();
DatabaseDiscoveryDataSourceRule dataSourceRule = entry.getValue();
@@ -111,13 +111,13 @@ public final class DatabaseDiscoveryRule implements
SchemaRule, DataSourceContai
Map<String, DataSource> originalDataSourceMap = new
HashMap<>(dataSourceMap);
Collection<String> disabledDataSourceNames =
dataSourceRule.getDisabledDataSourceNames();
try {
-
databaseDiscoveryType.checkDatabaseDiscoveryConfiguration(schemaName,
originalDataSourceMap);
+
databaseDiscoveryType.checkDatabaseDiscoveryConfiguration(databaseName,
originalDataSourceMap);
} catch (final SQLException ex) {
throw new ShardingSphereException(ex);
}
- databaseDiscoveryType.updatePrimaryDataSource(schemaName,
originalDataSourceMap, disabledDataSourceNames, groupName);
+ databaseDiscoveryType.updatePrimaryDataSource(databaseName,
originalDataSourceMap, disabledDataSourceNames, groupName);
dataSourceRule.updatePrimaryDataSourceName(databaseDiscoveryType.getPrimaryDataSource());
- databaseDiscoveryType.updateMemberState(schemaName,
originalDataSourceMap, groupName);
+ databaseDiscoveryType.updateMemberState(databaseName,
originalDataSourceMap, groupName);
}
}
@@ -185,14 +185,14 @@ public final class DatabaseDiscoveryRule implements
SchemaRule, DataSourceContai
return result;
}
- private void initHeartBeatJobs(final String schemaName, final Map<String,
DataSource> dataSourceMap) {
+ private void initHeartBeatJobs(final String databaseName, final
Map<String, DataSource> dataSourceMap) {
Optional<ModeScheduleContext> modeScheduleContext =
ModeScheduleContextFactory.getInstance().get();
if (modeScheduleContext.isPresent()) {
for (Entry<String, DatabaseDiscoveryDataSourceRule> entry :
dataSourceRules.entrySet()) {
Map<String, DataSource> dataSources =
dataSourceMap.entrySet().stream().filter(dataSource ->
!entry.getValue().getDisabledDataSourceNames().contains(dataSource.getKey()))
.collect(Collectors.toMap(Entry::getKey,
Entry::getValue));
- CronJob job = new
CronJob(entry.getValue().getDatabaseDiscoveryType().getType() + "-" +
schemaName + "-" + entry.getValue().getGroupName(),
- each -> new HeartbeatJob(schemaName, dataSources,
entry.getValue().getGroupName(), entry.getValue().getDatabaseDiscoveryType(),
entry.getValue().getDisabledDataSourceNames())
+ CronJob job = new
CronJob(entry.getValue().getDatabaseDiscoveryType().getType() + "-" +
databaseName + "-" + entry.getValue().getGroupName(),
+ each -> new HeartbeatJob(databaseName, dataSources,
entry.getValue().getGroupName(), entry.getValue().getDatabaseDiscoveryType(),
entry.getValue().getDisabledDataSourceNames())
.execute(null),
entry.getValue().getHeartbeatProps().getProperty("keep-alive-cron"));
modeScheduleContext.get().startCronJob(job);
}
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilder.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilder.java
index 98243b5cbee..bf4981152d0 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/AlgorithmProvidedDatabaseDiscoveryRuleBuilder.java
@@ -34,9 +34,9 @@ import java.util.Map;
public final class AlgorithmProvidedDatabaseDiscoveryRuleBuilder implements
SchemaRuleBuilder<AlgorithmProvidedDatabaseDiscoveryRuleConfiguration> {
@Override
- public DatabaseDiscoveryRule build(final
AlgorithmProvidedDatabaseDiscoveryRuleConfiguration config, final String
schemaName,
+ public DatabaseDiscoveryRule build(final
AlgorithmProvidedDatabaseDiscoveryRuleConfiguration config, final String
databaseName,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
ConfigurationProperties props) {
- return new DatabaseDiscoveryRule(schemaName, dataSources, config);
+ return new DatabaseDiscoveryRule(databaseName, dataSources, config);
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilder.java
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilder.java
index 305b8469614..f11ce80f9a7 100644
---
a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/java/org/apache/shardingsphere/dbdiscovery/rule/builder/DatabaseDiscoveryRuleBuilder.java
@@ -36,7 +36,7 @@ import java.util.Map;
public final class DatabaseDiscoveryRuleBuilder implements
SchemaRuleBuilder<DatabaseDiscoveryRuleConfiguration> {
@Override
- public DatabaseDiscoveryRule build(final
DatabaseDiscoveryRuleConfiguration config, final String schemaName,
+ public DatabaseDiscoveryRule build(final
DatabaseDiscoveryRuleConfiguration config, final String databaseName,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
ConfigurationProperties props) {
Map<String, DataSource> realDataSourceMap = new HashMap<>();
for (DatabaseDiscoveryDataSourceRuleConfiguration each :
config.getDataSources()) {
@@ -44,7 +44,7 @@ public final class DatabaseDiscoveryRuleBuilder implements
SchemaRuleBuilder<Dat
realDataSourceMap.put(datasourceName,
dataSources.get(datasourceName));
}
}
- return new DatabaseDiscoveryRule(schemaName, realDataSourceMap,
config);
+ return new DatabaseDiscoveryRule(databaseName, realDataSourceMap,
config);
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/checker/AbstractEncryptRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/checker/AbstractEncryptRuleConfigurationChecker.java
index 4a167548a24..0241dc95542 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/checker/AbstractEncryptRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/checker/AbstractEncryptRuleConfigurationChecker.java
@@ -29,8 +29,8 @@ import
org.apache.shardingsphere.infra.config.checker.RuleConfigurationChecker;
public abstract class AbstractEncryptRuleConfigurationChecker<T extends
RuleConfiguration> implements RuleConfigurationChecker<T> {
@Override
- public final void check(final String schemaName, final T config) {
- Preconditions.checkState(!isEmptyEncryptors(config), "No available
encrypt rule configuration in schema `%s`.", schemaName);
+ public final void check(final String databaseName, final T config) {
+ Preconditions.checkState(!isEmptyEncryptors(config), "No available
encrypt rule configuration in database `%s`.", databaseName);
}
protected abstract boolean isEmptyEncryptors(T config);
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
index b2e879eb138..14d3c6b5d9a 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class AlgorithmProvidedEncryptRuleBuilder implements
SchemaRuleBuilder<AlgorithmProvidedEncryptRuleConfiguration> {
@Override
- public EncryptRule build(final AlgorithmProvidedEncryptRuleConfiguration
config, final String schemaName,
+ public EncryptRule build(final AlgorithmProvidedEncryptRuleConfiguration
config, final String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return new EncryptRule(config, dataSources);
}
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
index 097b87567f8..427fa16b508 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class EncryptRuleBuilder implements
SchemaRuleBuilder<EncryptRuleConfiguration> {
@Override
- public EncryptRule build(final EncryptRuleConfiguration config, final
String schemaName,
+ public EncryptRule build(final EncryptRuleConfiguration config, final
String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return new EncryptRule(config, dataSources);
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
index 8399c9e14e3..2fea469738f 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
@@ -32,14 +32,14 @@ import java.util.Collection;
public abstract class AbstractReadwriteSplittingRuleConfigurationChecker<T
extends RuleConfiguration> implements RuleConfigurationChecker<T> {
@Override
- public final void check(final String schemaName, final T config) {
- checkDataSources(schemaName, getDataSources(config));
+ public final void check(final String databaseName, final T config) {
+ checkDataSources(databaseName, getDataSources(config));
}
- private void checkDataSources(final String schemaName, final
Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources) {
+ private void checkDataSources(final String databaseName, final
Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources) {
dataSources.forEach(each -> {
- Preconditions.checkState(!each.getType().isEmpty(), "No available
readwrite-splitting rule configuration in schema `%s`.", schemaName);
- Preconditions.checkState(!each.getProps().isEmpty(), "No available
readwrite-splitting rule configuration in schema `%s`.", schemaName);
+ Preconditions.checkState(!each.getType().isEmpty(), "No available
readwrite-splitting rule configuration in database `%s`.", databaseName);
+ Preconditions.checkState(!each.getProps().isEmpty(), "No available
readwrite-splitting rule configuration in database `%s`.", databaseName);
});
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/AlgorithmProvidedReadwriteSplittingRuleBuilder.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/AlgorithmProvidedReadwriteSplittingRuleBuilder.java
index 8d6b1eecae0..d11627ec3ae 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/AlgorithmProvidedReadwriteSplittingRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/AlgorithmProvidedReadwriteSplittingRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class AlgorithmProvidedReadwriteSplittingRuleBuilder implements
SchemaRuleBuilder<AlgorithmProvidedReadwriteSplittingRuleConfiguration> {
@Override
- public ReadwriteSplittingRule build(final
AlgorithmProvidedReadwriteSplittingRuleConfiguration config, final String
schemaName,
+ public ReadwriteSplittingRule build(final
AlgorithmProvidedReadwriteSplittingRuleConfiguration config, final String
databaseName,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
ConfigurationProperties props) {
return new ReadwriteSplittingRule(config);
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
index b976cd0ee16..b18781b3288 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class ReadwriteSplittingRuleBuilder implements
SchemaRuleBuilder<ReadwriteSplittingRuleConfiguration> {
@Override
- public ReadwriteSplittingRule build(final
ReadwriteSplittingRuleConfiguration config, final String schemaName,
+ public ReadwriteSplittingRule build(final
ReadwriteSplittingRuleConfiguration config, final String databaseName,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
ConfigurationProperties props) {
return new ReadwriteSplittingRule(config);
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
index 9f5a2a76166..43545882870 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
@@ -39,7 +39,7 @@ import java.util.Set;
public abstract class AbstractShadowRuleConfigurationChecker<T extends
RuleConfiguration> implements RuleConfigurationChecker<T> {
@Override
- public final void check(final String schemaName, final T config) {
+ public final void check(final String databaseName, final T config) {
checkShadowRuleConfiguration(config);
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/AlgorithmProvidedShadowRuleBuilder.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/AlgorithmProvidedShadowRuleBuilder.java
index 72973151f53..72ec8edaeac 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/AlgorithmProvidedShadowRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/AlgorithmProvidedShadowRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class AlgorithmProvidedShadowRuleBuilder implements
SchemaRuleBuilder<AlgorithmProvidedShadowRuleConfiguration> {
@Override
- public ShadowRule build(final AlgorithmProvidedShadowRuleConfiguration
config, final String schemaName,
+ public ShadowRule build(final AlgorithmProvidedShadowRuleConfiguration
config, final String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return new ShadowRule(config);
}
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
index 8845e5ebb04..709d4bc9608 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
@@ -34,7 +34,7 @@ import java.util.Map;
public final class ShadowRuleBuilder implements
SchemaRuleBuilder<ShadowRuleConfiguration> {
@Override
- public ShadowRule build(final ShadowRuleConfiguration config, final String
schemaName,
+ public ShadowRule build(final ShadowRuleConfiguration config, final String
databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return new ShadowRule(config);
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/AbstractShardingRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/AbstractShardingRuleConfigurationChecker.java
index fd8f9ad9e3d..a165cb6fe42 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/AbstractShardingRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/checker/AbstractShardingRuleConfigurationChecker.java
@@ -29,8 +29,8 @@ import
org.apache.shardingsphere.infra.config.checker.RuleConfigurationChecker;
public abstract class AbstractShardingRuleConfigurationChecker<T extends
RuleConfiguration> implements RuleConfigurationChecker<T> {
@Override
- public final void check(final String schemaName, final T config) {
- Preconditions.checkState(hasAvailableTableConfigurations(config), "No
available sharding rule configurations in schema `%s`.", schemaName);
+ public final void check(final String databaseName, final T config) {
+ Preconditions.checkState(hasAvailableTableConfigurations(config), "No
available sharding rule configurations in database `%s`.", databaseName);
}
protected abstract boolean hasAvailableTableConfigurations(T config);
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
index 46c68dc7f61..594d93646ff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
@@ -35,7 +35,7 @@ import java.util.Map;
public final class AlgorithmProvidedShardingRuleBuilder implements
SchemaRuleBuilder<AlgorithmProvidedShardingRuleConfiguration> {
@Override
- public ShardingRule build(final AlgorithmProvidedShardingRuleConfiguration
config, final String schemaName,
+ public ShardingRule build(final AlgorithmProvidedShardingRuleConfiguration
config, final String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
Preconditions.checkArgument(null != dataSources &&
!dataSources.isEmpty(), "Data sources cannot be empty.");
return new ShardingRule(config, dataSources.keySet());
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
index 244f0b7f253..a6f5b3e1ace 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
@@ -35,7 +35,7 @@ import java.util.Map;
public final class ShardingRuleBuilder implements
SchemaRuleBuilder<ShardingRuleConfiguration> {
@Override
- public ShardingRule build(final ShardingRuleConfiguration config, final
String schemaName,
+ public ShardingRule build(final ShardingRuleConfiguration config, final
String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
Preconditions.checkArgument(null != dataSources &&
!dataSources.isEmpty(), "Data source names cannot be empty.");
return new ShardingRule(config, dataSources.keySet());
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationChecker.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationChecker.java
index 56c28424a9f..3f34aa6d744 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationChecker.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationChecker.java
@@ -30,8 +30,8 @@ public interface RuleConfigurationChecker<T extends
RuleConfiguration> extends O
/**
* Check rule configuration.
*
- * @param schemaName schema name to be checked
+ * @param databaseName database name to be checked
* @param config rule configuration to be checked
*/
- void check(String schemaName, T config);
+ void check(String databaseName, T config);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/schema/SchemaRuleBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/schema/SchemaRuleBuilder.java
index f405221d653..8c33f30bcdd 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/schema/SchemaRuleBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/builder/schema/SchemaRuleBuilder.java
@@ -38,11 +38,11 @@ public interface SchemaRuleBuilder<T extends
RuleConfiguration> extends RuleBuil
* Build schema rule.
*
* @param config rule configuration
- * @param schemaName schema name
+ * @param databaseName database name
* @param dataSources data sources
* @param builtRules built rules
* @param props configuration properties
* @return built schema rule
*/
- SchemaRule build(T config, String schemaName, Map<String, DataSource>
dataSources, Collection<ShardingSphereRule> builtRules, ConfigurationProperties
props);
+ SchemaRule build(T config, String databaseName, Map<String, DataSource>
dataSources, Collection<ShardingSphereRule> builtRules, ConfigurationProperties
props);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationCheckerFixture.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationCheckerFixture.java
index 8153eec51cf..adc74c93f95 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationCheckerFixture.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/checker/RuleConfigurationCheckerFixture.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.fixture.TestRuleConfiguration;
public final class RuleConfigurationCheckerFixture implements
RuleConfigurationChecker<TestRuleConfiguration> {
@Override
- public void check(final String schemaName, final TestRuleConfiguration
config) {
+ public void check(final String databaseName, final TestRuleConfiguration
config) {
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/TestShardingSphereRuleBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/TestShardingSphereRuleBuilder.java
index 6dcb499fe50..6336f5ad01c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/TestShardingSphereRuleBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/fixture/TestShardingSphereRuleBuilder.java
@@ -33,7 +33,7 @@ public final class TestShardingSphereRuleBuilder implements
SchemaRuleBuilder<Te
private static final SchemaRule RULE = new TestShardingSphereRule();
@Override
- public SchemaRule build(final TestRuleConfiguration config, final String
schemaName,
+ public SchemaRule build(final TestRuleConfiguration config, final String
databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return RULE;
}
diff --git
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/builder/SingleTableRuleBuilder.java
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/builder/SingleTableRuleBuilder.java
index 113a0fb12e5..76e0230a412 100644
---
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/builder/SingleTableRuleBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/builder/SingleTableRuleBuilder.java
@@ -35,7 +35,7 @@ import java.util.Map;
public final class SingleTableRuleBuilder implements
SchemaRuleBuilder<SingleTableRuleConfiguration> {
@Override
- public SingleTableRule build(final SingleTableRuleConfiguration config,
final String schemaName,
+ public SingleTableRule build(final SingleTableRuleConfiguration config,
final String databaseName,
final Map<String, DataSource> dataSources,
final Collection<ShardingSphereRule> builtRules, final ConfigurationProperties
props) {
return new SingleTableRule(config,
DatabaseTypeRecognizer.getDatabaseType(dataSources.values()), dataSources,
builtRules, props);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/fixture/FixtureRuleBuilder.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/fixture/FixtureRuleBuilder.java
index 245a486d3a2..f2a27d7da68 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/fixture/FixtureRuleBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/fixture/FixtureRuleBuilder.java
@@ -28,7 +28,7 @@ import java.util.Map;
public final class FixtureRuleBuilder implements
SchemaRuleBuilder<FixtureRuleConfiguration> {
@Override
- public FixtureRule build(final FixtureRuleConfiguration config, final
String schemaName,
+ public FixtureRule build(final FixtureRuleConfiguration config, final
String databaseName,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final ConfigurationProperties props)
{
return new FixtureRule();
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
index 86663f52411..b2385bc4320 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.config.checker.RuleConfigurationChecker;
public final class RuleConfigurationFixtureChecker implements
RuleConfigurationChecker<RuleConfigurationFixture> {
@Override
- public void check(final String schemaName, final RuleConfigurationFixture
config) {
+ public void check(final String databaseName, final
RuleConfigurationFixture config) {
}
@Override
diff --git
a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
index 455413789a8..ee10ff6a547 100644
---
a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.config.checker.RuleConfigurationChecker;
public final class TestRuleConfigurationChecker implements
RuleConfigurationChecker<TestRuleConfiguration> {
@Override
- public void check(final String schemaName, final TestRuleConfiguration
config) {
+ public void check(final String databaseName, final TestRuleConfiguration
config) {
}
@Override
