(shardingsphere) branch master updated: Use NodePathPattern.IDENTIFIER for instance id on NodePath (#34759)

[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 b3e306b6a64 Use NodePathPattern.IDENTIFIER for instance id on NodePath 
(#34759)
b3e306b6a64 is described below

commit b3e306b6a6414b29a9144dde8ce5f4ee2d2fbf57
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Feb 23 17:19:42 2025 +0800

    Use NodePathPattern.IDENTIFIER for instance id on NodePath (#34759)
---
 .../plugin/core/holder/ShardingSphereDataSourceContextHolder.java    | 4 ++--
 .../mode/node/path/node/compute/ComputeNodePathParser.java           | 5 ++---
 .../mode/node/path/node/compute/status/OnlineNodePath.java           | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/holder/ShardingSphereDataSourceContextHolder.java
 
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/holder/ShardingSphereDataSourceContextHolder.java
index 0516f0df780..655a6b18bd4 100644
--- 
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/holder/ShardingSphereDataSourceContextHolder.java
+++ 
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/holder/ShardingSphereDataSourceContextHolder.java
@@ -35,7 +35,7 @@ public final class ShardingSphereDataSourceContextHolder {
     /**
      * Put.
      *
-     * @param instanceId instance Id
+     * @param instanceId instance ID
      * @param dataSourceContext sharding sphere data source context
      */
     public static void put(final String instanceId, final 
ShardingSphereDataSourceContext dataSourceContext) {
@@ -45,7 +45,7 @@ public final class ShardingSphereDataSourceContextHolder {
     /**
      * Remove.
      *
-     * @param instanceId instance id
+     * @param instanceId instance ID
      */
     public static void remove(final String instanceId) {
         DATA_SOURCE_CONTEXTS.remove(instanceId);
diff --git 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePathParser.java
 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePathParser.java
index a038869ad84..107f04728d1 100644
--- 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePathParser.java
+++ 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePathParser.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.mode.node.path.node.compute;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 
 import java.util.Optional;
 import java.util.regex.Matcher;
@@ -30,8 +31,6 @@ import java.util.regex.Pattern;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ComputeNodePathParser {
     
-    private static final String INSTANCE_ID_PATTERN = "([\\S]+)";
-    
     /**
      * Find instance ID by compute node path.
      *
@@ -39,7 +38,7 @@ public final class ComputeNodePathParser {
      * @return found instance ID
      */
     public static Optional<String> findInstanceId(final String 
computeNodePath) {
-        Pattern pattern = Pattern.compile("/nodes/compute_nodes/" + 
"(status|worker_id|labels)" + "/" + INSTANCE_ID_PATTERN + "$", 
Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile("/nodes/compute_nodes/" + 
"(status|worker_id|labels)" + "/" + NodePathPattern.IDENTIFIER + "$", 
Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(computeNodePath);
         return matcher.find() ? Optional.of(matcher.group(2)) : 
Optional.empty();
     }
diff --git 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/status/OnlineNodePath.java
 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/status/OnlineNodePath.java
index 6b6e3dbe97e..70556df47ba 100644
--- 
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/status/OnlineNodePath.java
+++ 
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/status/OnlineNodePath.java
@@ -21,6 +21,7 @@ import lombok.Getter;
 import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
 import org.apache.shardingsphere.mode.node.path.NodePath;
 import org.apache.shardingsphere.mode.node.path.NodePathEntity;
+import org.apache.shardingsphere.mode.node.path.NodePathPattern;
 import org.apache.shardingsphere.mode.node.path.NodePathSearchCriteria;
 
 /**
@@ -41,7 +42,7 @@ public final class OnlineNodePath implements NodePath {
     
     public OnlineNodePath() {
         instanceType = "(jdbc|proxy)";
-        instanceId = "([\\S]+)";
+        instanceId = NodePathPattern.IDENTIFIER;
     }
     
     /**