(shardingsphere) branch master updated: Simplify altered encrypt rule cleanup (#39770)

[zhangliang]

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

terrymanu 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 bcc1be0fc59 Simplify altered encrypt rule cleanup (#39770)
bcc1be0fc59 is described below

commit bcc1be0fc59aca6f7e95560bd2ea370f39cc095a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 8 18:38:08 2026 +0800

    Simplify altered encrypt rule cleanup (#39770)
---
 .../distsql/handler/update/AlterEncryptRuleExecutor.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
index affd48c5199..1ccbf4c2c88 100644
--- 
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
+++ 
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.encrypt.distsql.handler.update;
 
-import com.cedarsoftware.util.CaseInsensitiveSet;
 import lombok.Setter;
 import 
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
 import 
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
@@ -40,6 +39,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -104,10 +104,11 @@ public final class AlterEncryptRuleExecutor implements 
DatabaseRuleAlterExecutor
     
     @Override
     public EncryptRuleConfiguration buildToBeDroppedRuleConfiguration(final 
EncryptRuleConfiguration toBeAlteredRuleConfig) {
-        Collection<String> toBeAlteredTableNames = new 
CaseInsensitiveSet<>(toBeAlteredRuleConfig.getTables().stream().map(EncryptTableRuleConfiguration::getName).collect(Collectors.toList()));
-        Collection<EncryptTableRuleConfiguration> tables = 
rule.getConfiguration().getTables().stream().filter(each -> 
!toBeAlteredTableNames.contains(each.getName())).collect(Collectors.toList());
-        tables.addAll(toBeAlteredRuleConfig.getTables());
-        EncryptRuleConfiguration toBeCheckedRuleConfig = new 
EncryptRuleConfiguration(tables, rule.getConfiguration().getEncryptors());
+        Collection<String> toBeAlteredTableNames = 
toBeAlteredRuleConfig.getLogicTableNames();
+        Collection<EncryptTableRuleConfiguration> toBeCheckedTables = new 
LinkedList<>(rule.getConfiguration().getTables());
+        toBeCheckedTables.removeIf(each -> 
toBeAlteredTableNames.contains(each.getName()));
+        toBeCheckedTables.addAll(toBeAlteredRuleConfig.getTables());
+        EncryptRuleConfiguration toBeCheckedRuleConfig = new 
EncryptRuleConfiguration(toBeCheckedTables, 
rule.getConfiguration().getEncryptors());
         Collection<String> unusedEncryptor = 
UnusedAlgorithmFinder.findUnusedEncryptor(toBeCheckedRuleConfig);
         Map<String, AlgorithmConfiguration> toBeDroppedEncryptors = new 
HashMap<>(unusedEncryptor.size(), 1F);
         unusedEncryptor.forEach(each -> toBeDroppedEncryptors.put(each, 
rule.getConfiguration().getEncryptors().get(each)));