(shardingsphere) branch master updated: Refactor StandaloneMetaDataManagerPersistService.dropTables() (#34518)

[zhangliang]

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 a3cf259e7f3 Refactor 
StandaloneMetaDataManagerPersistService.dropTables() (#34518)
a3cf259e7f3 is described below

commit a3cf259e7f37810f24c78c28dfcf931a38a43ff8
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jan 26 22:04:12 2025 +0800

    Refactor StandaloneMetaDataManagerPersistService.dropTables() (#34518)
---
 .../persist/service/ClusterMetaDataManagerPersistService.java    | 4 +++-
 .../persist/service/StandaloneMetaDataManagerPersistService.java | 9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 78ee72d75a8..543bc774049 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -126,7 +126,9 @@ public final class ClusterMetaDataManagerPersistService 
implements MetaDataManag
     
     @Override
     public void dropTables(final String databaseName, final String schemaName, 
final Collection<String> tableNames) {
-        tableNames.forEach(each -> 
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
 schemaName, each));
+        for (String each : tableNames) {
+            
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
 schemaName, each);
+        }
     }
     
     @SneakyThrows
diff --git 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index 0cc1a04fddc..74c194a79d2 100644
--- 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++ 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -222,11 +222,10 @@ public final class 
StandaloneMetaDataManagerPersistService implements MetaDataMa
     
     @Override
     public void dropTables(final String databaseName, final String schemaName, 
final Collection<String> tableNames) {
-        tableNames.forEach(each -> 
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
 schemaName, each));
-        ShardingSphereMetaData metaData = 
metaDataContextManager.getMetaDataContexts().getMetaData();
-        ShardingSphereDatabase database = metaData.getDatabase(databaseName);
-        removeTablesToDataNode(database, schemaName, tableNames);
-        metaData.getGlobalRuleMetaData().getRules().forEach(each -> 
((GlobalRule) each).refresh(metaData.getAllDatabases(), 
GlobalRuleChangedType.SCHEMA_CHANGED));
+        for (String each : tableNames) {
+            
metaDataPersistService.getDatabaseMetaDataFacade().getTable().drop(databaseName,
 schemaName, each);
+            
metaDataContextManager.getDatabaseMetaDataManager().dropTable(databaseName, 
schemaName, each);
+        }
     }
     
     @Override