Refactor StandaloneMetaDataManagerPersistService (#35002)

Author: terrymanu

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java

@@ -78,12 +78,7 @@ public void createDatabase(final String databaseName) {
         MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
         metaDataPersistFacade.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
         clusterDatabaseListenerPersistCoordinator.persist(databaseName, ClusterDatabaseListenerCoordinatorType.CREATE);
-        afterDatabaseCreated(databaseName, originalMetaDataContexts);
-    }
-    
-    private void afterDatabaseCreated(final String databaseName, final MetaDataContexts originalMetaDataContexts) {
-        MetaDataContexts reloadMetaDataContexts = getReloadedMetaDataContexts(originalMetaDataContexts);
-        metaDataPersistFacade.persistReloadDatabaseByAlter(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
+        metaDataPersistFacade.persistReloadDatabaseByAlter(databaseName, getReloadedMetaDataContexts(originalMetaDataContexts).getMetaData().getDatabase(databaseName),
                 originalMetaDataContexts.getMetaData().getDatabase(databaseName));
     }
 

mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java

@@ -82,14 +82,14 @@ public void createDatabase(final String databaseName) {
         metaDataContextManager.getDatabaseMetaDataManager().addDatabase(databaseName);
         metaDataPersistFacade.persistReloadDatabaseByAlter(databaseName, metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName),
                 originalMetaDataContexts.getMetaData().getDatabase(databaseName));
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
     public void dropDatabase(final ShardingSphereDatabase database) {
         metaDataPersistFacade.getDatabaseMetaDataFacade().getDatabase().drop(database.getName());
         metaDataContextManager.getDatabaseMetaDataManager().dropDatabase(database.getName());
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
@@ -164,7 +164,7 @@ public void registerStorageUnits(final String databaseName, final Map<String, Da
         MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
         metaDataPersistFacade.getDataSourceUnitService().persist(databaseName, toBeRegisteredProps);
         afterStorageUnitsRegistered(databaseName, originalMetaDataContexts, toBeRegisteredProps);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     private void afterStorageUnitsRegistered(final String databaseName, final MetaDataContexts originalMetaDataContexts,
@@ -181,7 +181,7 @@ public void alterStorageUnits(final ShardingSphereDatabase database, final Map<S
         MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
         metaDataPersistFacade.getDataSourceUnitService().persist(database.getName(), toBeUpdatedProps);
         afterStorageUnitsAltered(database.getName(), originalMetaDataContexts, toBeUpdatedProps);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     private void afterStorageUnitsAltered(final String databaseName, final MetaDataContexts originalMetaDataContexts, final Map<String, DataSourcePoolProperties> toBeRegisteredProps) {
@@ -198,7 +198,7 @@ public void unregisterStorageUnits(final ShardingSphereDatabase database, final
             metaDataPersistFacade.getDataSourceUnitService().delete(database.getName(), each);
             afterStorageUnitsUnregistered(database.getName(), each);
         }
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     private void afterStorageUnitsUnregistered(final String databaseName, final String storageUnitName) {
@@ -230,7 +230,7 @@ public void alterSingleRuleConfiguration(final ShardingSphereDatabase database,
         SingleRuleConfiguration singleRuleConfig = ruleMetaData.getSingleRule(SingleRule.class).getConfiguration();
         metaDataPersistFacade.getDatabaseRuleService().persist(database.getName(), Collections.singleton(singleRuleConfig));
         metaDataContextManager.getDatabaseRuleConfigurationManager().refresh(database.getName(), singleRuleConfig, true);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
@@ -247,7 +247,7 @@ && new ActiveVersionChecker(metaDataPersistFacade.getRepository()).checkSame(new
             }
         }
         reloadAlteredTables(database.getName(), needReloadTables);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
@@ -264,7 +264,7 @@ public void removeRuleConfigurationItem(final ShardingSphereDatabase database, f
             }
         }
         reloadAlteredTables(database.getName(), needReloadTables);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     private void reloadAlteredTables(final String databaseName, final Collection<String> needReloadTables) {
@@ -281,7 +281,7 @@ private void reloadAlteredTables(final String databaseName, final Collection<Str
                 tables.forEach(each -> metaDataContextManager.getDatabaseMetaDataManager().alterTable(databaseName, entry.getKey(), each));
             }
         } catch (final SQLException ex) {
-            log.error("Load table meta failed, databaseName:{}, needReloadTables:{}", databaseName, needReloadTables, ex);
+            log.error("Load table meta failed, databaseName: {}, needReloadTables: {}", databaseName, needReloadTables, ex);
             throw new LoadTableMetaDataFailedException();
         }
     }
@@ -297,24 +297,20 @@ private Collection<String> getNeedReloadTables(final ShardingSphereDatabase orig
     @Override
     public void removeRuleConfiguration(final ShardingSphereDatabase database, final String ruleType) {
         metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), ruleType);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
     public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRuleConfig) {
         metaDataPersistFacade.getGlobalRuleService().persist(Collections.singleton(toBeAlteredRuleConfig));
         metaDataContextManager.getGlobalConfigurationManager().alterGlobalRuleConfiguration(toBeAlteredRuleConfig);
-        clearServiceCache();
+        OrderedServicesCache.clearCache();
     }
 
     @Override
     public void alterProperties(final Properties props) {
         metaDataPersistFacade.getPropsService().persist(props);
         metaDataContextManager.getGlobalConfigurationManager().alterProperties(props);
-        clearServiceCache();
-    }
-    
-    private void clearServiceCache() {
         OrderedServicesCache.clearCache();
     }
 }