This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 c02d799df40 Rename `resource` to `data source` (#23373)
c02d799df40 is described below
commit c02d799df40fdb6c25300a4d141b2c570ec625a3
Author: Zichao <[email protected]>
AuthorDate: Fri Jan 6 21:47:48 2023 +1300
Rename `resource` to `data source` (#23373)
---
...AlterDatabaseDiscoveryRuleStatementUpdater.java | 10 ++++----
...reateDatabaseDiscoveryRuleStatementUpdater.java | 12 +++++-----
...rDatabaseDiscoveryRuleStatementUpdaterTest.java | 2 +-
...eDatabaseDiscoveryRuleStatementUpdaterTest.java | 2 +-
.../ReadwriteSplittingRuleStatementChecker.java | 2 +-
...ReadwriteSplittingRuleStatementUpdaterTest.java | 2 +-
...ReadwriteSplittingRuleStatementUpdaterTest.java | 2 +-
.../checker/ShadowRuleStatementChecker.java | 2 +-
.../AlterShadowRuleStatementUpdaterTest.java | 2 +-
.../CreateShadowRuleStatementUpdaterTest.java | 2 +-
.../checker/ShardingTableRuleStatementChecker.java | 28 +++++++++++-----------
.../resource/ShardingSphereResourceMetaData.java | 2 +-
...aseDiscoveryRuleConfigurationImportChecker.java | 2 +-
...iteSplittingRuleConfigurationImportChecker.java | 2 +-
.../ShadowRuleConfigurationImportChecker.java | 2 +-
.../ShardingRuleConfigurationImportChecker.java | 2 +-
...SplittingStorageUnitStatusStatementHandler.java | 2 +-
.../DatabaseOperateBackendHandlerFactoryTest.java | 2 +-
.../distsql/DistSQLBackendHandlerFactoryTest.java | 2 +-
...iscoveryRuleConfigurationImportCheckerTest.java | 4 ++--
...plittingRuleConfigurationImportCheckerTest.java | 4 ++--
...ShardingRuleConfigurationImportCheckerTest.java | 4 ++--
22 files changed, 47 insertions(+), 47 deletions(-)
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
index 777ea1d6422..3f3b48b8513 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdater.java
@@ -54,7 +54,7 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdater
implements RuleDef
String databaseName = database.getName();
checkCurrentRuleConfiguration(databaseName, currentRuleConfig);
checkToBeAlteredRules(databaseName, sqlStatement, currentRuleConfig);
- checkToBeAlteredResources(databaseName, sqlStatement,
database.getResourceMetaData());
+ checkToBeAlteredDataSources(databaseName, sqlStatement,
database.getResourceMetaData());
checkDiscoverTypeAndHeartbeat(sqlStatement);
}
@@ -73,12 +73,12 @@ public final class
AlterDatabaseDiscoveryRuleStatementUpdater implements RuleDef
return
sqlStatement.getRules().stream().map(AbstractDatabaseDiscoverySegment::getName).collect(Collectors.toList());
}
- private void checkToBeAlteredResources(final String databaseName, final
AlterDatabaseDiscoveryRuleStatement sqlStatement, final
ShardingSphereResourceMetaData resourceMetaData) {
- Collection<String> notExistedResources =
resourceMetaData.getNotExistedResources(getToBeAlteredResourceNames(sqlStatement));
- ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
notExistedResources));
+ private void checkToBeAlteredDataSources(final String databaseName, final
AlterDatabaseDiscoveryRuleStatement sqlStatement, final
ShardingSphereResourceMetaData resourceMetaData) {
+ Collection<String> notExistedDataSources =
resourceMetaData.getNotExistedDataSources(getToBeAlteredDataSourceNames(sqlStatement));
+
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
}
- private Collection<String> getToBeAlteredResourceNames(final
AlterDatabaseDiscoveryRuleStatement sqlStatement) {
+ private Collection<String> getToBeAlteredDataSourceNames(final
AlterDatabaseDiscoveryRuleStatement sqlStatement) {
Collection<String> result = new LinkedHashSet<>();
sqlStatement.getRules().forEach(each ->
result.addAll(each.getDataSources()));
return result;
diff --git
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
index 76259fcbab9..f03ec598b1e 100644
---
a/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
+++
b/features/db-discovery/distsql/handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdater.java
@@ -50,7 +50,7 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
public void checkSQLStatement(final ShardingSphereDatabase database, final
CreateDatabaseDiscoveryRuleStatement sqlStatement, final
DatabaseDiscoveryRuleConfiguration currentRuleConfig) {
String databaseName = database.getName();
checkDuplicatedRuleNames(databaseName, sqlStatement,
currentRuleConfig);
- checkResources(databaseName, sqlStatement,
database.getResourceMetaData());
+ checkDataSources(databaseName, sqlStatement,
database.getResourceMetaData());
checkDiscoverTypeAndHeartbeat(sqlStatement);
}
@@ -98,11 +98,11 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdater implements RuleDe
return
sqlStatement.getRules().stream().map(AbstractDatabaseDiscoverySegment::getName).filter(currentRuleNames::contains).collect(Collectors.toSet());
}
- private void checkResources(final String databaseName, final
CreateDatabaseDiscoveryRuleStatement sqlStatement, final
ShardingSphereResourceMetaData resourceMetaData) {
- Collection<String> resources = new LinkedHashSet<>();
- sqlStatement.getRules().forEach(each ->
resources.addAll(each.getDataSources()));
- Collection<String> notExistedResources =
resourceMetaData.getNotExistedResources(resources);
- ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
notExistedResources));
+ private void checkDataSources(final String databaseName, final
CreateDatabaseDiscoveryRuleStatement sqlStatement, final
ShardingSphereResourceMetaData resourceMetaData) {
+ Collection<String> dataSources = new LinkedHashSet<>();
+ sqlStatement.getRules().forEach(each ->
dataSources.addAll(each.getDataSources()));
+ Collection<String> notExistedDataSources =
resourceMetaData.getNotExistedDataSources(dataSources);
+
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
}
private void checkDiscoverTypeAndHeartbeat(final
CreateDatabaseDiscoveryRuleStatement sqlStatement) {
diff --git
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
index c6ff5cd9807..d8e3b3274fc 100644
---
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
+++
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -79,7 +79,7 @@ public final class
AlterDatabaseDiscoveryRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertCheckSQLStatementWithoutExistedResources() {
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(Collections.singleton("ds0"));
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(Collections.singleton("ds0"));
Properties props = new Properties();
DatabaseDiscoveryDefinitionSegment segment =
new DatabaseDiscoveryDefinitionSegment("readwrite_ds",
Arrays.asList("ds_read_0", "ds_read_1"), new AlgorithmSegment("MySQL.MGR",
props), props);
diff --git
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
index e5b457842f5..73ddc1a3531 100644
---
a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
+++
b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/CreateDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -78,7 +78,7 @@ public final class
CreateDatabaseDiscoveryRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertCheckSQLStatementWithoutExistedResources() {
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(Collections.singleton("ds_read_0"));
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(Collections.singleton("ds_read_0"));
Properties props = new Properties();
DatabaseDiscoveryDefinitionSegment segment =
new DatabaseDiscoveryDefinitionSegment("readwrite_ds",
Arrays.asList("ds_read_0", "ds_read_1"), new AlgorithmSegment("MySQL.MGR",
props), props);
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java
index 37dee289c62..46b0e60caa2 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java
@@ -151,7 +151,7 @@ public final class ReadwriteSplittingRuleStatementChecker {
requiredLogicalDataSources.add(each.getAutoAwareResource());
}
});
- Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedResources(requiredDataSources);
+ Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedDataSources(requiredDataSources);
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
Collection<String> logicalDataSources = getLogicDataSources(database);
Collection<String> notExistedLogicalDataSources =
requiredLogicalDataSources.stream().filter(each ->
!logicalDataSources.contains(each)).collect(Collectors.toSet());
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
index 580f206317a..6faaba6c994 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
+++
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java
@@ -76,7 +76,7 @@ public final class
AlterReadwriteSplittingRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertCheckSQLStatementWithoutExistedResources() {
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(Collections.singleton("read_ds_0"));
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(Collections.singleton("read_ds_0"));
updater.checkSQLStatement(database, createSQLStatement("TEST"),
createCurrentRuleConfiguration());
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
index 0190bd9ef57..bb625de3a79 100644
---
a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
+++
b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
@@ -86,7 +86,7 @@ public final class
CreateReadwriteSplittingRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertCheckSQLStatementWithoutExistedResources() {
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(Arrays.asList("read_ds_0",
"read_ds_1"));
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(Arrays.asList("read_ds_0",
"read_ds_1"));
updater.checkSQLStatement(database, createSQLStatement("TEST"), null);
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java
index 8eccf2d717a..150c0792920 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/checker/ShadowRuleStatementChecker.java
@@ -54,7 +54,7 @@ public class ShadowRuleStatementChecker {
* @param database database
*/
public static void checkStorageUnitsExist(final Collection<String>
requiredStorageUnits, final ShardingSphereDatabase database) {
- Collection<String> notExistedStorageUnits =
database.getResourceMetaData().getNotExistedResources(requiredStorageUnits);
+ Collection<String> notExistedStorageUnits =
database.getResourceMetaData().getNotExistedDataSources(requiredStorageUnits);
ShardingSpherePreconditions.checkState(notExistedStorageUnits.isEmpty(), () ->
new MissingRequiredStorageUnitsException(database.getName(),
notExistedStorageUnits));
}
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java
index 27376bb4b8a..ca2cf95cdb3 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java
@@ -93,7 +93,7 @@ public final class AlterShadowRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertExecuteWithNotExistResource() {
List<String> dataSources = Arrays.asList("ds", "ds0");
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(dataSources);
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(dataSources);
AlterShadowRuleStatement sqlStatement = createSQLStatement(new
ShadowRuleSegment("initRuleName1", "ds3", null, null));
updater.checkSQLStatement(database, sqlStatement, currentConfig);
}
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java
index bf5248ffb5c..a84a5175b9c 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java
@@ -80,7 +80,7 @@ public final class CreateShadowRuleStatementUpdaterTest {
@Test(expected = MissingRequiredStorageUnitsException.class)
public void assertExecuteWithNotExistResource() {
-
when(resourceMetaData.getNotExistedResources(any())).thenReturn(Arrays.asList("ds0",
"ds1"));
+
when(resourceMetaData.getNotExistedDataSources(any())).thenReturn(Arrays.asList("ds0",
"ds1"));
CreateShadowRuleStatement sqlStatement = createSQLStatement(false, new
ShadowRuleSegment("ruleName", "ds1", null, null));
updater.checkSQLStatement(database, sqlStatement, currentConfig);
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
index 785ab08d73b..8a5120e87bc 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
@@ -119,8 +119,8 @@ public final class ShardingTableRuleStatementChecker {
public static boolean isValidBindingTableGroups(final
Collection<ShardingTableReferenceRuleConfiguration> bindingTableGroups, final
ShardingRuleConfiguration currentRuleConfig) {
ShardingRuleConfiguration toBeCheckedRuleConfig =
createToBeCheckedShardingRuleConfiguration(currentRuleConfig);
toBeCheckedRuleConfig.setBindingTableGroups(bindingTableGroups);
- Collection<String> dataSourceNames =
getRequiredResource(toBeCheckedRuleConfig);
- dataSourceNames.addAll(getRequiredResource(currentRuleConfig));
+ Collection<String> dataSourceNames =
getRequiredDataSource(toBeCheckedRuleConfig);
+ dataSourceNames.addAll(getRequiredDataSource(currentRuleConfig));
return check(toBeCheckedRuleConfig, dataSourceNames);
}
@@ -128,7 +128,7 @@ public final class ShardingTableRuleStatementChecker {
final boolean isCreated) {
String databaseName = database.getName();
checkTables(databaseName, rules, currentRuleConfig, isCreated,
ifNotExists);
- checkResources(databaseName, rules, database);
+ checkDataSources(databaseName, rules, database);
checkKeyGenerators(rules, currentRuleConfig);
checkAuditors(rules);
Map<String, List<AbstractTableRuleSegment>> groupedTableRule =
groupingByClassType(rules);
@@ -157,20 +157,20 @@ public final class ShardingTableRuleStatementChecker {
defaultDatabaseShardingStrategyConfig,
defaultTableShardingStrategyConfig, checkedConfig.getDefaultShardingColumn()));
}
- private static void checkResources(final String databaseName, final
Collection<AbstractTableRuleSegment> rules, final ShardingSphereDatabase
database) {
- Collection<String> requiredResource = getRequiredResources(rules);
- Collection<String> notExistedResources =
database.getResourceMetaData().getNotExistedResources(requiredResource);
- Collection<String> logicResources = getLogicResources(database);
- notExistedResources.removeIf(logicResources::contains);
- ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
notExistedResources));
+ private static void checkDataSources(final String databaseName, final
Collection<AbstractTableRuleSegment> rules, final ShardingSphereDatabase
database) {
+ Collection<String> requiredDataSource = getRequiredDataSources(rules);
+ Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedDataSources(requiredDataSource);
+ Collection<String> logicDataSources = getLogicDataSources(database);
+ notExistedDataSources.removeIf(logicDataSources::contains);
+
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
}
- private static Collection<String> getLogicResources(final
ShardingSphereDatabase database) {
+ private static Collection<String> getLogicDataSources(final
ShardingSphereDatabase database) {
return database.getRuleMetaData().getRules().stream().filter(each ->
each instanceof DataSourceContainedRule)
.map(each -> ((DataSourceContainedRule)
each).getDataSourceMapper().keySet()).flatMap(Collection::stream).collect(Collectors.toCollection(LinkedHashSet::new));
}
- private static Collection<String> getRequiredResources(final
Collection<AbstractTableRuleSegment> rules) {
+ private static Collection<String> getRequiredDataSources(final
Collection<AbstractTableRuleSegment> rules) {
return
rules.stream().map(AbstractTableRuleSegment::getDataSourceNodes).flatMap(Collection::stream)
.map(ShardingTableRuleStatementChecker::parseDateSource).map(ShardingTableRuleStatementChecker::getDataSourceNames).flatMap(Collection::stream).collect(Collectors.toList());
}
@@ -362,8 +362,8 @@ public final class ShardingTableRuleStatementChecker {
ShardingRuleConfiguration toBeCheckedRuleConfig =
createToBeCheckedShardingRuleConfiguration(currentRuleConfig);
removeRuleConfiguration(toBeCheckedRuleConfig, toBeAlteredRuleConfig);
addRuleConfiguration(toBeCheckedRuleConfig, toBeAlteredRuleConfig);
- Collection<String> dataSourceNames =
getRequiredResource(toBeCheckedRuleConfig);
- dataSourceNames.addAll(getRequiredResource(toBeAlteredRuleConfig));
+ Collection<String> dataSourceNames =
getRequiredDataSource(toBeCheckedRuleConfig);
+ dataSourceNames.addAll(getRequiredDataSource(toBeAlteredRuleConfig));
ShardingSpherePreconditions.checkState(check(toBeCheckedRuleConfig,
dataSourceNames),
() -> new InvalidRuleConfigurationException("sharding table",
toBeAlteredLogicTableNames, Collections.singleton("invalid binding table
configuration.")));
}
@@ -384,7 +384,7 @@ public final class ShardingTableRuleStatementChecker {
return result;
}
- private static Collection<String> getRequiredResource(final
ShardingRuleConfiguration config) {
+ private static Collection<String> getRequiredDataSource(final
ShardingRuleConfiguration config) {
Collection<String> result = new LinkedHashSet<>();
result.addAll(config.getAutoTables().stream().map(ShardingAutoTableRuleConfiguration::getActualDataSources)
.map(each ->
Splitter.on(",").trimResults().splitToList(each)).flatMap(Collection::stream).collect(Collectors.toSet()));
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceMetaData.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceMetaData.java
index 4df73b12a26..387dfb40842 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceMetaData.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResourceMetaData.java
@@ -118,7 +118,7 @@ public final class ShardingSphereResourceMetaData {
* @param resourceNames resource names to be judged
* @return not existed resource names
*/
- public Collection<String> getNotExistedResources(final Collection<String>
resourceNames) {
+ public Collection<String> getNotExistedDataSources(final
Collection<String> resourceNames) {
return resourceNames.stream().filter(each ->
!dataSources.containsKey(each)).collect(Collectors.toSet());
}
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
index de4b46b45d6..fa9c8abdee9 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DatabaseDiscoveryRuleConfigurationImportChecker.java
@@ -56,7 +56,7 @@ public final class
DatabaseDiscoveryRuleConfigurationImportChecker {
private void checkDataSources(final String databaseName, final
ShardingSphereDatabase database, final DatabaseDiscoveryRuleConfiguration
currentRuleConfig) {
Collection<String> requiredDataSources = new LinkedHashSet<>();
currentRuleConfig.getDataSources().forEach(each ->
requiredDataSources.addAll(each.getDataSourceNames()));
- Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedResources(requiredDataSources);
+ Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedDataSources(requiredDataSources);
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
}
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
index 3ebeb38271b..a7eb20d0f16 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
@@ -67,7 +67,7 @@ public final class
ReadwriteSplittingRuleConfigurationImportChecker {
}
}
});
- Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedResources(requiredDataSources);
+ Collection<String> notExistedDataSources =
database.getResourceMetaData().getNotExistedDataSources(requiredDataSources);
ShardingSpherePreconditions.checkState(notExistedDataSources.isEmpty(), () ->
new MissingRequiredStorageUnitsException(databaseName, notExistedDataSources));
Collection<String> logicalDataSources = getLogicDataSources(database);
Collection<String> notExistedLogicalDataSources =
requiredLogicalDataSources.stream().filter(each ->
!logicalDataSources.contains(each)).collect(Collectors.toSet());
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShadowRuleConfigurationImportChecker.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShadowRuleConfigurationImportChecker.java
index 22d0259d754..effdf303162 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShadowRuleConfigurationImportChecker.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShadowRuleConfigurationImportChecker.java
@@ -56,7 +56,7 @@ public final class ShadowRuleConfigurationImportChecker {
private void checkDataSources(final String databaseName, final
ShardingSphereDatabase database, final ShadowRuleConfiguration
currentRuleConfig) {
Collection<String> requiredResource =
getRequiredResources(currentRuleConfig);
- Collection<String> notExistedResources =
database.getResourceMetaData().getNotExistedResources(requiredResource);
+ Collection<String> notExistedResources =
database.getResourceMetaData().getNotExistedDataSources(requiredResource);
Collection<String> logicResources = getLogicDataSources(database);
notExistedResources.removeIf(logicResources::contains);
ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
notExistedResources));
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
index d78f1785029..a75715e08d9 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
@@ -121,7 +121,7 @@ public final class ShardingRuleConfigurationImportChecker {
private void checkResources(final String databaseName, final
ShardingSphereDatabase database, final ShardingRuleConfiguration
currentRuleConfig) {
Collection<String> requiredResource =
getRequiredResources(currentRuleConfig);
- Collection<String> notExistedResources =
database.getResourceMetaData().getNotExistedResources(requiredResource);
+ Collection<String> notExistedResources =
database.getResourceMetaData().getNotExistedDataSources(requiredResource);
Collection<String> logicResources = getLogicResources(database);
notExistedResources.removeIf(logicResources::contains);
ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
notExistedResources));
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
index 863a6bdea46..67a25c3d807 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementHandler.java
@@ -134,7 +134,7 @@ public final class
AlterReadwriteSplittingStorageUnitStatusStatementHandler exte
private void checkResourceExists(final ContextManager contextManager,
final String databaseName, final String toBeDisabledResource) {
Collection<String> notExistedResources = contextManager
-
.getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getNotExistedResources(Collections.singleton(toBeDisabledResource));
+
.getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getNotExistedDataSources(Collections.singleton(toBeDisabledResource));
ShardingSpherePreconditions.checkState(notExistedResources.isEmpty(),
() -> new MissingRequiredStorageUnitsException(databaseName,
Collections.singleton(toBeDisabledResource)));
}
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
index 292e9ccfcd7..1e5acee6765 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
@@ -154,7 +154,7 @@ public final class DatabaseOperateBackendHandlerFactoryTest
extends ProxyContext
private MetaDataContexts mockMetaDataContexts() {
MetaDataContexts result =
ProxyContext.getInstance().getContextManager().getMetaDataContexts();
when(result.getMetaData().getDatabase("db").getResourceMetaData().getDataSources()).thenReturn(Collections.emptyMap());
-
when(result.getMetaData().getDatabase("db").getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+
when(result.getMetaData().getDatabase("db").getResourceMetaData().getNotExistedDataSources(any())).thenReturn(Collections.emptyList());
return result;
}
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
index 82a39fed460..ce4f52acf58 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -100,7 +100,7 @@ public final class DistSQLBackendHandlerFactoryTest extends
ProxyContextRestorer
private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(result.getResourceMetaData().getDataSources()).thenReturn(Collections.emptyMap());
-
when(result.getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+
when(result.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(Collections.emptyList());
when(result.getRuleMetaData()).thenReturn(new
ShardingSphereRuleMetaData(Collections.emptyList()));
return result;
}
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DBDiscoveryRuleConfigurationImportCheckerTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DBDiscoveryRuleConfigurationImportCheckerTest.java
index 2f3f9bfe161..655889283ab 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DBDiscoveryRuleConfigurationImportCheckerTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/DBDiscoveryRuleConfigurationImportCheckerTest.java
@@ -68,7 +68,7 @@ public final class
DBDiscoveryRuleConfigurationImportCheckerTest {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
Collection<String> dataSources = new LinkedList<>();
dataSources.add("su_1");
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(dataSources);
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(dataSources);
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
@@ -85,7 +85,7 @@ public final class
DBDiscoveryRuleConfigurationImportCheckerTest {
private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportCheckerTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportCheckerTest.java
index be81102e287..70c80e15f0c 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportCheckerTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportCheckerTest.java
@@ -60,7 +60,7 @@ public final class
ReadwriteSplittingRuleConfigurationImportCheckerTest {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
Collection<String> dataSources = new LinkedList<>();
dataSources.add("su_1");
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(dataSources);
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(dataSources);
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
@@ -76,7 +76,7 @@ public final class
ReadwriteSplittingRuleConfigurationImportCheckerTest {
private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportCheckerTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportCheckerTest.java
index 087d6334cd5..f7a4911140c 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportCheckerTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportCheckerTest.java
@@ -79,14 +79,14 @@ public final class
ShardingRuleConfigurationImportCheckerTest {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
Collection<String> dataSources = new LinkedList<>();
dataSources.add("su_1");
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(dataSources);
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(dataSources);
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
private ShardingSphereDatabase mockDatabase() {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
-
when(database.getResourceMetaData().getNotExistedResources(any())).thenReturn(Collections.emptyList());
+
when(database.getResourceMetaData().getNotExistedDataSources(any())).thenReturn(Collections.emptyList());
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return database;
}
