Skip to content

Commit

Permalink
Remove useless DataSourceNodePersistService (#34413)
Browse files Browse the repository at this point in the history
  • Loading branch information
terrymanu authored Jan 20, 2025
1 parent 4990de4 commit 5851cc3
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 219 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public final class ComputeNodeInstanceContext {
@Getter(AccessLevel.NONE)
private final AtomicReference<WorkerIdGenerator> workerIdGenerator;

@Getter(AccessLevel.NONE)
private final AtomicReference<LockContext> lockContext;

private final ClusterInstanceRegistry clusterInstanceRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static PipelineGovernanceFacade getPipelineGovernanceFacade(final Pipelin
@Override
protected PipelineGovernanceFacade initialize() {
ContextManager contextManager = PipelineContextManager.getContext(contextKey).getContextManager();
return new PipelineGovernanceFacade((ClusterPersistRepository) contextManager.getPersistServiceFacade().getMetaDataPersistService().getRepository());
return new PipelineGovernanceFacade((ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository());
}
}).get();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private final class PersistRepositoryLazyInitializer extends LazyInitializer<Clu

@Override
protected ClusterPersistRepository initialize() {
return (ClusterPersistRepository) PipelineContextManager.getContext(contextKey).getContextManager().getPersistServiceFacade().getMetaDataPersistService().getRepository();
return (ClusterPersistRepository) PipelineContextManager.getContext(contextKey).getContextManager().getPersistServiceFacade().getRepository();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.statistics.builder.ShardingSphereStatisticsFactory;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
Expand Down Expand Up @@ -104,13 +105,12 @@ public void dropSchemas(final String databaseName, final ShardingSphereDatabase
public void forceRefreshDatabaseMetaData(final ShardingSphereDatabase database) {
try {
metaDataContexts.update(createMetaDataContexts(database));
metaDataContexts.getMetaData().getDatabase(database.getName()).getAllSchemas()
.forEach(each -> {
if (each.isEmpty()) {
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().add(database.getName(), each.getName());
}
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(database.getName(), each.getName(), each.getAllTables());
});
for (ShardingSphereSchema each : metaDataContexts.getMetaData().getDatabase(database.getName()).getAllSchemas()) {
if (each.isEmpty()) {
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().add(database.getName(), each.getName());
}
metaDataPersistService.getDatabaseMetaDataFacade().getTable().persist(database.getName(), each.getName(), each.getAllTables());
}
} catch (final SQLException ex) {
log.error("Refresh database meta data: {} failed", database.getName(), ex);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public ShardingSphereMetaData getMetaData() {
/**
* Get ShardingSphere statistics.
*
* @return got meta data statistics
* @return got statistics
*/
public ShardingSphereStatistics getStatistics() {
return statistics.get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ public final class RuleItemManager {
@SuppressWarnings({"rawtypes", "unchecked"})
public void alterRuleItem(final AlterRuleItem alterRuleItem) throws SQLException {
Preconditions.checkArgument(alterRuleItem.getActiveVersion().equals(metaDataPersistService.getRepository().query(alterRuleItem.getActiveVersionKey())),
"Invalid active version: {} of key: {}", alterRuleItem.getActiveVersion(), alterRuleItem.getActiveVersionKey());
"Invalid active version: %s of key: %s", alterRuleItem.getActiveVersion(), alterRuleItem.getActiveVersionKey());
RuleItemConfigurationChangedProcessor processor = TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class, alterRuleItem.getType());
String yamlContent = metaDataPersistService.getMetaDataVersionPersistService()
.getVersionPathByActiveVersion(alterRuleItem.getActiveVersionKey(), alterRuleItem.getActiveVersion());
String yamlContent = metaDataPersistService.getMetaDataVersionPersistService().getVersionPathByActiveVersion(alterRuleItem.getActiveVersionKey(), alterRuleItem.getActiveVersion());
String databaseName = alterRuleItem.getDatabaseName();
RuleConfiguration currentRuleConfig = processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.metadata.persist.data.ShardingSphereDataPersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceNodePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DataSourceUnitPersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
import org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
Expand Down Expand Up @@ -61,8 +60,6 @@ public final class MetaDataPersistService {

private final DataSourceUnitPersistService dataSourceUnitService;

private final DataSourceNodePersistService dataSourceNodeService;

private final DatabaseMetaDataPersistFacade databaseMetaDataFacade;

private final DatabaseRulePersistService databaseRulePersistService;
Expand All @@ -77,7 +74,6 @@ public MetaDataPersistService(final PersistRepository repository) {
this.repository = repository;
metaDataVersionPersistService = new MetaDataVersionPersistService(repository);
dataSourceUnitService = new DataSourceUnitPersistService(repository);
dataSourceNodeService = new DataSourceNodePersistService(repository);
databaseMetaDataFacade = new DatabaseMetaDataPersistFacade(repository, metaDataVersionPersistService);
databaseRulePersistService = new DatabaseRulePersistService(repository);
globalRuleService = new GlobalRulePersistService(repository, metaDataVersionPersistService);
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 5851cc3

Please sign in to comment.