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 ff49649a6b4 Rename MetaDataContextManager.refreshDatabaseMetaData
(#34420)
ff49649a6b4 is described below
commit ff49649a6b4bfa67d2242280b79d1200e9d3b2b1
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 21 22:33:13 2025 +0800
Rename MetaDataContextManager.refreshDatabaseMetaData (#34420)
---
.../data/pipeline/scenario/migration/api/MigrationJobAPI.java | 2 +-
.../shardingsphere/mode/metadata/MetaDataContextManager.java | 10 +++++-----
.../distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java | 2 +-
.../distsql/ral/updatable/RefreshTableMetaDataExecutor.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
index 3043aefc834..1ee0188010d 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/MigrationJobAPI.java
@@ -305,7 +305,7 @@ public final class MigrationJobAPI implements
TransmissionJobAPI {
// TODO use origin database name for now. It can be reduce metadata
refresh scope after reloadDatabaseMetaData case-sensitive problem fixed.
ContextManager contextManager =
PipelineContextManager.getContext(PipelineJobIdUtils.parseContextKey(jobId)).getContextManager();
ShardingSphereDatabase database =
contextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName);
-
contextManager.getMetaDataContextManager().refreshTableMetaData(database);
+
contextManager.getMetaDataContextManager().refreshDatabaseMetaData(database);
}
@Override
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
index 9d225b52ac5..f269aae165c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
@@ -117,11 +117,11 @@ public class MetaDataContextManager {
}
/**
- * Refresh table meta data.
+ * Refresh database meta data.
*
* @param database to be reloaded database
*/
- public void refreshTableMetaData(final ShardingSphereDatabase database) {
+ public void refreshDatabaseMetaData(final ShardingSphereDatabase database)
{
try {
MetaDataContexts reloadedMetaDataContexts =
createMetaDataContexts(database);
dropSchemas(database.getName(),
reloadedMetaDataContexts.getMetaData().getDatabase(database.getName()),
database);
@@ -129,13 +129,13 @@ public class MetaDataContextManager {
metaDataContexts.getMetaData().getDatabase(database.getName()).getAllSchemas()
.forEach(each ->
metaDataPersistService.getDatabaseMetaDataFacade().getSchema().alterByRefresh(database.getName(),
each));
} catch (final SQLException ex) {
- log.error("Refresh table meta data: {} failed",
database.getName(), ex);
+ log.error("Refresh database meta data: {} failed",
database.getName(), ex);
}
}
private MetaDataContexts createMetaDataContexts(final
ShardingSphereDatabase database) throws SQLException {
- Map<String, DataSourcePoolProperties> dataSourcePoolPropsFromRegCenter
= metaDataPersistService.getDataSourceUnitService().load(database.getName());
- SwitchingResource switchingResource =
resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(),
dataSourcePoolPropsFromRegCenter);
+ Map<String, DataSourcePoolProperties> dataSourcePoolProps =
metaDataPersistService.getDataSourceUnitService().load(database.getName());
+ SwitchingResource switchingResource =
resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(),
dataSourcePoolProps);
Collection<RuleConfiguration> ruleConfigs =
metaDataPersistService.getDatabaseRulePersistService().load(database.getName());
ShardingSphereDatabase changedDatabase = new
MetaDataContextsFactory(metaDataPersistService, computeNodeInstanceContext)
.createChangedDatabase(database.getName(), false,
switchingResource, ruleConfigs, metaDataContexts);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
index a585803acf6..0ffab14b10e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
@@ -41,7 +41,7 @@ public final class RefreshDatabaseMetaDataExecutor implements
DistSQLUpdateExecu
if (sqlStatement.isForce()) {
contextManager.getMetaDataContextManager().forceRefreshDatabaseMetaData(each);
} else {
-
contextManager.getMetaDataContextManager().refreshTableMetaData(each);
+
contextManager.getMetaDataContextManager().refreshDatabaseMetaData(each);
}
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataExecutor.java
index c94dc4e7a03..40035447dc5 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataExecutor.java
@@ -58,7 +58,7 @@ public final class RefreshTableMetaDataExecutor implements
DistSQLUpdateExecutor
if (sqlStatement.getTableName().isPresent()) {
contextManager.reloadTable(database, schemaName,
sqlStatement.getTableName().get());
} else {
-
contextManager.getMetaDataContextManager().refreshTableMetaData(database);
+
contextManager.getMetaDataContextManager().refreshDatabaseMetaData(database);
}
}
