This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 b77cca2de27 Mode QualifiedDataSourceNode from mode to kernel (#31979)
b77cca2de27 is described below
commit b77cca2de27663e84862c352ed8ad6fecb1c6eee
Author: Haoran Meng <[email protected]>
AuthorDate: Thu Jul 4 16:10:59 2024 +0800
Mode QualifiedDataSourceNode from mode to kernel (#31979)
---
.../metadata/persist}/node/QualifiedDataSourceNode.java | 2 +-
.../core/job/statistics/collect/StatisticsCollectJob.java | 10 +++++-----
.../core/job/statistics/collect/StatisticsCollectJobTest.java | 4 ++--
.../shardingsphere/mode/persist/PersistServiceFacade.java | 4 ++--
...taAlteredPOJO.java => AlteredShardingSphereSchemaData.java} | 4 ++--
.../pojo/{ListenerAssistedPOJO.java => ListenerAssisted.java} | 4 ++--
.../mode/persist/service/ListenerAssistedPersistService.java | 8 ++++----
.../service/QualifiedDataSourceStatePersistService.java | 2 +-
.../event/builder/ListenerAssistedDispatchEventBuilder.java | 4 ++--
.../event/builder/QualifiedDataSourceDispatchEventBuilder.java | 2 +-
.../deliver/DeliverQualifiedDataSourceSubscriber.java | 2 +-
.../cluster/persist/ClusterMetaDataManagerPersistService.java | 6 +++---
.../status/storage/node/QualifiedDataSourceNodeTest.java | 2 +-
.../dispatch/QualifiedDataSourceStateSubscriberTest.java | 2 +-
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/node/QualifiedDataSourceNode.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/QualifiedDataSourceNode.java
similarity index 97%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/storage/node/QualifiedDataSourceNode.java
rename to
kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/QualifiedDataSourceNode.java
index f457780f253..735371e5348 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/storage/node/QualifiedDataSourceNode.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/node/QualifiedDataSourceNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.storage.node;
+package org.apache.shardingsphere.metadata.persist.node;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
index b7a650ee923..d272f55041c 100644
---
a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
+++
b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSph
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.infra.yaml.data.swapper.YamlShardingSphereRowDataSwapper;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import
org.apache.shardingsphere.mode.persist.pojo.ShardingSphereSchemaDataAlteredPOJO;
+import
org.apache.shardingsphere.mode.persist.pojo.AlteredShardingSphereSchemaData;
import java.util.ArrayList;
import java.util.Map;
@@ -134,13 +134,13 @@ public final class StatisticsCollectJob implements
SimpleJob {
return;
}
statistics.getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().put(changedTableData.getName().toLowerCase(),
changedTableData);
- ShardingSphereSchemaDataAlteredPOJO schemaDataAlteredPOJO =
getShardingSphereSchemaDataAlteredPOJO(databaseName, schemaName, tableData,
changedTableData, table);
+ AlteredShardingSphereSchemaData schemaDataAlteredPOJO =
getShardingSphereSchemaDataAlteredPOJO(databaseName, schemaName, tableData,
changedTableData, table);
contextManager.getPersistServiceFacade().persist(schemaDataAlteredPOJO);
}
- private ShardingSphereSchemaDataAlteredPOJO
getShardingSphereSchemaDataAlteredPOJO(final String databaseName, final String
schemaName, final ShardingSphereTableData tableData,
-
final ShardingSphereTableData changedTableData, final
ShardingSphereTable table) {
- ShardingSphereSchemaDataAlteredPOJO result = new
ShardingSphereSchemaDataAlteredPOJO(databaseName, schemaName,
tableData.getName());
+ private AlteredShardingSphereSchemaData
getShardingSphereSchemaDataAlteredPOJO(final String databaseName, final String
schemaName, final ShardingSphereTableData tableData,
+
final ShardingSphereTableData changedTableData, final ShardingSphereTable
table) {
+ AlteredShardingSphereSchemaData result = new
AlteredShardingSphereSchemaData(databaseName, schemaName, tableData.getName());
Map<String, ShardingSphereRowData> tableDataMap =
tableData.getRows().stream().collect(Collectors.toMap(ShardingSphereRowData::getUniqueKey,
Function.identity()));
Map<String, ShardingSphereRowData> changedTableDataMap =
changedTableData.getRows().stream().collect(Collectors.toMap(ShardingSphereRowData::getUniqueKey,
Function.identity()));
YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getColumnValues()));
diff --git
a/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobTest.java
b/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobTest.java
index 7a2af6b30f2..c80faebce8d 100644
---
a/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobTest.java
+++
b/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJobTest.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereSchemaD
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
import org.apache.shardingsphere.mode.manager.ContextManager;
-import
org.apache.shardingsphere.mode.persist.pojo.ShardingSphereSchemaDataAlteredPOJO;
+import
org.apache.shardingsphere.mode.persist.pojo.AlteredShardingSphereSchemaData;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
@@ -60,7 +60,7 @@ class StatisticsCollectJobTest {
when(contextManager.getMetaDataContexts().getMetaData().getTemporaryProps()).thenReturn(new
TemporaryConfigurationProperties(
PropertiesBuilder.build(new
Property(TemporaryConfigurationPropertyKey.PROXY_META_DATA_COLLECTOR_ENABLED.getKey(),
Boolean.TRUE.toString()))));
new StatisticsCollectJob(contextManager).execute(null);
-
verify(contextManager.getPersistServiceFacade()).persist(any(ShardingSphereSchemaDataAlteredPOJO.class));
+
verify(contextManager.getPersistServiceFacade()).persist(any(AlteredShardingSphereSchemaData.class));
}
private ShardingSphereStatistics mockStatistics() {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
index d89324ee4cb..2c34b1b0910 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistServ
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
import org.apache.shardingsphere.mode.persist.service.ProcessPersistService;
import
org.apache.shardingsphere.mode.persist.service.QualifiedDataSourceStatePersistService;
-import
org.apache.shardingsphere.mode.persist.pojo.ShardingSphereSchemaDataAlteredPOJO;
+import
org.apache.shardingsphere.mode.persist.pojo.AlteredShardingSphereSchemaData;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.apache.shardingsphere.mode.persist.service.StatePersistService;
@@ -71,7 +71,7 @@ public final class PersistServiceFacade {
*
* @param schemaDataAlteredPOJO sharding sphere schema data
*/
- public void persist(final ShardingSphereSchemaDataAlteredPOJO
schemaDataAlteredPOJO) {
+ public void persist(final AlteredShardingSphereSchemaData
schemaDataAlteredPOJO) {
String databaseName = schemaDataAlteredPOJO.getDatabaseName();
String schemaName = schemaDataAlteredPOJO.getSchemaName();
metaDataPersistService.getShardingSphereDataPersistService().getTableRowDataPersistService().persist(databaseName,
schemaName, schemaDataAlteredPOJO.getTableName(),
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ShardingSphereSchemaDataAlteredPOJO.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/AlteredShardingSphereSchemaData.java
similarity index 94%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ShardingSphereSchemaDataAlteredPOJO.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/AlteredShardingSphereSchemaData.java
index d1c6b53e63a..30d056be951 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ShardingSphereSchemaDataAlteredPOJO.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/AlteredShardingSphereSchemaData.java
@@ -25,11 +25,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Schema altered pojo.
+ * Altered shardingSphere schema data.
*/
@RequiredArgsConstructor
@Getter
-public final class ShardingSphereSchemaDataAlteredPOJO {
+public final class AlteredShardingSphereSchemaData {
private final String databaseName;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssistedPOJO.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssisted.java
similarity index 92%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssistedPOJO.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssisted.java
index 7e436d68a42..1f16695f1ee 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssistedPOJO.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/pojo/ListenerAssisted.java
@@ -24,13 +24,13 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
/**
- * Listener assisted pojo.
+ * Listener assisted.
*/
@AllArgsConstructor
@NoArgsConstructor
@Getter
@Setter
-public final class ListenerAssistedPOJO implements YamlConfiguration {
+public final class ListenerAssisted implements YamlConfiguration {
private String databaseName;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ListenerAssistedPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ListenerAssistedPersistService.java
index b449ff7f5a0..5f4dd083df7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ListenerAssistedPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ListenerAssistedPersistService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.persist.service;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.path.ListenerAssistedNodePath;
-import org.apache.shardingsphere.mode.persist.pojo.ListenerAssistedPOJO;
+import org.apache.shardingsphere.mode.persist.pojo.ListenerAssisted;
import org.apache.shardingsphere.mode.spi.PersistRepository;
/**
@@ -34,10 +34,10 @@ public final class ListenerAssistedPersistService {
/**
* Persist database name listener assisted.
*
- * @param listenerAssistedPOJO listener assisted pojo
+ * @param listenerAssisted listener assisted pojo
*/
- public void persistDatabaseNameListenerAssisted(final ListenerAssistedPOJO
listenerAssistedPOJO) {
-
repository.persistEphemeral(ListenerAssistedNodePath.getDatabaseNameNodePath(listenerAssistedPOJO.getDatabaseName()),
YamlEngine.marshal(listenerAssistedPOJO));
+ public void persistDatabaseNameListenerAssisted(final ListenerAssisted
listenerAssisted) {
+
repository.persistEphemeral(ListenerAssistedNodePath.getDatabaseNameNodePath(listenerAssisted.getDatabaseName()),
YamlEngine.marshal(listenerAssisted));
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/QualifiedDataSourceStatePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/QualifiedDataSourceStatePersistService.java
index 826623a24ef..d6e1579b8c4 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/QualifiedDataSourceStatePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/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.PersistRepository;
import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
-import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
+import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState;
import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ListenerAssistedDispatchEventBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ListenerAssistedDispatchEventBuilder.java
index ce57eb2999b..cbd24d82afc 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ListenerAssistedDispatchEventBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ListenerAssistedDispatchEventBuilder.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.event.dispatch.assisted.DropDatabaseListenerAssistedEvent;
import
org.apache.shardingsphere.mode.event.dispatch.assisted.CreateDatabaseListenerAssistedEvent;
import org.apache.shardingsphere.mode.persist.pojo.ListenerAssistedType;
-import org.apache.shardingsphere.mode.persist.pojo.ListenerAssistedPOJO;
+import org.apache.shardingsphere.mode.persist.pojo.ListenerAssisted;
import org.apache.shardingsphere.mode.path.ListenerAssistedNodePath;
import java.util.Arrays;
@@ -53,7 +53,7 @@ public class ListenerAssistedDispatchEventBuilder implements
DispatchEventBuilde
if (!databaseName.isPresent()) {
return Optional.empty();
}
- ListenerAssistedPOJO data = YamlEngine.unmarshal(event.getValue(),
ListenerAssistedPOJO.class);
+ ListenerAssisted data = YamlEngine.unmarshal(event.getValue(),
ListenerAssisted.class);
if (ListenerAssistedType.CREATE_DATABASE ==
data.getListenerAssistedType()) {
return Optional.of(new
CreateDatabaseListenerAssistedEvent(databaseName.get()));
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/QualifiedDataSourceDispatchEventBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/QualifiedDataSourceDispatchEventBuilder.java
index 51f2d6c99a5..b5b60ad1241 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/QualifiedDataSourceDispatchEventBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/QualifiedDataSourceDispatchEventBuilder.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.event.dispatch.state.storage.QualifiedDataSourceStateEvent;
import
org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
-import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
+import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceState;
import
org.apache.shardingsphere.infra.state.datasource.qualified.yaml.YamlQualifiedDataSourceStateSwapper;
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 5c29a54d04b..c7c78be8b02 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
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber;
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;
+import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
/**
* Deliver data source status subscriber.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java
index 8d89a4c6b75..ab5b3bef573 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.persist.pojo.ListenerAssistedType;
import
org.apache.shardingsphere.mode.persist.service.ListenerAssistedPersistService;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
-import org.apache.shardingsphere.mode.persist.pojo.ListenerAssistedPOJO;
+import org.apache.shardingsphere.mode.persist.pojo.ListenerAssisted;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
@@ -62,13 +62,13 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataService().addDatabase(databaseName);
- listenerAssistedPersistService.persistDatabaseNameListenerAssisted(new
ListenerAssistedPOJO(databaseName, ListenerAssistedType.CREATE_DATABASE));
+ listenerAssistedPersistService.persistDatabaseNameListenerAssisted(new
ListenerAssisted(databaseName, ListenerAssistedType.CREATE_DATABASE));
}
@Override
public void dropDatabase(final String databaseName) {
String droppedDatabaseName =
metaDataContextManager.getMetaDataContexts().get().getMetaData().getDatabase(databaseName).getName();
- listenerAssistedPersistService.persistDatabaseNameListenerAssisted(new
ListenerAssistedPOJO(droppedDatabaseName, ListenerAssistedType.DROP_DATABASE));
+ listenerAssistedPersistService.persistDatabaseNameListenerAssisted(new
ListenerAssisted(droppedDatabaseName, ListenerAssistedType.DROP_DATABASE));
metaDataPersistService.getDatabaseMetaDataService().dropDatabase(droppedDatabaseName);
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/node/QualifiedDataSourceNodeTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/node/QualifiedDataSourceNodeTest.java
index 5b691272735..42d7d57d3bc 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/node/QualifiedDataSourceNodeTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/storage/node/QualifiedDataSourceNodeTest.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.node;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
-import org.apache.shardingsphere.mode.storage.node.QualifiedDataSourceNode;
+import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
import org.junit.jupiter.api.Test;
import java.util.Optional;
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 dbe95409d94..f1c337760b6 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSou
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;
+import org.apache.shardingsphere.metadata.persist.node.QualifiedDataSourceNode;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
