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 e1d9f55e888 Refactor StandaloneMetaDataManagerPersistService (#34397)
e1d9f55e888 is described below
commit e1d9f55e888645324b6c37c6688ff6d80adc34d0
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 19 12:46:24 2025 +0800
Refactor StandaloneMetaDataManagerPersistService (#34397)
---
.../service/StandaloneMetaDataManagerPersistService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 71354d17bd1..e2769ccabbe 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
@@ -224,8 +224,8 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
public void registerStorageUnits(final String databaseName, final
Map<String, DataSourcePoolProperties> toBeRegisteredProps) throws SQLException {
SwitchingResource switchingResource =
metaDataContextManager.getResourceSwitchManager().switchByRegisterStorageUnit(metaDataContextManager.getMetaDataContexts()
.getMetaData().getDatabase(databaseName).getResourceMetaData(),
toBeRegisteredProps);
- ShardingSphereDatabase changedDatabase = new
MetaDataContextsFactory(metaDataPersistService).createChangedDatabase(databaseName,
false, switchingResource, null,
- metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
+ ShardingSphereDatabase changedDatabase = new
MetaDataContextsFactory(metaDataPersistService).createChangedDatabase(
+ databaseName, false, switchingResource, null,
metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
metaDataContextManager.getMetaDataContexts().getMetaData().putDatabase(changedDatabase);
metaDataContextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules()
.forEach(each -> ((GlobalRule)
each).refresh(metaDataContextManager.getMetaDataContexts().getMetaData().getAllDatabases(),
GlobalRuleChangedType.DATABASE_CHANGED));
@@ -246,8 +246,8 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
public void alterStorageUnits(final String databaseName, final Map<String,
DataSourcePoolProperties> toBeUpdatedProps) throws SQLException {
SwitchingResource switchingResource =
metaDataContextManager.getResourceSwitchManager().switchByAlterStorageUnit(metaDataContextManager.getMetaDataContexts().getMetaData()
.getDatabase(databaseName).getResourceMetaData(),
toBeUpdatedProps);
- ShardingSphereDatabase changedDatabase = new
MetaDataContextsFactory(metaDataPersistService).createChangedDatabase(databaseName,
true, switchingResource, null,
- metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
+ ShardingSphereDatabase changedDatabase = new
MetaDataContextsFactory(metaDataPersistService).createChangedDatabase(
+ databaseName, true, switchingResource, null,
metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
metaDataContextManager.getMetaDataContexts().getMetaData().putDatabase(changedDatabase);
metaDataContextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules()
.forEach(each -> ((GlobalRule)
each).refresh(metaDataContextManager.getMetaDataContexts().getMetaData().getAllDatabases(),
GlobalRuleChangedType.DATABASE_CHANGED));
@@ -262,8 +262,8 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
public void unregisterStorageUnits(final String databaseName, final
Collection<String> toBeDroppedStorageUnitNames) throws SQLException {
SwitchingResource switchingResource =
metaDataContextManager.getResourceSwitchManager().switchByUnregisterStorageUnit(metaDataContextManager.getMetaDataContexts().getMetaData()
.getDatabase(databaseName).getResourceMetaData(),
toBeDroppedStorageUnitNames);
- MetaDataContexts reloadMetaDataContexts = new
MetaDataContextsFactory(metaDataPersistService).createBySwitchResource(databaseName,
false, switchingResource,
- metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
+ MetaDataContexts reloadMetaDataContexts = new
MetaDataContextsFactory(metaDataPersistService).createBySwitchResource(
+ databaseName, false, switchingResource,
metaDataContextManager.getMetaDataContexts(),
metaDataContextManager.getComputeNodeInstanceContext());
metaDataPersistService.persistReloadDatabaseByDrop(databaseName,
reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName));
metaDataContextManager.dropSchemas(databaseName,
reloadMetaDataContexts.getMetaData().getDatabase(databaseName),
