(shardingsphere) branch master updated: Rename ComputeNodePath (#34272)

[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 a97f3cd80d6 Rename ComputeNodePath (#34272)
a97f3cd80d6 is described below

commit a97f3cd80d6d3e7dea1a1f3a6b60d1f60527d69c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jan 6 22:26:02 2025 +0800

    Rename ComputeNodePath (#34272)
---
 .../metadata/persist/node/ComputeNodePath.java           | 16 ++++++++--------
 .../dispatch/handler/global/ShowProcessListHandler.java  |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ComputeNodePath.java
 
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ComputeNodePath.java
index 4a2f536ff52..fcbdbafb78c 100644
--- 
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ComputeNodePath.java
+++ 
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ComputeNodePath.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ComputeNodePath {
     
-    private static final String ROOT_NODE = "nodes/compute_nodes";
+    private static final String ROOT_NODE = "/nodes/compute_nodes";
     
     private static final String ONLINE_NODE = "online";
     
@@ -53,7 +53,7 @@ public final class ComputeNodePath {
      * @return compute node root path
      */
     public static String getRootPath() {
-        return String.join("/", "", ROOT_NODE);
+        return ROOT_NODE;
     }
     
     /**
@@ -62,7 +62,7 @@ public final class ComputeNodePath {
      * @return online root path
      */
     public static String getOnlineRootPath() {
-        return String.join("/", "", ROOT_NODE, ONLINE_NODE);
+        return String.join("/", getRootPath(), ONLINE_NODE);
     }
     
     /**
@@ -92,7 +92,7 @@ public final class ComputeNodePath {
      * @return show process list trigger root path
      */
     public static String getShowProcessListTriggerRootPath() {
-        return String.join("/", "", ROOT_NODE, SHOW_PROCESS_LIST_TRIGGER_NODE);
+        return String.join("/", ROOT_NODE, SHOW_PROCESS_LIST_TRIGGER_NODE);
     }
     
     /**
@@ -112,7 +112,7 @@ public final class ComputeNodePath {
      * @return kill process trigger root path
      */
     public static String getKillProcessTriggerRootPath() {
-        return String.join("/", "", ROOT_NODE, KILL_PROCESS_TRIGGER_NODE);
+        return String.join("/", ROOT_NODE, KILL_PROCESS_TRIGGER_NODE);
     }
     
     /**
@@ -133,7 +133,7 @@ public final class ComputeNodePath {
      * @return state path
      */
     public static String getStatePath(final String instanceId) {
-        return String.join("/", "", ROOT_NODE, STATUS_NODE, instanceId);
+        return String.join("/", ROOT_NODE, STATUS_NODE, instanceId);
     }
     
     /**
@@ -142,7 +142,7 @@ public final class ComputeNodePath {
      * @return worker ID root path
      */
     public static String getWorkerIdRootPath() {
-        return String.join("/", "", ROOT_NODE, WORKER_ID_NODE);
+        return String.join("/", ROOT_NODE, WORKER_ID_NODE);
     }
     
     /**
@@ -162,7 +162,7 @@ public final class ComputeNodePath {
      * @return labels path
      */
     public static String getLabelsPath(final String instanceId) {
-        return String.join("/", "", ROOT_NODE, LABELS_NODE, instanceId);
+        return String.join("/", ROOT_NODE, LABELS_NODE, instanceId);
     }
     
     /**
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
index 230700cb89b..35119d79f2f 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
@@ -47,9 +47,12 @@ public final class ShowProcessListHandler implements 
DataChangedEventHandler {
     @Override
     public void handle(final ContextManager contextManager, final 
DataChangedEvent event) {
         Matcher matcher = getShowProcessListTriggerMatcher(event);
-        if (!matcher.find()) {
-            return;
+        if (matcher.find()) {
+            handle(contextManager, event, matcher);
         }
+    }
+    
+    private void handle(final ContextManager contextManager, final 
DataChangedEvent event, final Matcher matcher) {
         String instanceId = matcher.group(1);
         String taskId = matcher.group(2);
         if (Type.ADDED == event.getType()) {