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 e94dc401367 Move QualifiedDataSourceNodePath to state package (#34688) e94dc401367 is described below commit e94dc40136748c39e19ceed4d1615b7b19c9aeb9 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Feb 16 01:58:21 2025 +0800 Move QualifiedDataSourceNodePath to state package (#34688) --- .../ReadwriteSplittingQualifiedDataSourceChangedSubscriber.java | 2 +- .../mode/state/node/QualifiedDataSourceStatePersistService.java | 2 +- .../storage => state}/QualifiedDataSourceNodePathGenerator.java | 2 +- .../storage => state}/QualifiedDataSourceNodePathParser.java | 2 +- .../storage => state}/QualifiedDataSourceNodePathGeneratorTest.java | 2 +- .../storage => state}/QualifiedDataSourceNodePathParserTest.java | 2 +- .../handler/global/type/QualifiedDataSourceChangedHandler.java | 4 ++-- 7 files changed, 8 insertions(+), 8 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 bbe20e753dc..a9b9c70bf75 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 @@ -19,7 +19,7 @@ package org.apache.shardingsphere.readwritesplitting.deliver; import com.google.common.eventbus.Subscribe; import lombok.Setter; -import org.apache.shardingsphere.mode.node.path.metadata.storage.QualifiedDataSourceNodePathGenerator; +import org.apache.shardingsphere.mode.node.path.state.QualifiedDataSourceNodePathGenerator; import org.apache.shardingsphere.mode.deliver.DeliverEventSubscriber; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; 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 462c0185d62..3e1b8abdf35 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 @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.state.datasource.DataSourceState; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.mode.spi.repository.PersistRepository; import org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState; -import org.apache.shardingsphere.mode.node.path.metadata.storage.QualifiedDataSourceNodePathGenerator; +import org.apache.shardingsphere.mode.node.path.state.QualifiedDataSourceNodePathGenerator; import org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState; import org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGenerator.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGenerator.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGenerator.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGenerator.java index dcfdd6a4882..73f5918423d 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGenerator.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.metadata.storage; +package org.apache.shardingsphere.mode.node.path.state; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParser.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParser.java similarity index 96% rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParser.java rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParser.java index a8052775900..a8688f3cd92 100644 --- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParser.java +++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.metadata.storage; +package org.apache.shardingsphere.mode.node.path.state; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGeneratorTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java similarity index 95% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGeneratorTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java index 8219ceec365..877624582eb 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathGeneratorTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathGeneratorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.metadata.storage; +package org.apache.shardingsphere.mode.node.path.state; import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource; import org.hamcrest.MatcherAssert; diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParserTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParserTest.java similarity index 96% rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParserTest.java rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParserTest.java index 0fa22c99767..aaa45ab0d4a 100644 --- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/metadata/storage/QualifiedDataSourceNodePathParserTest.java +++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/QualifiedDataSourceNodePathParserTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mode.node.path.metadata.storage; +package org.apache.shardingsphere.mode.node.path.state; import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource; import org.junit.jupiter.api.Test; 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 c1f21a345bc..551035d236f 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 @@ -30,8 +30,8 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent; 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.metadata.storage.QualifiedDataSourceNodePathGenerator; -import org.apache.shardingsphere.mode.node.path.metadata.storage.QualifiedDataSourceNodePathParser; +import org.apache.shardingsphere.mode.node.path.state.QualifiedDataSourceNodePathGenerator; +import org.apache.shardingsphere.mode.node.path.state.QualifiedDataSourceNodePathParser; import java.util.Arrays; import java.util.Collection;