(shardingsphere) branch master updated: Refactor ClusterContextManagerBuilder and StandaloneContextManagerBuilder (#35032)

[zhangliang]

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 d20328ee880 Refactor ClusterContextManagerBuilder and 
StandaloneContextManagerBuilder (#35032)
d20328ee880 is described below

commit d20328ee880aa491b39a4794abead7ef1f1a95d7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Mar 19 00:12:50 2025 +0800

    Refactor ClusterContextManagerBuilder and StandaloneContextManagerBuilder 
(#35032)
    
    * Refactor ClusterContextManagerBuilder
    
    * Refactor ClusterContextManagerBuilder and StandaloneContextManagerBuilder
    
    * Refactor ClusterContextManagerBuilder and StandaloneContextManagerBuilder
---
 .../mode/manager/cluster/ClusterContextManagerBuilder.java            | 2 +-
 .../mode/manager/standalone/StandaloneContextManagerBuilder.java      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index c875e1fbfb2..a3621a7f993 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -60,8 +60,8 @@ public final class ClusterContextManagerBuilder implements 
ContextManagerBuilder
         ComputeNodeInstanceContext computeNodeInstanceContext = new 
ComputeNodeInstanceContext(new ComputeNodeInstance(param.getInstanceMetaData(), 
param.getLabels()), modeConfig, eventBusContext);
         ClusterPersistRepository repository = 
getClusterPersistRepository(config, computeNodeInstanceContext);
         computeNodeInstanceContext.init(new 
ClusterWorkerIdGenerator(repository, param.getInstanceMetaData().getId()));
-        MetaDataContexts metaDataContexts = new MetaDataContextsFactory(new 
MetaDataPersistFacade(repository), computeNodeInstanceContext).create(param);
         LockContext lockContext = new ClusterLockContext(new 
GlobalLockPersistService(repository));
+        MetaDataContexts metaDataContexts = new MetaDataContextsFactory(new 
MetaDataPersistFacade(repository), computeNodeInstanceContext).create(param);
         ContextManager result = new ContextManager(metaDataContexts, 
computeNodeInstanceContext, lockContext, repository);
         registerOnline(computeNodeInstanceContext, param, result);
         new 
DeliverEventSubscriberRegistry(result.getComputeNodeInstanceContext().getEventBusContext()).register(createDeliverEventSubscribers(repository));
diff --git 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 282f1ca7057..c5536098527 100644
--- 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.mode.manager.standalone;
 import 
org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
+import org.apache.shardingsphere.infra.lock.LockContext;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -47,8 +48,9 @@ public final class StandaloneContextManagerBuilder implements 
ContextManagerBuil
         computeNodeInstanceContext.init(new StandaloneWorkerIdGenerator());
         StandalonePersistRepository repository = TypedSPILoader.getService(
                 StandalonePersistRepository.class, null == repositoryConfig ? 
null : repositoryConfig.getType(), null == repositoryConfig ? new Properties() 
: repositoryConfig.getProps());
+        LockContext lockContext = new StandaloneLockContext();
         MetaDataContexts metaDataContexts = new MetaDataContextsFactory(new 
MetaDataPersistFacade(repository), computeNodeInstanceContext).create(param);
-        return new ContextManager(metaDataContexts, 
computeNodeInstanceContext, new StandaloneLockContext(), repository);
+        return new ContextManager(metaDataContexts, 
computeNodeInstanceContext, lockContext, repository);
     }
     
     @Override