(shardingsphere) branch master updated: Refactor ComputeNodePersistService (#34555)

[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 f06144de8de Refactor ComputeNodePersistService (#34555)
f06144de8de is described below

commit f06144de8de8b10cc38d3938611a27bf6a02352f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Feb 4 09:25:40 2025 +0800

    Refactor ComputeNodePersistService (#34555)
    
    * Refactor ComputeNodePersistService
    
    * Refactor ComputeNodePersistService
---
 .../shardingsphere/mode/state/node/ComputeNodePersistService.java      | 3 ++-
 .../cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java
index 2453ccca378..0c6c258d8ed 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java
@@ -91,7 +91,8 @@ public final class ComputeNodePersistService {
             String value = 
repository.query(ComputeNodePath.getOnlinePath(each, instanceType));
             if (!Strings.isNullOrEmpty(value)) {
                 ComputeNodeData computeNodeData = new 
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value, 
YamlComputeNodeData.class));
-                result.add(loadInstance(InstanceMetaDataFactory.create(each, 
instanceType, computeNodeData)));
+                ComputeNodeInstance instance = 
loadInstance(InstanceMetaDataFactory.create(each, instanceType, 
computeNodeData));
+                result.add(instance);
             }
         }
         return result;
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java
index b705ffeffff..ae8a27a7761 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeOnlineHandler.java
@@ -60,8 +60,7 @@ public final class ComputeNodeOnlineHandler implements 
GlobalDataChangedEventHan
         ComputeNodeData computeNodeData = new 
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(event.getValue(),
 YamlComputeNodeData.class));
         InstanceMetaData instanceMetaData = 
InstanceMetaDataFactory.create(matcher.group(2), 
InstanceType.valueOf(matcher.group(1).toUpperCase()), computeNodeData);
         if (Type.ADDED == event.getType()) {
-            
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry()
-                    
.add(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadInstance(instanceMetaData));
+            
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().add(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadInstance(instanceMetaData));
         } else if (Type.DELETED == event.getType()) {
             
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().delete(new
 ComputeNodeInstance(instanceMetaData));
         }