This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 40c943956d5 Mode QualifiedDataSourceDeletedEvent to deliver event
(#31963)
40c943956d5 is described below
commit 40c943956d5773d9c293b3dea48993ca88e7f7fc
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Wed Jul 3 10:44:05 2024 +0800
Mode QualifiedDataSourceDeletedEvent to deliver event (#31963)
---
.../attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java | 2 +-
.../datasource/qualified/QualifiedDataSourceDeletedEvent.java | 2 +-
.../mode/{state => persist/service}/StatePersistServiceTest.java | 3 +--
.../event/subscriber/deliver/DeliverQualifiedDataSourceSubscriber.java | 2 +-
.../subscriber/dispatch/QualifiedDataSourceStateSubscriberTest.java | 2 +-
.../generator => instance/workerid}/ClusterWorkerIdGeneratorTest.java | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
index ca78c851452..890ac58049f 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/attribute/ReadwriteSplittingStaticDataSourceRuleAttribute.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import
org.apache.shardingsphere.infra.rule.attribute.datasource.StaticDataSourceRuleAttribute;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
-import
org.apache.shardingsphere.mode.event.dispatch.datasource.qualified.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.datasource.qualified.QualifiedDataSourceDeletedEvent;
import
org.apache.shardingsphere.readwritesplitting.exception.logic.ReadwriteSplittingDataSourceRuleNotFoundException;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceGroupRule;
diff --git
a/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/datasource/qualified/QualifiedDataSourceDeletedEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/datasource/qualified/QualifiedDataSourceDeletedEvent.java
similarity index 93%
rename from
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/datasource/qualified/QualifiedDataSourceDeletedEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/datasource/qualified/QualifiedDataSourceDeletedEvent.java
index ac1e4b1dee2..1007aec6713 100644
---
a/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/datasource/qualified/QualifiedDataSourceDeletedEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/deliver/datasource/qualified/QualifiedDataSourceDeletedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.dispatch.datasource.qualified;
+package org.apache.shardingsphere.mode.event.deliver.datasource.qualified;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java
similarity index 93%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java
index 44048938fe0..38058203560 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.state;
+package org.apache.shardingsphere.mode.persist.service;
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
-import org.apache.shardingsphere.mode.persist.service.StatePersistService;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriber.java
index 4d9bcd1f67b..5c29a54d04b 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/deliver/DeliverQualifiedDataSourceSubscriber.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver;
import com.google.common.eventbus.Subscribe;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
-import
org.apache.shardingsphere.mode.event.dispatch.datasource.qualified.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.datasource.qualified.QualifiedDataSourceDeletedEvent;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceStateSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceStateSubscriberTest.java
index 0440bed10a6..dbe95409d94 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceStateSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceStateSubscriberTest.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
-import
org.apache.shardingsphere.mode.event.dispatch.datasource.qualified.QualifiedDataSourceDeletedEvent;
+import
org.apache.shardingsphere.mode.event.deliver.datasource.qualified.QualifiedDataSourceDeletedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.event.subscriber.deliver.DeliverQualifiedDataSourceSubscriber;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGeneratorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/instance/workerid/ClusterWorkerIdGeneratorTest.java
similarity index 92%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGeneratorTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/instance/workerid/ClusterWorkerIdGeneratorTest.java
index 798977ab298..a26669d50dc 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/workerid/generator/ClusterWorkerIdGeneratorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/instance/workerid/ClusterWorkerIdGeneratorTest.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.workerid.generator;
+package org.apache.shardingsphere.mode.manager.cluster.instance.workerid;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
-import
org.apache.shardingsphere.mode.manager.cluster.instance.workerid.ClusterWorkerIdGenerator;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
