(shardingsphere) branch master updated: Refactor ClusterModeContextManager (#30556)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 d55e77f83a3 Refactor ClusterModeContextManager (#30556)
d55e77f83a3 is described below

commit d55e77f83a3b56af9896beb735614f76381a6bf1
Author: zhaojinchao <zhaojinc...@apache.org>
AuthorDate: Wed Mar 20 15:42:34 2024 +0800

    Refactor ClusterModeContextManager (#30556)
---
 .../shardingsphere/mode/manager/cluster/ClusterModeContextManager.java | 2 --
 .../test/it/data/pipeline/core/util/PipelineContextUtils.java          | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
index 3fa8e85019e..0ca8b9af456 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -55,8 +55,6 @@ public final class ClusterModeContextManager implements 
ModeContextManager, Cont
     
     @Override
     public void dropDatabase(final String databaseName) {
-        // TODO Avoid drop database to generate child node events
-        
contextManager.getMetaDataContexts().getMetaData().dropDatabase(databaseName);
         
contextManager.getMetaDataContexts().getPersistService().getDatabaseMetaDataService().dropDatabase(databaseName);
     }
     
diff --git 
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
 
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index 584725cb46b..a1b26cb3414 100644
--- 
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
+++ 
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -106,8 +106,7 @@ public final class PipelineContextUtils {
         ModeConfiguration modeConfig = new 
YamlModeConfigurationSwapper().swapToObject(rootConfig.getMode());
         ContextManager contextManager = getContextManager(rootConfig);
         ClusterPersistRepository persistRepository = 
getClusterPersistRepository((ClusterPersistRepositoryConfiguration) 
modeConfig.getRepository());
-        MetaDataBasedPersistService persistService = 
"Cluster".equals(modeConfig.getType()) ? new 
MetaDataPersistService(persistRepository) : new 
MetaDataPersistService(persistRepository);
-        MetaDataContexts metaDataContexts = 
renewMetaDataContexts(contextManager.getMetaDataContexts(), persistService);
+        MetaDataContexts metaDataContexts = 
renewMetaDataContexts(contextManager.getMetaDataContexts(), new 
MetaDataPersistService(persistRepository));
         PipelineContext pipelineContext = new PipelineContext(modeConfig, new 
ContextManager(metaDataContexts, contextManager.getInstanceContext()));
         PipelineContextManager.putContext(contextKey, pipelineContext);
     }