Refactor DatabaseMetaDataNodePath (apache#34273)

terrymanu · Jan 6, 2025 · 3b6a5e2 · 3b6a5e2
1 parent a97f3cd
commit 3b6a5e2
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/...c/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePath.java b/...c/main/java/org/apache/shardingsphere/metadata/persist/node/DatabaseMetaDataNodePath.java
@@ -30,7 +30,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DatabaseMetaDataNodePath {
 
-    private static final String ROOT_NODE = "metadata";
+    private static final String ROOT_NODE = "/metadata";
 
     private static final String SCHEMAS_NODE = "schemas";
 
@@ -48,7 +48,7 @@ public final class DatabaseMetaDataNodePath {
      * @return meta data root path
      */
     public static String getRootPath() {
-        return String.join("/", "", ROOT_NODE);
+        return ROOT_NODE;
     }
 
     /**

diff --git a/...ta/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/GlobalNodePath.java b/...ta/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/GlobalNodePath.java
@@ -26,9 +26,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class GlobalNodePath {
 
-    private static final String RULE_NODE = "rules";
+    private static final String RULE_NODE = "/rules";
 
-    private static final String PROPS_NODE = "props";
+    private static final String PROPS_NODE = "/props";
 
     private static final String VERSIONS_NODE = "versions";
 
@@ -40,7 +40,7 @@ public final class GlobalNodePath {
      * @return global rule root path
      */
     public static String getRuleRootPath() {
-        return String.join("/", "", RULE_NODE);
+        return RULE_NODE;
     }
 
     /**
@@ -90,7 +90,7 @@ public static String getRuleActiveVersionPath(final String ruleName) {
      * @return properties path
      */
     public static String getPropsRootPath() {
-        return String.join("/", "", PROPS_NODE);
+        return PROPS_NODE;
     }
 
     /**

diff --git a/...a/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ProcessNodePath.java b/...a/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/ProcessNodePath.java
@@ -26,7 +26,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ProcessNodePath {
 
-    private static final String ROOT_NODE = "execution_nodes";
+    private static final String ROOT_NODE = "/execution_nodes";
 
     /**
      * Get process ID root path.
@@ -35,7 +35,7 @@ public final class ProcessNodePath {
      * @return process ID root path
      */
     public static String getRootPath(final String processId) {
-        return String.join("/", "", ROOT_NODE, processId);
+        return String.join("/", ROOT_NODE, processId);
     }
 
     /**

diff --git a/...ain/java/org/apache/shardingsphere/metadata/persist/node/QualifiedDataSourceNodePath.java b/...ain/java/org/apache/shardingsphere/metadata/persist/node/QualifiedDataSourceNodePath.java
@@ -31,7 +31,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class QualifiedDataSourceNodePath {
 
-    private static final String ROOT_NODE = "nodes";
+    private static final String ROOT_NODE = "/nodes";
 
     private static final String QUALIFIED_DATA_SOURCES_NODE = "qualified_data_sources";
 
@@ -43,7 +43,7 @@ public final class QualifiedDataSourceNodePath {
      * @return qualified data source root path
      */
     public static String getRootPath() {
-        return String.join("/", "", ROOT_NODE, QUALIFIED_DATA_SOURCES_NODE);
+        return String.join("/", ROOT_NODE, QUALIFIED_DATA_SOURCES_NODE);
     }
 
     /**

diff --git a/...re/src/main/java/org/apache/shardingsphere/metadata/persist/node/ReservationNodePath.java b/...re/src/main/java/org/apache/shardingsphere/metadata/persist/node/ReservationNodePath.java
@@ -26,7 +26,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ReservationNodePath {
 
-    private static final String ROOT_NODE = "reservation";
+    private static final String ROOT_NODE = "/reservation";
 
     private static final String WORKER_ID_NODE = "worker_id";
 
@@ -37,6 +37,6 @@ public final class ReservationNodePath {
      * @return worker id reservation path
      */
     public static String getWorkerIdReservationPath(final int workerId) {
-        return String.join("/", "", ROOT_NODE, WORKER_ID_NODE, String.valueOf(workerId));
+        return String.join("/", ROOT_NODE, WORKER_ID_NODE, String.valueOf(workerId));
     }
 }
diff --git a/...main/java/org/apache/shardingsphere/metadata/persist/node/ShardingSphereDataNodePath.java b/...main/java/org/apache/shardingsphere/metadata/persist/node/ShardingSphereDataNodePath.java
@@ -30,7 +30,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ShardingSphereDataNodePath {
 
-    private static final String ROOT_NODE = "statistics";
+    private static final String ROOT_NODE = "/statistics";
 
     private static final String DATABASES_NODE = "databases";
 
@@ -46,7 +46,7 @@ public final class ShardingSphereDataNodePath {
      * @return database root path
      */
     public static String getDatabasesRootPath() {
-        return String.join("/", "", ROOT_NODE, DATABASES_NODE);
+        return String.join("/", ROOT_NODE, DATABASES_NODE);
     }
 
     /**

diff --git a/...ta/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePath.java b/...ta/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/StatesNodePath.java
@@ -30,7 +30,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class StatesNodePath {
 
-    private static final String ROOT_NODE = "states";
+    private static final String ROOT_NODE = "/states";
 
     private static final String CLUSTER_STATE_NODE = "cluster_state";
 
@@ -42,7 +42,7 @@ public final class StatesNodePath {
      * @return cluster state path
      */
     public static String getClusterStatePath() {
-        return String.join("/", "", ROOT_NODE, CLUSTER_STATE_NODE);
+        return String.join("/", ROOT_NODE, CLUSTER_STATE_NODE);
     }
 
     /**
@@ -51,7 +51,7 @@ public static String getClusterStatePath() {
      * @return listener assisted node path
      */
     public static String getListenerAssistedNodePath() {
-        return String.join("/", "", ROOT_NODE, LISTENER_ASSISTED_NODE);
+        return String.join("/", ROOT_NODE, LISTENER_ASSISTED_NODE);
     }
 
     /**
@@ -73,6 +73,6 @@ public static Optional<String> findDatabaseNameByListenerAssistedNodePath(final
      * @return database name listener assisted node path
      */
     public static String getDatabaseNameListenerAssistedNodePath(final String databaseName) {
-        return String.join("/", "", ROOT_NODE, LISTENER_ASSISTED_NODE, databaseName);
+        return String.join("/", ROOT_NODE, LISTENER_ASSISTED_NODE, databaseName);
     }
 }
diff --git a/.../java/org/apache/shardingsphere/metadata/persist/node/ShardingSphereDataNodePathTest.java b/.../java/org/apache/shardingsphere/metadata/persist/node/ShardingSphereDataNodePathTest.java
@@ -133,6 +133,6 @@ void assertGetRowUniqueKeyUniqueKeyNotFoundScenario() {
 
     @Test
     void assertGetJobPath() {
-        assertThat(ShardingSphereDataNodePath.getJobPath(), is("statistics/job"));
+        assertThat(ShardingSphereDataNodePath.getJobPath(), is("/statistics/job"));
     }
 }
diff --git a/...pache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java b/...pache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobWorker.java
@@ -68,7 +68,7 @@ public void initialize() {
 
     private CoordinatorRegistryCenter createRegistryCenter(final ModeConfiguration modeConfig) {
         ClusterPersistRepositoryConfiguration repositoryConfig = (ClusterPersistRepositoryConfiguration) modeConfig.getRepository();
-        String namespace = String.join("/", repositoryConfig.getNamespace(), ShardingSphereDataNodePath.getJobPath());
+        String namespace = repositoryConfig.getNamespace() + ShardingSphereDataNodePath.getJobPath();
         CoordinatorRegistryCenter result = new ZookeeperRegistryCenter(getZookeeperConfiguration(repositoryConfig, namespace));
         result.init();
         return result;