(shardingsphere) branch master updated: Refactor MetaDataPersistFacade (#35000)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 37493e81b30 Refactor MetaDataPersistFacade (#35000)
37493e81b30 is described below

commit 37493e81b308d9d533cb065a5b9dc772b5b65bb8
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Mar 15 20:27:55 2025 +0800

    Refactor MetaDataPersistFacade (#35000)
---
 .../mode/metadata/manager/rule/DatabaseRuleItemManager.java    |  2 +-
 .../mode/metadata/persist/MetaDataPersistFacade.java           | 10 +++++-----
 .../service/StandaloneMetaDataManagerPersistServiceTest.java   |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
index af5049ed9bf..7fd97cf58e3 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
@@ -56,7 +56,7 @@ public final class DatabaseRuleItemManager {
     public void alter(final DatabaseRuleNodePath databaseRuleNodePath) throws 
SQLException {
         RuleItemConfigurationChangedProcessor processor = 
TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class,
                 new RuleChangedItemType(databaseRuleNodePath.getRuleType(), 
databaseRuleNodePath.getDatabaseRuleItem().getType()));
-        String yamlContent = 
metaDataPersistFacade.getMetaDataVersionService().loadContent(new 
VersionNodePath(databaseRuleNodePath));
+        String yamlContent = 
metaDataPersistFacade.getVersionService().loadContent(new 
VersionNodePath(databaseRuleNodePath));
         String databaseName = 
databaseRuleNodePath.getDatabase().getDatabaseName();
         RuleConfiguration currentRuleConfig = 
processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
         String itemName = databaseRuleNodePath.getDatabaseRuleItem().getName();
diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacade.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacade.java
index a2222104142..f4fd12ab924 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacade.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistFacade.java
@@ -56,7 +56,7 @@ public final class MetaDataPersistFacade {
     
     private final PersistRepository repository;
     
-    private final VersionPersistService metaDataVersionService;
+    private final VersionPersistService versionService;
     
     private final DataSourceUnitPersistService dataSourceUnitService;
     
@@ -72,12 +72,12 @@ public final class MetaDataPersistFacade {
     
     public MetaDataPersistFacade(final PersistRepository repository) {
         this.repository = repository;
-        metaDataVersionService = new VersionPersistService(repository);
+        versionService = new VersionPersistService(repository);
         dataSourceUnitService = new DataSourceUnitPersistService(repository);
-        databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository, 
metaDataVersionService);
+        databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository, 
versionService);
         databaseRuleService = new DatabaseRulePersistService(repository);
-        globalRuleService = new GlobalRulePersistService(repository, 
metaDataVersionService);
-        propsService = new PropertiesPersistService(repository, 
metaDataVersionService);
+        globalRuleService = new GlobalRulePersistService(repository, 
versionService);
+        propsService = new PropertiesPersistService(repository, 
versionService);
         statisticsService = new StatisticsPersistService(repository);
     }
     
diff --git 
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
 
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index 886b582cd17..de4bc0a6680 100644
--- 
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++ 
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -166,7 +166,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
     @Test
     void assertAlterNullRuleConfiguration() throws SQLException {
         metaDataManagerPersistService.alterRuleConfiguration(new 
ShardingSphereDatabase("foo_db", mock(), mock(), mock(), 
Collections.emptyList()), null);
-        verify(metaDataPersistFacade, times(0)).getMetaDataVersionService();
+        verify(metaDataPersistFacade, times(0)).getVersionService();
     }
     
     @Test
@@ -195,7 +195,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
     @Test
     void assertRemoveNullRuleConfigurationItem() throws SQLException {
         metaDataManagerPersistService.removeRuleConfigurationItem(new 
ShardingSphereDatabase("foo_db", mock(), mock(), mock(), 
Collections.emptyList()), null);
-        verify(metaDataPersistFacade, times(0)).getMetaDataVersionService();
+        verify(metaDataPersistFacade, times(0)).getVersionService();
     }
     
     @Test