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.

Sign up for GitHub

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

Merge forceRefreshDatabaseMetaData to refreshDatabaseMetaData #34433

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Merge forceRefreshDatabaseMetaData to refreshDatabaseMetaData #34433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
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 @@ -97,25 +96,6 @@ public void dropSchemas(final String databaseName, final ShardingSphereDatabase
GenericSchemaManager.getToBeDroppedSchemaNames(reloadDatabase, currentDatabase).forEach(each -> metaDataPersistService.getDatabaseMetaDataFacade().getSchema().drop(databaseName, each));
}

/**
* Force refresh database meta data.
*
* @param database to be reloaded database
*/
public void forceRefreshDatabaseMetaData(final ShardingSphereDatabase database) {
try {
metaDataContexts.update(createMetaDataContexts(database));
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);
}
}

/**
* Refresh database meta data.
*
Expand Down
1 change: 1 addition & 0 deletions ...ache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public final class RefreshDatabaseMetaDataStatement extends UpdatableRALStatemen

private final String databaseName;

// TODO Remove it.
private final boolean force;

/**
Expand Down
6 changes: 1 addition & 5 deletions ...ngsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ public void executeUpdate(final RefreshDatabaseMetaDataStatement sqlStatement, f
.orElseGet(() -> contextManager.getMetaDataContexts().getMetaData().getAllDatabases());
for (ShardingSphereDatabase each : databases) {
if (!SystemSchemaUtils.isSystemSchema(each)) {
if (sqlStatement.isForce()) {
contextManager.getMetaDataContextManager().forceRefreshDatabaseMetaData(each);
} else {
contextManager.getMetaDataContextManager().refreshDatabaseMetaData(each);
}
contextManager.getMetaDataContextManager().refreshDatabaseMetaData(each);
}
}
}
Expand Down
Loading