This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 ee22317d15e Rename ContextManager.dropResources (#18982)
ee22317d15e is described below
commit ee22317d15e799f0d1d5e286da5567fca339fd11
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 10 05:22:17 2022 +0800
Rename ContextManager.dropResources (#18982)
---
.../java/org/apache/shardingsphere/mode/manager/ContextManager.java | 4 ++--
.../org/apache/shardingsphere/mode/manager/ContextManagerTest.java | 4 ++--
.../ral/common/updatable/ImportDatabaseConfigurationHandler.java | 2 +-
.../text/distsql/rdl/resource/DropResourceBackendHandler.java | 2 +-
.../text/distsql/rdl/resource/DropResourceBackendHandlerTest.java | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 3df16d5cba8..9a7151e37d1 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -212,12 +212,12 @@ public final class ContextManager implements
AutoCloseable {
}
/**
- * Drop resource.
+ * Drop resources.
*
* @param databaseName database name
* @param toBeDroppedResourceNames to be dropped resource names
*/
- public synchronized void dropResource(final String databaseName, final
Collection<String> toBeDroppedResourceNames) {
+ public synchronized void dropResources(final String databaseName, final
Collection<String> toBeDroppedResourceNames) {
Map<String, DataSource> dataSourceMap =
metaDataContexts.getMetaData().getDatabases().get(databaseName).getResource().getDataSources();
// TODO should check to be dropped resources are unused here.
ContextManager is atomic domain to maintain metadata, not Dist SQL handler
for (String each : toBeDroppedResourceNames) {
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index cfadd007ba8..def2ea9a02c 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -165,9 +165,9 @@ public final class ContextManagerTest {
}
@Test
- public void assertDropResource() {
+ public void assertDropResources() {
when(metaDataContexts.getMetaData().getDatabases().get("foo_db").getResource().getDataSources()).thenReturn(new
HashMap<>(Collections.singletonMap("foo_ds", new MockedDataSource())));
- contextManager.dropResource("foo_db", Collections.singleton("foo_ds"));
+ contextManager.dropResources("foo_db",
Collections.singleton("foo_ds"));
assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabases().get("foo_db").getResource().getDataSources().isEmpty());
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
index 31aa9d4f073..285f13142d6 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
@@ -120,7 +120,7 @@ public final class ImportDatabaseConfigurationHandler
extends UpdatableRALBacken
Collection<String> toBeDroppedResourceNames =
currentResourceNames.stream().filter(each ->
!toBeUpdatedResourcePropsMap.containsKey(each)).collect(Collectors.toSet());
ProxyContext.getInstance().getContextManager().updateResources(databaseName,
toBeUpdatedResourcePropsMap);
if (!toBeDroppedResourceNames.isEmpty()) {
-
ProxyContext.getInstance().getContextManager().dropResource(databaseName,
toBeDroppedResourceNames);
+
ProxyContext.getInstance().getContextManager().dropResources(databaseName,
toBeDroppedResourceNames);
}
} catch (final SQLException ex) {
throw new
InvalidResourcesException(toBeUpdatedResourcePropsMap.keySet());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
index c7341accb53..7a494ebf887 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
@@ -53,7 +53,7 @@ public final class DropResourceBackendHandler extends
DatabaseRequiredBackendHan
public ResponseHeader execute(final String databaseName, final
DropResourceStatement sqlStatement) throws DistSQLException {
Collection<String> toBeDroppedResourceNames = sqlStatement.getNames();
check(databaseName, toBeDroppedResourceNames,
sqlStatement.isIgnoreSingleTables(), sqlStatement.isIfExists());
-
ProxyContext.getInstance().getContextManager().dropResource(databaseName,
toBeDroppedResourceNames);
+
ProxyContext.getInstance().getContextManager().dropResources(databaseName,
toBeDroppedResourceNames);
return new UpdateResponseHeader(sqlStatement);
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandlerTest.java
index c7099ad4d27..cfd3622baa8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandlerTest.java
@@ -98,7 +98,7 @@ public final class DropResourceBackendHandlerTest extends
ProxyContextRestorer {
when(resource.getDataSources()).thenReturn(Collections.singletonMap("foo_ds",
dataSource));
DropResourceStatement dropResourceStatement = new
DropResourceStatement(Collections.singleton("foo_ds"), false);
assertThat(dropResourceBackendHandler.execute("test",
dropResourceStatement), instanceOf(UpdateResponseHeader.class));
- verify(contextManager).dropResource("test",
dropResourceStatement.getNames());
+ verify(contextManager).dropResources("test",
dropResourceStatement.getNames());
}
@Test
@@ -148,14 +148,14 @@ public final class DropResourceBackendHandlerTest extends
ProxyContextRestorer {
when(resource.getDataSources()).thenReturn(Collections.singletonMap("foo_ds",
dataSource));
DropResourceStatement dropResourceStatement = new
DropResourceStatement(Collections.singleton("foo_ds"), true);
assertThat(dropResourceBackendHandler.execute("test",
dropResourceStatement), instanceOf(UpdateResponseHeader.class));
- verify(contextManager).dropResource("test",
dropResourceStatement.getNames());
+ verify(contextManager).dropResources("test",
dropResourceStatement.getNames());
}
@Test
public void assertExecuteWithIfExists() throws DistSQLException {
DropResourceStatement dropResourceStatement = new
DropResourceStatement(true, Collections.singleton("foo_ds"), true);
assertThat(dropResourceBackendHandler.execute("test",
dropResourceStatement), instanceOf(UpdateResponseHeader.class));
- verify(contextManager).dropResource("test",
dropResourceStatement.getNames());
+ verify(contextManager).dropResources("test",
dropResourceStatement.getNames());
}
@Test(expected = DistSQLException.class)
