Refactor NodeNodePath (#34722)

* Refactor NodeNodePath

* Refactor NodeNodePath

* Refactor NodeNodePath

* Refactor NodeNodePath

Author: terrymanu

features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/deliver/ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java

@@ -21,7 +21,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber;
 import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.node.QualifiedDataSourceNodePath;
+import org.apache.shardingsphere.mode.node.path.node.storage.QualifiedDataSourceNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
 /**

mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java

@@ -29,7 +29,12 @@
 import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeDataSwapper;
 import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.node.ComputeNodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.node.compute.label.LabelNodePath;
+import org.apache.shardingsphere.mode.node.path.node.compute.status.OnlineInstanceNodePath;
+import org.apache.shardingsphere.mode.node.path.node.compute.status.OnlineTypeNodePath;
+import org.apache.shardingsphere.mode.node.path.node.compute.status.StatusNodePath;
+import org.apache.shardingsphere.mode.node.path.node.compute.workerid.ComputeNodeWorkerIDNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
 import java.util.Arrays;
@@ -63,7 +68,7 @@ public void registerOnline(final ComputeNodeInstance computeNodeInstance) {
     private void persistOnline(final ComputeNodeInstance computeNodeInstance) {
         ComputeNodeData computeNodeData = new ComputeNodeData(
                 computeNodeInstance.getMetaData().getDatabaseName(), computeNodeInstance.getMetaData().getAttributes(), computeNodeInstance.getMetaData().getVersion());
-        repository.persistEphemeral(ComputeNodePathGenerator.getOnlinePath(computeNodeInstance.getMetaData().getId(), computeNodeInstance.getMetaData().getType()),
+        repository.persistEphemeral(new NodePathGenerator(new OnlineInstanceNodePath(computeNodeInstance.getMetaData().getType())).getPath(computeNodeInstance.getMetaData().getId()),
                 YamlEngine.marshal(new YamlComputeNodeDataSwapper().swapToYamlConfiguration(computeNodeData)));
     }
 
@@ -73,7 +78,7 @@ private void persistOnline(final ComputeNodeInstance computeNodeInstance) {
      * @param computeNodeInstance compute node instance
      */
     public void offline(final ComputeNodeInstance computeNodeInstance) {
-        repository.delete(ComputeNodePathGenerator.getOnlinePath(computeNodeInstance.getMetaData().getId(), computeNodeInstance.getMetaData().getType()));
+        repository.delete(new NodePathGenerator(new OnlineInstanceNodePath(computeNodeInstance.getMetaData().getType())).getPath(computeNodeInstance.getMetaData().getId()));
     }
 
     /**
@@ -87,8 +92,8 @@ public Collection<ComputeNodeInstance> loadAllInstances() {
 
     private Collection<ComputeNodeInstance> loadInstances(final InstanceType instanceType) {
         Collection<ComputeNodeInstance> result = new LinkedList<>();
-        for (String each : repository.getChildrenKeys(ComputeNodePathGenerator.getOnlinePath(instanceType))) {
-            String value = repository.query(ComputeNodePathGenerator.getOnlinePath(each, instanceType));
+        for (String each : repository.getChildrenKeys(new NodePathGenerator(new OnlineTypeNodePath()).getPath(instanceType.name().toLowerCase()))) {
+            String value = repository.query(new NodePathGenerator(new OnlineInstanceNodePath(instanceType)).getPath(each));
             if (!Strings.isNullOrEmpty(value)) {
                 ComputeNodeData computeNodeData = new YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value, YamlComputeNodeData.class));
                 ComputeNodeInstance instance = loadInstance(InstanceMetaDataFactory.create(each, instanceType, computeNodeData));
@@ -113,12 +118,12 @@ public ComputeNodeInstance loadInstance(final InstanceMetaData instanceMetaData)
     }
 
     private String loadState(final String instanceId) {
-        return repository.query(ComputeNodePathGenerator.getStatePath(instanceId));
+        return repository.query(new NodePathGenerator(new StatusNodePath()).getPath(instanceId));
     }
 
     @SuppressWarnings("unchecked")
     private Collection<String> loadLabels(final String instanceId) {
-        String yamlContent = repository.query(ComputeNodePathGenerator.getLabelsPath(instanceId));
+        String yamlContent = repository.query(new NodePathGenerator(new LabelNodePath()).getPath(instanceId));
         return Strings.isNullOrEmpty(yamlContent) ? Collections.emptyList() : YamlEngine.unmarshal(yamlContent, Collection.class);
     }
 
@@ -129,7 +134,7 @@ private Collection<String> loadLabels(final String instanceId) {
      * @param instanceState instance state
      */
     public void updateState(final String instanceId, final InstanceState instanceState) {
-        repository.persistEphemeral(ComputeNodePathGenerator.getStatePath(instanceId), instanceState.name());
+        repository.persistEphemeral(new NodePathGenerator(new StatusNodePath()).getPath(instanceId), instanceState.name());
     }
 
     /**
@@ -139,7 +144,7 @@ public void updateState(final String instanceId, final InstanceState instanceSta
      * @param labels instance labels
      */
     public void persistLabels(final String instanceId, final Collection<String> labels) {
-        repository.persistEphemeral(ComputeNodePathGenerator.getLabelsPath(instanceId), YamlEngine.marshal(labels));
+        repository.persistEphemeral(new NodePathGenerator(new LabelNodePath()).getPath(instanceId), YamlEngine.marshal(labels));
     }
 
     /**
@@ -149,7 +154,7 @@ public void persistLabels(final String instanceId, final Collection<String> labe
      * @param workerId worker ID
      */
     public void persistWorkerId(final String instanceId, final int workerId) {
-        repository.persistEphemeral(ComputeNodePathGenerator.getWorkerIdPath(instanceId), String.valueOf(workerId));
+        repository.persistEphemeral(new NodePathGenerator(new ComputeNodeWorkerIDNodePath()).getPath(instanceId), String.valueOf(workerId));
     }
 
     /**
@@ -160,7 +165,7 @@ public void persistWorkerId(final String instanceId, final int workerId) {
      */
     public Optional<Integer> loadWorkerId(final String instanceId) {
         try {
-            String workerId = repository.query(ComputeNodePathGenerator.getWorkerIdPath(instanceId));
+            String workerId = repository.query(new NodePathGenerator(new ComputeNodeWorkerIDNodePath()).getPath(instanceId));
             return Strings.isNullOrEmpty(workerId) ? Optional.empty() : Optional.of(Integer.valueOf(workerId));
         } catch (final NumberFormatException ex) {
             log.error("Invalid worker id for instance: {}", instanceId);
@@ -174,7 +179,8 @@ public Optional<Integer> loadWorkerId(final String instanceId) {
      * @return assigned worker IDs
      */
     public Collection<Integer> getAssignedWorkerIds() {
-        Collection<String> instanceIds = repository.getChildrenKeys(ComputeNodePathGenerator.getWorkerIdRootPath());
-        return instanceIds.stream().map(each -> repository.query(ComputeNodePathGenerator.getWorkerIdPath(each))).filter(Objects::nonNull).map(Integer::parseInt).collect(Collectors.toSet());
+        Collection<String> instanceIds = repository.getChildrenKeys(new ComputeNodeWorkerIDNodePath().getRootPath());
+        return instanceIds.stream()
+                .map(each -> repository.query(new NodePathGenerator(new ComputeNodeWorkerIDNodePath()).getPath(each))).filter(Objects::nonNull).map(Integer::parseInt).collect(Collectors.toSet());
     }
 }

mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistService.java

@@ -26,7 +26,7 @@
 import org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.node.QualifiedDataSourceNodePath;
+import org.apache.shardingsphere.mode.node.path.node.storage.QualifiedDataSourceNodePath;
 import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
 
 import java.util.Collection;

mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/ComputeNodePathGenerator.java

@@ -20,16 +20,14 @@
 import org.apache.shardingsphere.mode.node.path.NodePath;
 
 /**
- * Qualified data source node path.
+ * Node node path.
  */
-public final class QualifiedDataSourceNodePath implements NodePath {
+public final class NodeNodePath implements NodePath {
 
     private static final String ROOT_NODE = "/nodes";
 
-    private static final String QUALIFIED_DATA_SOURCES_NODE = "qualified_data_sources";
-    
     @Override
     public String getRootPath() {
-        return String.join("/", ROOT_NODE, QUALIFIED_DATA_SOURCES_NODE);
+        return ROOT_NODE;
     }
 }

mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/QualifiedDataSourceNodePath.java renamed to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/NodeNodePath.java

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.node.path.node.compute;
+
+import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.node.NodeNodePath;
+
+/**
+ * Compute node path.
+ */
+public final class ComputeNodePath implements NodePath {
+    
+    private static final String ROOT_NODE = "compute_nodes";
+    
+    private final NodePathGenerator nodePathGenerator = new NodePathGenerator(new NodeNodePath());
+    
+    @Override
+    public String getRootPath() {
+        return nodePathGenerator.getPath(ROOT_NODE);
+    }
+}

mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePath.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.node.path.node;
+package org.apache.shardingsphere.mode.node.path.node.compute;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -39,7 +39,7 @@ public final class ComputeNodePathParser {
      * @return found instance ID
      */
     public static Optional<String> findInstanceId(final String computeNodePath) {
-        Pattern pattern = Pattern.compile(ComputeNodePathGenerator.getRootPath() + "(/status|/worker_id|/labels)" + "/" + INSTANCE_ID_PATTERN + "$", Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile(new ComputeNodePath().getRootPath() + "(/status|/worker_id|/labels)" + "/" + INSTANCE_ID_PATTERN + "$", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(computeNodePath);
         return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
     }

mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/ComputeNodePathParser.java renamed to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/node/compute/ComputeNodePathParser.java

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.node.path.node.compute.label;
+
+import org.apache.shardingsphere.mode.node.path.NodePath;
+import org.apache.shardingsphere.mode.node.path.NodePathGenerator;
+import org.apache.shardingsphere.mode.node.path.node.compute.ComputeNodePath;
+
+/**
+ * Label node path.
+ */
+public final class LabelNodePath implements NodePath {
+    
+    private static final String ROOT_NODE = "labels";
+    
+    private final NodePathGenerator nodePathGenerator = new NodePathGenerator(new ComputeNodePath());
+    
+    @Override
+    public String getRootPath() {
+        return nodePathGenerator.getPath(ROOT_NODE);
+    }
+}