(shardingsphere) branch master updated: Merge forceRefreshDatabaseMetaData to refreshDatabaseMetaData (#34433)

[yx9o]

This is an automated email from the ASF dual-hosted git repository.

yx9o 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 33453f3449c Merge forceRefreshDatabaseMetaData to 
refreshDatabaseMetaData (#34433)
33453f3449c is described below

commit 33453f3449c624f879f8800400456cb10470dd89
Author: zhaojinchao <zhaojinc...@apache.org>
AuthorDate: Wed Jan 22 23:54:11 2025 +0800

    Merge forceRefreshDatabaseMetaData to refreshDatabaseMetaData (#34433)
---
 .../mode/metadata/MetaDataContextManager.java        | 20 --------------------
 .../updatable/RefreshDatabaseMetaDataStatement.java  |  1 +
 .../updatable/RefreshDatabaseMetaDataExecutor.java   |  6 +-----
 3 files changed, 2 insertions(+), 25 deletions(-)

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 f269aae165c..c6d37748013 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
@@ -27,7 +27,6 @@ import 
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 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;
@@ -97,25 +96,6 @@ public class MetaDataContextManager {
         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.
      *
diff --git 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
index fc2cadfaa00..27d8d5152c0 100644
--- 
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
+++ 
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java
@@ -31,6 +31,7 @@ public final class RefreshDatabaseMetaDataStatement extends 
UpdatableRALStatemen
     
     private final String databaseName;
     
+    // TODO Remove it.
     private final boolean force;
     
     /**
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 0ffab14b10e..abd83ee0356 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
@@ -38,11 +38,7 @@ public final class RefreshDatabaseMetaDataExecutor 
implements DistSQLUpdateExecu
                 .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);
             }
         }
     }