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 2023/06/28 13:22:44 UTC
[shardingsphere] branch master updated: Refactor drop database for new metadata (#26674)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 947c152ea47 Refactor drop database for new metadata (#26674)
947c152ea47 is described below
commit 947c152ea47e93b7bc51b5001ca8f9b18792383d
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Wed Jun 28 21:22:38 2023 +0800
Refactor drop database for new metadata (#26674)
* Refactor drop database for new metadata
* Fix checkstyle
---
.../mode/manager/cluster/NewClusterModeContextManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterModeContextManager.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterModeContextManager.java
index c0a550d98d5..499a232383a 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterModeContextManager.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterModeContextManager.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.mode.manager.cluster;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
-import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
@@ -58,9 +57,8 @@ public final class NewClusterModeContextManager implements ModeContextManager, C
@Override
public void dropDatabase(final String databaseName) {
- ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName);
// TODO Avoid drop database to generate child node events
- database.getRuleMetaData().getConfigurations().forEach(each -> removeRuleConfiguration(databaseName, each));
+ contextManager.getMetaDataContexts().getMetaData().dropDatabase(databaseName);
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService().dropDatabase(databaseName);
}