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 9fafaa08371 Refactor StandaloneMetaDataManagerPersistService (#35002)
9fafaa08371 is described below
commit 9fafaa083718aff82a4ad824db18d1cd738a1bc0
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Mar 15 21:55:23 2025 +0800
Refactor StandaloneMetaDataManagerPersistService (#35002)
---
.../ClusterMetaDataManagerPersistService.java | 7 +-----
.../StandaloneMetaDataManagerPersistService.java | 26 +++++++++-------------
2 files changed, 12 insertions(+), 21 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index eb7d9d1c1e9..4703962f29f 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -78,12 +78,7 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
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));
}
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 b15308d5b9d..b78247486c2 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
@@ -82,14 +82,14 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
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 final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
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 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);
- clearServiceCache();
+ OrderedServicesCache.clearCache();
}
private void afterStorageUnitsAltered(final String databaseName, final
MetaDataContexts originalMetaDataContexts, final Map<String,
DataSourcePoolProperties> toBeRegisteredProps) {
@@ -198,7 +198,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
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 final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
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 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
}
}
reloadAlteredTables(database.getName(), needReloadTables);
- clearServiceCache();
+ OrderedServicesCache.clearCache();
}
@Override
@@ -264,7 +264,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
}
}
reloadAlteredTables(database.getName(), needReloadTables);
- clearServiceCache();
+ OrderedServicesCache.clearCache();
}
private void reloadAlteredTables(final String databaseName, final
Collection<String> needReloadTables) {
@@ -281,7 +281,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
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 @@ public final class
StandaloneMetaDataManagerPersistService implements MetaDataMa
@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();
}
}
