You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/01/25 12:44:25 UTC
(shardingsphere) branch master updated: Refactor MetaDataManagerPersistService.dropDatabase (#34494)
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 5d6fe11fc41 Refactor MetaDataManagerPersistService.dropDatabase (#34494)
5d6fe11fc41 is described below
commit 5d6fe11fc417823007bddfe3f199ef87281a45b8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Jan 25 20:44:18 2025 +0800
Refactor MetaDataManagerPersistService.dropDatabase (#34494)
---
.../persist/service/ClusterMetaDataManagerPersistService.java | 5 ++---
.../proxy/backend/handler/database/DropDatabaseBackendHandler.java | 3 ++-
.../proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 0ab5a9a5c44..96c8080896e 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -78,9 +78,8 @@ public final class ClusterMetaDataManagerPersistService implements MetaDataManag
@Override
public void dropDatabase(final String databaseName) {
- String droppedDatabaseName = metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
- clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName, ClusterDatabaseListenerCoordinatorType.DROP);
- metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(droppedDatabaseName);
+ clusterDatabaseListenerPersistCoordinator.persist(databaseName, ClusterDatabaseListenerCoordinatorType.DROP);
+ metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(databaseName);
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
index 3d80f30a58e..c6de2b3f49a 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
@@ -54,7 +54,8 @@ public final class DropDatabaseBackendHandler implements ProxyBackendHandler {
connectionSession.setCurrentDatabaseName(null);
}
if (ProxyContext.getInstance().databaseExists(sqlStatement.getDatabaseName())) {
- ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getMetaDataManagerPersistService().dropDatabase(sqlStatement.getDatabaseName());
+ String databaseName = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(sqlStatement.getDatabaseName()).getName();
+ ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getMetaDataManagerPersistService().dropDatabase(databaseName);
}
return new UpdateResponseHeader(sqlStatement);
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
index fc7b328ee1a..2e99c22e0f9 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
@@ -86,7 +86,7 @@ public final class YamlDatabaseConfigurationImportExecutor {
importDataSources(databaseName, yamlConfig.getDataSources());
importRules(databaseName, yamlConfig.getRules());
} catch (final ShardingSphereSQLException ex) {
- dropDatabase(databaseName);
+ dropDatabase(contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName());
throw ex;
}
}
@@ -161,7 +161,7 @@ public final class YamlDatabaseConfigurationImportExecutor {
return result;
}
- private void dropDatabase(final String databaseName) throws SQLException {
+ private void dropDatabase(final String databaseName) {
contextManager.getPersistServiceFacade().getMetaDataManagerPersistService().dropDatabase(databaseName);
}
}