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 e456bdf50ae Mini refactor for StandaloneMetaDataManagerPersistService
(#37687)
e456bdf50ae is described below
commit e456bdf50aecba565bd07ce55dbaea8a0b53b01a
Author: Haoran Meng <[email protected]>
AuthorDate: Thu Jan 8 18:01:01 2026 +0800
Mini refactor for StandaloneMetaDataManagerPersistService (#37687)
---
.../StandaloneMetaDataManagerPersistService.java | 24 +++++++++++++---------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index e373f1acc41..7cb9425f022 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -71,14 +71,14 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
metaDataPersistFacade.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
metaDataContextManager.getDatabaseMetaDataManager().addDatabase(databaseName);
metaDataPersistFacade.getDatabaseMetaDataFacade().persistCreatedDatabaseSchemas(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName));
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
@Override
public void dropDatabase(final ShardingSphereDatabase database) {
metaDataPersistFacade.getDatabaseMetaDataFacade().getDatabase().drop(database.getName());
metaDataContextManager.getDatabaseMetaDataManager().dropDatabase(database.getName());
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
@Override
@@ -155,7 +155,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
MetaDataContexts originalMetaDataContexts = new
MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(),
metaDataContextManager.getMetaDataContexts().getStatistics());
metaDataPersistFacade.getDataSourceUnitService().persist(databaseName,
toBeRegisteredProps);
afterStorageUnitsRegistered(databaseName, originalMetaDataContexts,
toBeRegisteredProps);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
private void afterStorageUnitsRegistered(final String databaseName, final
MetaDataContexts originalMetaDataContexts,
@@ -172,7 +172,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
MetaDataContexts originalMetaDataContexts = new
MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(),
metaDataContextManager.getMetaDataContexts().getStatistics());
metaDataPersistFacade.getDataSourceUnitService().persist(database.getName(),
toBeUpdatedProps);
afterStorageUnitsAltered(database.getName(), originalMetaDataContexts,
toBeUpdatedProps);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
private void afterStorageUnitsAltered(final String databaseName, final
MetaDataContexts originalMetaDataContexts, final Map<String,
DataSourcePoolProperties> toBeRegisteredProps) {
@@ -191,7 +191,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
MetaDataContexts reloadMetaDataContexts =
metaDataContextManager.getMetaDataContexts();
metaDataPersistFacade.getDatabaseMetaDataFacade().unregisterStorageUnits(database.getName(),
reloadMetaDataContexts);
}
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
private Collection<String> getToBeDroppedResourceNames(final String
databaseName, final Collection<String> toBeDroppedResourceNames) {
@@ -208,7 +208,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
} catch (final SQLException ex) {
throw new SQLWrapperException(ex);
}
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
@Override
@@ -222,7 +222,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
Map<String, Collection<ShardingSphereTable>> schemaAndTablesMap =
metaDataPersistFacade.getDatabaseMetaDataFacade().persistAlteredTables(
database.getName(),
metaDataContextManager.getMetaDataContexts(), needReloadTables);
alterSchemaTables(database, schemaAndTablesMap);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
private void alterRuleItem(final String databaseName, final
Collection<MetaDataVersion> metaDataVersions) {
@@ -247,7 +247,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
Map<String, Collection<ShardingSphereTable>> schemaAndTablesMap =
metaDataPersistFacade.getDatabaseMetaDataFacade().persistAlteredTables(
database.getName(),
metaDataContextManager.getMetaDataContexts(), needReloadTables);
alterSchemaTables(database, schemaAndTablesMap);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
private void removeRuleItem(final String databaseName, final
Collection<MetaDataVersion> metaDataVersions) {
@@ -282,20 +282,24 @@ public final class
StandaloneMetaDataManagerPersistService implements MetaDataMa
Map<String, Collection<ShardingSphereTable>> schemaAndTablesMap =
metaDataPersistFacade.getDatabaseMetaDataFacade().persistAlteredTables(
database.getName(),
metaDataContextManager.getMetaDataContexts(), needReloadTables);
alterSchemaTables(database, schemaAndTablesMap);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
@Override
public void alterGlobalRuleConfiguration(final RuleConfiguration
toBeAlteredRuleConfig) {
metaDataPersistFacade.getGlobalRuleService().persist(Collections.singleton(toBeAlteredRuleConfig));
metaDataContextManager.getGlobalConfigurationManager().alterGlobalRuleConfiguration(toBeAlteredRuleConfig);
- OrderedServicesCache.clearCache();
+ clearServicesCache();
}
@Override
public void alterProperties(final Properties props) {
metaDataPersistFacade.getPropsService().persist(props);
metaDataContextManager.getGlobalConfigurationManager().alterProperties(props);
+ clearServicesCache();
+ }
+
+ private void clearServicesCache() {
OrderedServicesCache.clearCache();
}
}
