Merge forceRefreshDatabaseMetaData to refreshDatabaseMetaData (#34433)

apache · Jan 22, 2025 · 33453f3 · 33453f3
1 parent 46f2844
commit 33453f3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 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
@@ -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;
@@ -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.
      *

diff --git a/...ache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java b/...ache/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/...ngsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java b/...ngsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataExecutor.java
@@ -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);
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         private final String databaseName;
+        // TODO Remove it.
         private final boolean force;
         /**
@@ Expand Down @@