Refactor QualifiedDataSourceStatusService (#31188)

apache · May 9, 2024 · 359e4f2 · 359e4f2
1 parent 12e9e74
commit 359e4f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...itesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java b/...itesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java
@@ -78,7 +78,7 @@ private void checkBeforeUpdate(final AlterReadwriteSplittingStorageUnitStatusSta
     private void updateStatus(final ContextManager contextManager, final AlterReadwriteSplittingStorageUnitStatusStatement sqlStatement) {
         DataSourceState status = sqlStatement.isEnable() ? DataSourceState.ENABLED : DataSourceState.DISABLED;
         new QualifiedDataSourceStatusService(contextManager.getMetaDataContexts().getPersistService().getRepository())
-                .changeMemberQualifiedDataSourceStatus(database.getName(), sqlStatement.getRuleName(), sqlStatement.getStorageUnitName(), status);
+                .changeStatus(database.getName(), sqlStatement.getRuleName(), sqlStatement.getStorageUnitName(), status);
     }
 
     @Override

diff --git a/...java/org/apache/shardingsphere/mode/storage/service/QualifiedDataSourceStatusService.java b/...java/org/apache/shardingsphere/mode/storage/service/QualifiedDataSourceStatusService.java
@@ -45,7 +45,7 @@ public final class QualifiedDataSourceStatusService {
      *
      * @return qualified data source status
      */
-    public Map<String, QualifiedDataSourceStatus> loadQualifiedDataSourceStatus() {
+    public Map<String, QualifiedDataSourceStatus> loadStatus() {
         Collection<String> qualifiedDataSourceNodes = repository.getChildrenKeys(QualifiedDataSourceNode.getRootPath());
         Map<String, QualifiedDataSourceStatus> result = new HashMap<>(qualifiedDataSourceNodes.size(), 1F);
         qualifiedDataSourceNodes.forEach(each -> {
@@ -58,16 +58,16 @@ public Map<String, QualifiedDataSourceStatus> loadQualifiedDataSourceStatus() {
     }
 
     /**
-     * Change member qualified data source status.
+     * Change qualified data source status.
      *
      * @param databaseName database name
      * @param groupName group name
      * @param storageUnitName storage unit name
      * @param dataSourceState data source state
      */
-    public void changeMemberQualifiedDataSourceStatus(final String databaseName, final String groupName, final String storageUnitName, final DataSourceState dataSourceState) {
+    public void changeStatus(final String databaseName, final String groupName, final String storageUnitName, final DataSourceState dataSourceState) {
         QualifiedDataSourceStatus status = new QualifiedDataSourceStatus(dataSourceState);
-        repository.persist(QualifiedDataSourceNode.getQualifiedDataSourceNodePath(new QualifiedDataSource(databaseName, groupName, storageUnitName)),
-                YamlEngine.marshal(new YamlQualifiedDataSourceStatusSwapper().swapToYamlConfiguration(status)));
+        repository.persist(QualifiedDataSourceNode.getQualifiedDataSourceNodePath(
+                new QualifiedDataSource(databaseName, groupName, storageUnitName)), YamlEngine.marshal(new YamlQualifiedDataSourceStatusSwapper().swapToYamlConfiguration(status)));
     }
 }
diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -55,7 +55,7 @@ public ContextManager build(final ContextManagerBuilderParameter param) throws S
         }
         MetaDataPersistService persistService = new MetaDataPersistService(repository);
         MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(
-                persistService, param, instanceContext, registryCenter.getQualifiedDataSourceStatusService().loadQualifiedDataSourceStatus());
+                persistService, param, instanceContext, registryCenter.getQualifiedDataSourceStatusService().loadStatus());
         ContextManager result = new ContextManager(metaDataContexts, instanceContext);
         setContextManagerAware(result);
         registerOnline(registryCenter, param, result);

diff --git a/...ter/coordinator/registry/status/storage/service/QualifiedDataSourceStatusServiceTest.java b/...ter/coordinator/registry/status/storage/service/QualifiedDataSourceStatusServiceTest.java
@@ -38,9 +38,9 @@ class QualifiedDataSourceStatusServiceTest {
     private ClusterPersistRepository repository;
 
     @Test
-    void assertLoadDisabledDataSources() {
+    void assertLoadStatus() {
         List<String> disabledDataSources = Arrays.asList("replica_query_db.readwrite_ds.replica_ds_0", "other_schema.other_ds.other_ds0");
         when(repository.getChildrenKeys(anyString())).thenReturn(disabledDataSources);
-        assertDoesNotThrow(() -> new QualifiedDataSourceStatusService(repository).loadQualifiedDataSourceStatus());
+        assertDoesNotThrow(() -> new QualifiedDataSourceStatusService(repository).loadStatus());
     }
 }