This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 c87ce3a29a6 Move schema and rule item event from mode-core to mode-api
(#31953)
c87ce3a29a6 is described below
commit c87ce3a29a64ba08274500a2605ff641ee43265a
Author: Haoran Meng <[email protected]>
AuthorDate: Tue Jul 2 12:08:27 2024 +0800
Move schema and rule item event from mode-core to mode-api (#31953)
---
.../event/handler/impl/BarrierMetaDataChangedEventHandler.java | 2 +-
.../org/apache/shardingsphere/mode/event/DataChangedEvent.java | 0
.../event/dispatch/rule}/NamedRuleItemChangedEventCreator.java | 3 ++-
.../dispatch/rule}/UniqueRuleItemChangedEventCreator.java | 3 ++-
.../event/dispatch}/schema/table/CreateOrAlterTableEvent.java | 2 +-
.../mode/event/dispatch}/schema/table/DropTableEvent.java | 2 +-
.../event/dispatch}/schema/view/CreateOrAlterViewEvent.java | 2 +-
.../mode/event/dispatch}/schema/view/DropViewEvent.java | 2 +-
.../dispatch/rule}/NamedRuleItemChangedEventCreatorTest.java | 3 ++-
.../dispatch/rule}/UniqueRuleItemChangedEventCreatorTest.java | 3 ++-
.../mode/metadata/builder/RuleConfigurationEventBuilder.java | 10 +++++-----
.../cluster/coordinator/listener/MetaDataChangedListener.java | 8 ++++----
.../subscriber/ResourceMetaDataChangedSubscriber.java | 8 ++++----
13 files changed, 26 insertions(+), 22 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/event/handler/impl/BarrierMetaDataChangedEventHandler.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/event/handler/impl/BarrierMetaDataChangedEventHandler.java
index 4b08ad461c3..d8238512142 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/event/handler/impl/BarrierMetaDataChangedEventHandler.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/event/handler/impl/BarrierMetaDataChangedEventHandler.java
@@ -17,10 +17,10 @@
package
org.apache.shardingsphere.data.pipeline.core.metadata.node.event.handler.impl;
+import org.apache.shardingsphere.data.pipeline.core.job.id.PipelineJobIdUtils;
import
org.apache.shardingsphere.data.pipeline.core.metadata.node.PipelineMetaDataNode;
import
org.apache.shardingsphere.data.pipeline.core.metadata.node.event.handler.PipelineMetaDataChangedEventHandler;
import
org.apache.shardingsphere.data.pipeline.core.util.PipelineDistributedBarrier;
-import org.apache.shardingsphere.data.pipeline.core.job.id.PipelineJobIdUtils;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/DataChangedEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/DataChangedEvent.java
similarity index 100%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/DataChangedEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/DataChangedEvent.java
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreator.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreator.java
similarity index 93%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreator.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreator.java
index 82df9526c56..2902ad93a4a 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreator.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreator.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event;
+package org.apache.shardingsphere.mode.event.dispatch.rule;
import org.apache.shardingsphere.infra.rule.event.rule.RuleItemChangedEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.alter.AlterNamedRuleItemEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreator.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreator.java
similarity index 93%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreator.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreator.java
index 2da86e5a86d..789100ad051 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreator.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreator.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event;
+package org.apache.shardingsphere.mode.event.dispatch.rule;
import org.apache.shardingsphere.infra.rule.event.rule.RuleItemChangedEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.alter.AlterUniqueRuleItemEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.drop.DropUniqueRuleItemEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/CreateOrAlterTableEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/CreateOrAlterTableEvent.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/CreateOrAlterTableEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/CreateOrAlterTableEvent.java
index 35d2cf225fb..51a62f0b4cf 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/CreateOrAlterTableEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/CreateOrAlterTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.schema.table;
+package org.apache.shardingsphere.mode.event.dispatch.schema.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/DropTableEvent.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/DropTableEvent.java
index 39378fa29da..3b819fb166e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/table/DropTableEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/table/DropTableEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.schema.table;
+package org.apache.shardingsphere.mode.event.dispatch.schema.table;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/CreateOrAlterViewEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/CreateOrAlterViewEvent.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/CreateOrAlterViewEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/CreateOrAlterViewEvent.java
index a003b3f4ee2..2bebe029b41 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/CreateOrAlterViewEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/CreateOrAlterViewEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.schema.view;
+package org.apache.shardingsphere.mode.event.dispatch.schema.view;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/DropViewEvent.java
similarity index 95%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
rename to
mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/DropViewEvent.java
index 9c881bf8c3f..f8f097ae206 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/schema/view/DropViewEvent.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/event/dispatch/schema/view/DropViewEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event.schema.view;
+package org.apache.shardingsphere.mode.event.dispatch.schema.view;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreatorTest.java
b/mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreatorTest.java
similarity index 95%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreatorTest.java
rename to
mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreatorTest.java
index b1050878d9e..f2916f6fff4 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/NamedRuleItemChangedEventCreatorTest.java
+++
b/mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/NamedRuleItemChangedEventCreatorTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event;
+package org.apache.shardingsphere.mode.event.dispatch.rule;
import org.apache.shardingsphere.infra.rule.event.rule.RuleItemChangedEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.alter.AlterNamedRuleItemEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.drop.DropNamedRuleItemEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreatorTest.java
b/mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreatorTest.java
similarity index 95%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreatorTest.java
rename to
mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreatorTest.java
index 818f6ee25a8..8a981680f04 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/event/UniqueRuleItemChangedEventCreatorTest.java
+++
b/mode/api/src/test/java/org/apache/shardingsphere/mode/event/dispatch/rule/UniqueRuleItemChangedEventCreatorTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.event;
+package org.apache.shardingsphere.mode.event.dispatch.rule;
import org.apache.shardingsphere.infra.rule.event.rule.RuleItemChangedEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.alter.AlterUniqueRuleItemEvent;
import
org.apache.shardingsphere.infra.rule.event.rule.drop.DropUniqueRuleItemEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/builder/RuleConfigurationEventBuilder.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/builder/RuleConfigurationEventBuilder.java
index 758c5b8460f..183afa60107 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/builder/RuleConfigurationEventBuilder.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/builder/RuleConfigurationEventBuilder.java
@@ -18,15 +18,15 @@
package org.apache.shardingsphere.mode.metadata.builder;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.mode.path.rule.RuleNodePath;
-import org.apache.shardingsphere.mode.path.rule.item.NamedRuleItemNodePath;
-import org.apache.shardingsphere.mode.path.rule.item.UniqueRuleItemNodePath;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.event.NamedRuleItemChangedEventCreator;
-import org.apache.shardingsphere.mode.event.UniqueRuleItemChangedEventCreator;
+import
org.apache.shardingsphere.mode.event.dispatch.rule.NamedRuleItemChangedEventCreator;
+import
org.apache.shardingsphere.mode.event.dispatch.rule.UniqueRuleItemChangedEventCreator;
+import org.apache.shardingsphere.mode.path.rule.RuleNodePath;
+import org.apache.shardingsphere.mode.path.rule.item.NamedRuleItemNodePath;
+import org.apache.shardingsphere.mode.path.rule.item.UniqueRuleItemNodePath;
import org.apache.shardingsphere.mode.spi.RuleNodePathProvider;
import java.util.Map.Entry;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/MetaDataChangedListener.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/MetaDataChangedListener.java
index 58c2fc92c98..3c8fd29e748 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/MetaDataChangedListener.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/listener/MetaDataChangedListener.java
@@ -33,10 +33,10 @@ import
org.apache.shardingsphere.mode.event.dispatch.datasource.nodes.Unregister
import
org.apache.shardingsphere.mode.event.dispatch.datasource.unit.AlterStorageUnitEvent;
import
org.apache.shardingsphere.mode.event.dispatch.datasource.unit.RegisterStorageUnitEvent;
import
org.apache.shardingsphere.mode.event.dispatch.datasource.unit.UnregisterStorageUnitEvent;
-import
org.apache.shardingsphere.mode.event.schema.table.CreateOrAlterTableEvent;
-import org.apache.shardingsphere.mode.event.schema.table.DropTableEvent;
-import org.apache.shardingsphere.mode.event.schema.view.CreateOrAlterViewEvent;
-import org.apache.shardingsphere.mode.event.schema.view.DropViewEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.table.CreateOrAlterTableEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.table.DropTableEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.view.CreateOrAlterViewEvent;
+import org.apache.shardingsphere.mode.event.dispatch.schema.view.DropViewEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
import
org.apache.shardingsphere.mode.metadata.builder.RuleConfigurationEventBuilder;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
index cb3bf443818..a3b6e1dd377 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ResourceMetaDataChangedSubscriber.java
@@ -22,10 +22,10 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
-import
org.apache.shardingsphere.mode.event.schema.table.CreateOrAlterTableEvent;
-import org.apache.shardingsphere.mode.event.schema.table.DropTableEvent;
-import org.apache.shardingsphere.mode.event.schema.view.CreateOrAlterViewEvent;
-import org.apache.shardingsphere.mode.event.schema.view.DropViewEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.table.CreateOrAlterTableEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.table.DropTableEvent;
+import
org.apache.shardingsphere.mode.event.dispatch.schema.view.CreateOrAlterViewEvent;
+import org.apache.shardingsphere.mode.event.dispatch.schema.view.DropViewEvent;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaAddedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.event.SchemaDeletedEvent;
