Refactor ShadowRule (#33546)

* Refactor ShadowRule * Refactor ShadowRule
apache · Nov 4, 2024 · 6cdbbf3 · 6cdbbf3
1 parent a4b30e0
commit 6cdbbf3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
@@ -49,7 +49,6 @@ public final class ShadowRule implements DatabaseRule {
     @Getter
     private final ShadowRuleConfiguration configuration;
 
-    @Getter
     private final Map<String, ShadowAlgorithm> shadowAlgorithms;
 
     private final ShadowAlgorithm defaultShadowAlgorithm;
@@ -85,6 +84,16 @@ private Map<String, ShadowTableRule> createTableRules(final Map<String, ShadowTa
                 entry -> new ShadowTableRule(entry.getKey(), entry.getValue().getDataSourceNames(), entry.getValue().getShadowAlgorithmNames(), shadowAlgorithms), (a, b) -> b, LinkedHashMap::new));
     }
 
+    /**
+     * Whether contains shadow algorithm.
+     *
+     * @param algorithmName algorithm name
+     * @return contains shadow algorithm or not
+     */
+    public boolean containsShadowAlgorithm(final String algorithmName) {
+        return shadowAlgorithms.containsKey(algorithmName);
+    }
+
     /**
      * Get default shadow algorithm.
      *

diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java
@@ -39,6 +39,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ShadowRuleTest {
 
@@ -93,6 +94,11 @@ private Map<String, AlgorithmConfiguration> createShadowAlgorithms() {
         return result;
     }
 
+    @Test
+    void assertContainsShadowAlgorithm() {
+        assertTrue(rule.containsShadowAlgorithm("sql-hint-algorithm"));
+    }
+
     @Test
     void assertGetDefaultShadowAlgorithm() {
         assertFalse(rule.getDefaultShadowAlgorithm().isPresent());

diff --git a/...he/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java b/...he/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
@@ -55,7 +55,7 @@ public void checkBeforeUpdate(final CreateDefaultShadowAlgorithmStatement sqlSta
     }
 
     private void checkAlgorithmExisted() {
-        boolean isDuplicatedAlgorithmName = null != rule && rule.getShadowAlgorithms().containsKey("default_shadow_algorithm");
+        boolean isDuplicatedAlgorithmName = null != rule && rule.containsShadowAlgorithm("default_shadow_algorithm");
         ShardingSpherePreconditions.checkState(!isDuplicatedAlgorithmName, () -> new InUsedAlgorithmException("Shadow", database.getName(), Collections.singleton("default_shadow_algorithm")));
     }
 
@@ -72,7 +72,7 @@ private void checkAlgorithmType(final CreateDefaultShadowAlgorithmStatement sqlS
     @Override
     public ShadowRuleConfiguration buildToBeCreatedRuleConfiguration(final CreateDefaultShadowAlgorithmStatement sqlStatement) {
         ShadowRuleConfiguration result = new ShadowRuleConfiguration();
-        if (null == rule || !rule.getShadowAlgorithms().containsKey("default_shadow_algorithm")) {
+        if (null == rule || !rule.containsShadowAlgorithm("default_shadow_algorithm")) {
             result.setShadowAlgorithms(buildAlgorithmMap(sqlStatement));
             result.setDefaultShadowAlgorithmName("default_shadow_algorithm");
         }