This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 06ef1d68846 Move QualifiedDataSourceState and Yaml swapper to infra
(#31947)
06ef1d68846 is described below
commit 06ef1d68846af6c881370d88641eaea55bc1267d
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Jul 1 18:04:02 2024 +0800
Move QualifiedDataSourceState and Yaml swapper to infra (#31947)
---
.../state/datasource/qualified}/QualifiedDataSourceState.java | 2 +-
.../datasource/qualified}/yaml/YamlQualifiedDataSourceState.java | 4 ++--
.../qualified}/yaml/YamlQualifiedDataSourceStateSwapper.java | 8 ++++----
.../service/persist/QualifiedDataSourceStatePersistService.java | 6 +++---
.../nodes/storage/event/QualifiedDataSourceStateEvent.java | 2 +-
.../event/builder/QualifiedDataSourceDispatchEventBuilder.java | 6 +++---
.../storage/subscriber/QualifiedDataSourceSubscriberTest.java | 2 +-
.../watcher/QualifiedDataSourceDispatchEventBuilderTest.java | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/QualifiedDataSourceState.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/QualifiedDataSourceState.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/QualifiedDataSourceState.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/QualifiedDataSourceState.java
index 48cf886986e..c32b8f354a6 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/QualifiedDataSourceState.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/QualifiedDataSourceState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.storage;
+package org.apache.shardingsphere.infra.state.datasource.qualified;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceState.java
similarity index 91%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceState.java
index 6b5d4ebf139..451e2051c23 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceState.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.storage.yaml;
+package org.apache.shardingsphere.infra.state.datasource.qualified.yaml;
import lombok.Getter;
import lombok.Setter;
@@ -28,5 +28,5 @@ import
org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
@Setter
public final class YamlQualifiedDataSourceState implements YamlConfiguration {
- private String status;
+ private String state;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceStateSwapper.java
similarity index 86%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceStateSwapper.java
index c789b268764..20b2dec150f 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/yaml/YamlQualifiedDataSourceStateSwapper.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/state/datasource/qualified/yaml/YamlQualifiedDataSourceStateSwapper.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.storage.yaml;
+package org.apache.shardingsphere.infra.state.datasource.qualified.yaml;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
import
org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
/**
* YAML qualified data source state swapper.
@@ -29,12 +29,12 @@ public final class YamlQualifiedDataSourceStateSwapper
implements YamlConfigurat
@Override
public YamlQualifiedDataSourceState swapToYamlConfiguration(final
QualifiedDataSourceState data) {
YamlQualifiedDataSourceState result = new
YamlQualifiedDataSourceState();
- result.setStatus(data.getState().name());
+ result.setState(data.getState().name());
return result;
}
@Override
public QualifiedDataSourceState swapToObject(final
YamlQualifiedDataSourceState yamlConfig) {
- return new
QualifiedDataSourceState(DataSourceState.valueOf(yamlConfig.getStatus()));
+ return new
QualifiedDataSourceState(DataSourceState.valueOf(yamlConfig.getState()));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
index 92e9275c361..6d7325f1f41 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/persist/QualifiedDataSourceStatePersistService.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSou
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.spi.PersistRepository;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceState;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStateSwapper;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper;
import java.util.Collection;
import java.util.HashMap;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/QualifiedDataSourceStateEvent.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/QualifiedDataSourceStateEvent.java
index 4a2ee61f70f..7c82381e3a2 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/QualifiedDataSourceStateEvent.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/QualifiedDataSourceStateEvent.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
/**
* Storage node changed event.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
index db5576e9103..2202b028906 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/event/builder/QualifiedDataSourceDispatchEventBuilder.java
@@ -25,10 +25,10 @@ import
org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.DispatchEventBuilder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceState;
-import
org.apache.shardingsphere.mode.storage.yaml.YamlQualifiedDataSourceStateSwapper;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/subscriber/QualifiedDataSourceSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/subscriber/QualifiedDataSourceSubscriberTest.java
index 2afaca2611e..e13c1d34df1 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/subscriber/QualifiedDataSourceSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/nodes/storage/subscriber/QualifiedDataSourceSubscriberTest.java
@@ -36,7 +36,7 @@ import
org.apache.shardingsphere.mode.manager.cluster.ClusterContextManagerBuild
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.nodes.storage.event.QualifiedDataSourceStateEvent;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
-import org.apache.shardingsphere.mode.storage.QualifiedDataSourceState;
+import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
index b5587b637e3..bdf3c48fc0d 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/watcher/QualifiedDataSourceDispatchEventBuilderTest.java
@@ -37,7 +37,7 @@ class QualifiedDataSourceDispatchEventBuilderTest {
@Test
void assertCreateEnabledQualifiedDataSourceChangedEvent() {
Optional<GovernanceEvent> actual = new
QualifiedDataSourceDispatchEventBuilder().build(
- new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"status: ENABLED\n", Type.ADDED));
+ new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"state: ENABLED\n", Type.ADDED));
assertTrue(actual.isPresent());
QualifiedDataSourceStateEvent actualEvent =
(QualifiedDataSourceStateEvent) actual.get();
assertThat(actualEvent.getQualifiedDataSource().getDatabaseName(),
is("replica_query_db"));
@@ -49,7 +49,7 @@ class QualifiedDataSourceDispatchEventBuilderTest {
@Test
void assertCreateDisabledQualifiedDataSourceChangedEvent() {
Optional<GovernanceEvent> actual = new
QualifiedDataSourceDispatchEventBuilder().build(
- new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"status: DISABLED\n", Type.DELETED));
+ new
DataChangedEvent("/nodes/qualified_data_sources/replica_query_db.readwrite_ds.replica_ds_0",
"state: DISABLED\n", Type.DELETED));
assertTrue(actual.isPresent());
QualifiedDataSourceStateEvent actualEvent =
(QualifiedDataSourceStateEvent) actual.get();
assertThat(actualEvent.getQualifiedDataSource().getDatabaseName(),
is("replica_query_db"));
