Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor MetaDataContexts #34355

Merged
merged 1 commit into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ public void dropSchemas(final String databaseName, final ShardingSphereDatabase
* @param metaDataContexts meta data contexts
*/
public void renewMetaDataContexts(final MetaDataContexts metaDataContexts) {
this.metaDataContexts.setMetaData(metaDataContexts.getMetaData());
this.metaDataContexts.setStatistics(metaDataContexts.getStatistics());
this.metaDataContexts.update(metaDataContexts);
}

/**
Expand All @@ -111,9 +110,7 @@ public void renewMetaDataContexts(final MetaDataContexts metaDataContexts) {
*/
public void forceRefreshDatabaseMetaData(final ShardingSphereDatabase database) {
try {
MetaDataContexts reloadedMetaDataContexts = createMetaDataContexts(database);
metaDataContexts.setMetaData(reloadedMetaDataContexts.getMetaData());
metaDataContexts.setStatistics(reloadedMetaDataContexts.getStatistics());
metaDataContexts.update(createMetaDataContexts(database));
metaDataContexts.getMetaData().getDatabase(database.getName()).getAllSchemas()
.forEach(each -> {
if (each.isEmpty()) {
Expand All @@ -135,8 +132,7 @@ public void refreshTableMetaData(final ShardingSphereDatabase database) {
try {
MetaDataContexts reloadedMetaDataContexts = createMetaDataContexts(database);
dropSchemas(database.getName(), reloadedMetaDataContexts.getMetaData().getDatabase(database.getName()), database);
metaDataContexts.setMetaData(reloadedMetaDataContexts.getMetaData());
metaDataContexts.setStatistics(reloadedMetaDataContexts.getStatistics());
metaDataContexts.update(reloadedMetaDataContexts);
metaDataContexts.getMetaData().getDatabase(database.getName()).getAllSchemas()
.forEach(each -> metaDataPersistService.getDatabaseMetaDataFacade().getSchema().alterByRefresh(database.getName(), each));
} catch (final SQLException ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;

import javax.annotation.concurrent.ThreadSafe;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -48,29 +49,32 @@ public ShardingSphereMetaData getMetaData() {
}

/**
* Set ShardingSphere meta data.
* Get ShardingSphere statistics.
*
* @param metaData meta data
* @return got meta data statistics
*/
public void setMetaData(final ShardingSphereMetaData metaData) {
this.metaData.set(metaData);
public ShardingSphereStatistics getStatistics() {
return statistics.get();
}

/**
* Get ShardingSphere statistics.
* Update meta data contexts.
*
* @return got meta data statistics
* @param newMetaDataContexts new meta data contexts
*/
public ShardingSphereStatistics getStatistics() {
return statistics.get();
public void update(final MetaDataContexts newMetaDataContexts) {
this.metaData.set(newMetaDataContexts.getMetaData());
this.statistics.set(newMetaDataContexts.getStatistics());
}

/**
* Set ShardingSphere statistics.
* Update meta data contexts.
*
* @param statistics statistics
* @param metaData meta data
* @param metaDataPersistService meta data persist service
*/
public void setStatistics(final ShardingSphereStatistics statistics) {
this.statistics.set(statistics);
public void update(final ShardingSphereMetaData metaData, final MetaDataPersistService metaDataPersistService) {
this.metaData.set(metaData);
this.statistics.set(ShardingSphereStatisticsFactory.create(metaDataPersistService, metaData));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ public synchronized void dropRuleConfiguration(final String databaseName, final
}

private void refreshMetadata(final String databaseName, final Collection<RuleConfiguration> ruleConfigurations) throws SQLException {
MetaDataContexts reloadMetaDataContexts = MetaDataContextsFactory.createByAlterRule(databaseName, false,
ruleConfigurations, metaDataContexts, metaDataPersistService, computeNodeInstanceContext);
metaDataContexts.setMetaData(reloadMetaDataContexts.getMetaData());
metaDataContexts.setStatistics(reloadMetaDataContexts.getStatistics());
metaDataContexts.update(MetaDataContextsFactory.createByAlterRule(databaseName, false, ruleConfigurations, metaDataContexts, metaDataPersistService, computeNodeInstanceContext));
}

private Collection<RuleConfiguration> getRuleConfigurations(final Collection<ShardingSphereRule> rules) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.ShardingSphereStatisticsFactory;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.node.tuple.annotation.RepositoryTupleEntity;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
Expand Down Expand Up @@ -68,10 +67,9 @@ public synchronized void alterGlobalRuleConfiguration(final RuleConfiguration ru
rules.addAll(GlobalRulesBuilder.buildSingleRules(ruleConfig, metaDataContexts.getMetaData().getAllDatabases(), metaDataContexts.getMetaData().getProps()));
metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules().clear();
metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules().addAll(rules);
ShardingSphereMetaData toBeChangedMetaData = new ShardingSphereMetaData(metaDataContexts.getMetaData().getAllDatabases(),
metaDataContexts.getMetaData().getGlobalResourceMetaData(), metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps());
metaDataContexts.setMetaData(toBeChangedMetaData);
metaDataContexts.setStatistics(ShardingSphereStatisticsFactory.create(metaDataPersistService, toBeChangedMetaData));
metaDataContexts.update(new ShardingSphereMetaData(metaDataContexts.getMetaData().getAllDatabases(),
metaDataContexts.getMetaData().getGlobalResourceMetaData(), metaDataContexts.getMetaData().getGlobalRuleMetaData(), metaDataContexts.getMetaData().getProps()),
metaDataPersistService);
}

// Optimize string comparison rule type.
Expand All @@ -90,9 +88,7 @@ private void closeStaleTransactionRule(final RuleConfiguration ruleConfig) {
* @param props properties to be altered
*/
public synchronized void alterProperties(final Properties props) {
ShardingSphereMetaData toBeChangedMetaData = new ShardingSphereMetaData(metaDataContexts.getMetaData().getAllDatabases(),
metaDataContexts.getMetaData().getGlobalResourceMetaData(), metaDataContexts.getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(props));
metaDataContexts.setMetaData(toBeChangedMetaData);
metaDataContexts.setStatistics(ShardingSphereStatisticsFactory.create(metaDataPersistService, toBeChangedMetaData));
metaDataContexts.update(new ShardingSphereMetaData(metaDataContexts.getMetaData().getAllDatabases(),
metaDataContexts.getMetaData().getGlobalResourceMetaData(), metaDataContexts.getMetaData().getGlobalRuleMetaData(), new ConfigurationProperties(props)), metaDataPersistService);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.shardingsphere.infra.rule.scope.GlobalRule;
import org.apache.shardingsphere.infra.rule.scope.GlobalRule.GlobalRuleChangedType;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.ShardingSphereStatisticsFactory;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
Expand Down Expand Up @@ -62,8 +61,7 @@ public synchronized void addDatabase(final String databaseName) {
}
DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(Collections.emptyMap(), metaDataContexts.getMetaData().getProps());
metaDataContexts.getMetaData().addDatabase(databaseName, protocolType, metaDataContexts.getMetaData().getProps());
metaDataContexts.setMetaData(metaDataContexts.getMetaData());
metaDataContexts.setStatistics(ShardingSphereStatisticsFactory.create(metaDataPersistService, metaDataContexts.getMetaData()));
metaDataContexts.update(metaDataContexts.getMetaData(), metaDataPersistService);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ public synchronized void unregisterStorageUnit(final String databaseName, final
private void buildNewMetaDataContext(final String databaseName, final SwitchingResource switchingResource) throws SQLException {
MetaDataContexts reloadMetaDataContexts = MetaDataContextsFactory.createBySwitchResource(
databaseName, true, switchingResource, metaDataContexts, metaDataPersistService, computeNodeInstanceContext);
metaDataContexts.setMetaData(reloadMetaDataContexts.getMetaData());
metaDataContexts.setStatistics(reloadMetaDataContexts.getStatistics());
metaDataContexts.update(reloadMetaDataContexts);
metaDataContexts.getMetaData().putDatabase(buildDatabase(reloadMetaDataContexts.getMetaData().getDatabase(databaseName)));
switchingResource.closeStaleDataSources();
}
Expand Down
Loading