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 b8a85a3f0b6 Refactor package structure of mode.node.path.type.global (#34908) b8a85a3f0b6 is described below commit b8a85a3f0b6ff5f4ca7d9b598e996bf205bf47b1 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Thu Mar 6 15:36:01 2025 +0800 Refactor package structure of mode.node.path.type.global (#34908) * Refactor package structure of mode.node.path.type.global * Refactor package structure of mode.node.path.type.global --- ...ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java | 2 +- .../mode/state/cluster/ClusterStatePersistService.java | 2 +- .../mode/state/node/ComputeNodePersistService.java | 8 ++++---- .../state/node/QualifiedDataSourceStatePersistService.java | 2 +- .../node/path/type/{ => global}/execution/ProcessNodePath.java | 2 +- .../type/{ => global}/node/compute/label/LabelNodePath.java | 2 +- .../node/compute/process/InstanceProcessNodeValue.java | 2 +- .../node/compute/process/KillProcessTriggerNodePath.java | 2 +- .../node/compute/process/ShowProcessListTriggerNodePath.java | 2 +- .../type/{ => global}/node/compute/status/OnlineNodePath.java | 2 +- .../type/{ => global}/node/compute/status/StatusNodePath.java | 2 +- .../node/compute/workerid/ComputeNodeWorkerIDNodePath.java | 2 +- .../{ => global}/node/storage/QualifiedDataSourceNodePath.java | 2 +- .../{ => global}/reservation/WorkerIDReservationNodePath.java | 2 +- .../node/path/type/{ => global}/state/ClusterNodePath.java | 2 +- .../state/DatabaseListenerCoordinatorNodePath.java | 2 +- .../path/type/{ => global}/execution/ProcessNodePathTest.java | 2 +- .../{ => global}/node/compute/label/LabelNodePathTest.java | 2 +- .../node/compute/process/KillProcessTriggerNodePathTest.java | 2 +- .../compute/process/ShowProcessListTriggerNodePathTest.java | 2 +- .../{ => global}/node/compute/status/OnlineNodePathTest.java | 2 +- .../{ => global}/node/compute/status/StatusNodePathTest.java | 2 +- .../node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java | 2 +- .../node/storage/QualifiedDataSourceNodePathTest.java | 2 +- .../reservation/WorkerIDReservationNodePathTest.java | 2 +- .../node/path/type/{ => global}/state/ClusterNodePathTest.java | 2 +- .../state/DatabaseListenerCoordinatorNodePathTest.java | 2 +- .../handler/global/type/ClusterStateChangedHandler.java | 2 +- .../handler/global/type/ComputeNodeLabelChangedHandler.java | 2 +- .../dispatch/handler/global/type/ComputeNodeOnlineHandler.java | 2 +- .../handler/global/type/ComputeNodeStateChangedHandler.java | 2 +- .../handler/global/type/ComputeNodeWorkerIdChangedHandler.java | 2 +- .../handler/global/type/DatabaseListenerChangedHandler.java | 2 +- .../dispatch/handler/global/type/KillProcessHandler.java | 2 +- .../handler/global/type/QualifiedDataSourceChangedHandler.java | 2 +- .../dispatch/handler/global/type/ShowProcessListHandler.java | 2 +- .../database/ClusterDatabaseListenerPersistCoordinator.java | 2 +- .../coordinator/process/ClusterProcessPersistCoordinator.java | 8 ++++---- .../cluster/persist/service/ClusterProcessPersistService.java | 10 +++++----- .../manager/cluster/workerid/ReservationPersistService.java | 2 +- 40 files changed, 50 insertions(+), 50 deletions(-) diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/deliver/ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/deliver/ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java index e64b063b422..0c0caa02e6f 100644 --- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/deliver/ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java +++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/deliver/ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java @@ -21,7 +21,7 @@ import com.google.common.eventbus.Subscribe; import lombok.Setter; import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.node.storage.QualifiedDataSourceNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.storage.QualifiedDataSourceNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; /** diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistService.java index 9bd59861232..fb7231d31f3 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistService.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.state.cluster; import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.state.ClusterNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.state.ClusterNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; /** 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 fb5047cde3b..e098279b8f5 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 @@ -30,10 +30,10 @@ 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.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.node.compute.label.LabelNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.status.OnlineNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.status.StatusNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.workerid.ComputeNodeWorkerIDNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.OnlineNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.StatusNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid.ComputeNodeWorkerIDNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; import java.util.Arrays; diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistService.java index 880836c51fb..41c9fb655d3 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistService.java +++ b/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.YamlQuali 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.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.node.storage.QualifiedDataSourceNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.storage.QualifiedDataSourceNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; import java.util.Collection; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePath.java similarity index 94% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePath.java index f5725968b94..b72eb323582 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.execution; +package org.apache.shardingsphere.mode.node.path.type.global.execution; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java similarity index 95% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java index 49137c686cf..0c95039d7b2 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.label; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.label; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/InstanceProcessNodeValue.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/InstanceProcessNodeValue.java similarity index 93% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/InstanceProcessNodeValue.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/InstanceProcessNodeValue.java index d51a1d8aa62..7bdac0bba68 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/InstanceProcessNodeValue.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/InstanceProcessNodeValue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.process; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.process; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java index 8293b0f7af2..144cf5bd004 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.process; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.process; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java index ed7f03265ea..952a460d671 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.process; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.process; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java index 52106bf092e..1085412d2d3 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.status; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.status; import lombok.Getter; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java similarity index 95% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java index 35d05dd3c3e..a0f2e72b275 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.status; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.status; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java similarity index 95% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java index bd9f409969a..34b5c9ef1d0 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.workerid; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java index bc873d3226f..080ffc7f277 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.storage; +package org.apache.shardingsphere.mode.node.path.type.global.node.storage; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePath.java similarity index 94% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePath.java index 26ffd4a3398..b145f883415 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.reservation; +package org.apache.shardingsphere.mode.node.path.type.global.reservation; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java similarity index 93% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java index 19a039a6b6f..95dbd095a78 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.state; +package org.apache.shardingsphere.mode.node.path.type.global.state; import org.apache.shardingsphere.mode.node.path.NodePath; import org.apache.shardingsphere.mode.node.path.NodePathEntity; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePath.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java index 6bb61c0417f..b80610c0fb5 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePath.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.state; +package org.apache.shardingsphere.mode.node.path.type.global.state; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePathTest.java similarity index 95% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePathTest.java index f85b71b1a66..0a4766296c5 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/execution/ProcessNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/execution/ProcessNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.execution; +package org.apache.shardingsphere.mode.node.path.type.global.execution; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.junit.jupiter.api.Test; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java similarity index 95% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java index 7eab8023cec..2cda6ea3826 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/label/LabelNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.label; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.label; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePathTest.java similarity index 97% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePathTest.java index 887f827a04d..e22ad520147 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/KillProcessTriggerNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.process; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.process; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePathTest.java similarity index 97% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePathTest.java index fec9c39c553..a104625e648 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/process/ShowProcessListTriggerNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.process; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.process; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePathTest.java similarity index 97% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePathTest.java index cc3142ca59d..bcd63ed26d7 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/OnlineNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.status; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.status; import org.apache.shardingsphere.infra.instance.metadata.InstanceType; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePathTest.java similarity index 95% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePathTest.java index d06cd575c36..3e495aba813 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/status/StatusNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.status; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.status; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java similarity index 95% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java index 5497414d996..7a30f7dd559 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.compute.workerid; +package org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePathTest.java similarity index 96% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePathTest.java index 07f18015734..433423b7cd7 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/node/storage/QualifiedDataSourceNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.node.storage; +package org.apache.shardingsphere.mode.node.path.type.global.node.storage; import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePathTest.java similarity index 94% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePathTest.java index 64457db651c..5889dd2d1b1 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/reservation/WorkerIDReservationNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/reservation/WorkerIDReservationNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.reservation; +package org.apache.shardingsphere.mode.node.path.type.global.reservation; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.junit.jupiter.api.Test; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java similarity index 94% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java index 1232df71090..d722bc29f00 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/ClusterNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.state; +package org.apache.shardingsphere.mode.node.path.type.global.state; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.junit.jupiter.api.Test; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePathTest.java similarity index 96% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePathTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePathTest.java index e05adae6ced..30f12c9fdcf 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/state/DatabaseListenerCoordinatorNodePathTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePathTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.type.state; +package org.apache.shardingsphere.mode.node.path.type.global.state; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java index ae359013508..da722a6c6f9 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ClusterStateChangedHandler.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.state.ClusterNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.state.ClusterNodePath; import org.apache.shardingsphere.mode.state.cluster.ClusterState; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeLabelChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeLabelChangedHandler.java index b7ee60fc17d..d9edc761283 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeLabelChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeLabelChangedHandler.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.label.LabelNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.label.LabelNodePath; import java.util.ArrayList; import java.util.Arrays; 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 7874874ff49..bbc67116a1b 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 @@ -31,7 +31,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.status.OnlineNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.OnlineNodePath; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java index fba83c27161..1f6fb16cd8d 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeStateChangedHandler.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.status.StatusNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.StatusNodePath; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeWorkerIdChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeWorkerIdChangedHandler.java index de4e98605e1..a39014da7e0 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeWorkerIdChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ComputeNodeWorkerIdChangedHandler.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.workerid.ComputeNodeWorkerIDNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.workerid.ComputeNodeWorkerIDNodePath; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java index 74fe1c5d6b2..65b6a8d4af4 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/DatabaseListenerChangedHandler.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; import org.apache.shardingsphere.mode.node.path.type.database.metadata.schema.TableMetadataNodePath; -import org.apache.shardingsphere.mode.node.path.type.state.DatabaseListenerCoordinatorNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.state.DatabaseListenerCoordinatorNodePath; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java index 00c375d4783..410595338a2 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/KillProcessHandler.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.Gl import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.process.ClusterProcessPersistCoordinator; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.KillProcessTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.KillProcessTriggerNodePath; import java.sql.SQLException; import java.util.Arrays; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java index f0fe85a2b3d..1790d665402 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/QualifiedDataSourceChangedHandler.java @@ -32,7 +32,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.storage.QualifiedDataSourceNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.storage.QualifiedDataSourceNodePath; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java index a1aaabe8e72..ba0e3e1d259 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/type/ShowProcessListHandler.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.Gl import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.process.ClusterProcessPersistCoordinator; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; import org.apache.shardingsphere.mode.node.path.engine.searcher.NodePathSearcher; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.ShowProcessListTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.ShowProcessListTriggerNodePath; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java index 300de9a6bf8..9a5d07cdaf6 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.datab import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.state.DatabaseListenerCoordinatorNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.state.DatabaseListenerCoordinatorNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; /** diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java index 3e1289cb71b..36adb2cdc38 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/process/ClusterProcessPersistCoordinator.java @@ -23,10 +23,10 @@ import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry; import org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListSwapper; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.execution.ProcessNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.InstanceProcessNodeValue; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.KillProcessTriggerNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.ShowProcessListTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.execution.ProcessNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.InstanceProcessNodeValue; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.KillProcessTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.ShowProcessListTriggerNodePath; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java index c7db57e318d..b83c96eefc5 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java @@ -25,11 +25,11 @@ import org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlPro import org.apache.shardingsphere.infra.instance.metadata.InstanceType; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.execution.ProcessNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.InstanceProcessNodeValue; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.KillProcessTriggerNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.process.ShowProcessListTriggerNodePath; -import org.apache.shardingsphere.mode.node.path.type.node.compute.status.OnlineNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.execution.ProcessNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.InstanceProcessNodeValue; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.KillProcessTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.process.ShowProcessListTriggerNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.node.compute.status.OnlineNodePath; import org.apache.shardingsphere.mode.persist.service.ProcessPersistService; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ReservationPersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ReservationPersistService.java index 9e150f71f09..eb1e1361643 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ReservationPersistService.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ReservationPersistService.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.workerid; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator; -import org.apache.shardingsphere.mode.node.path.type.reservation.WorkerIDReservationNodePath; +import org.apache.shardingsphere.mode.node.path.type.global.reservation.WorkerIDReservationNodePath; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;