This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 18888e294ea Rename InUsedAlgorithmException (#30698)
18888e294ea is described below
commit 18888e294ea0a98a755c3233ec1765e3984f4576
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 30 17:50:28 2024 +0800
Rename InUsedAlgorithmException (#30698)
---
.../distsql/handler/update/AlterShadowRuleExecutor.java | 4 ++--
.../update/CreateDefaultShadowAlgorithmExecutor.java | 4 ++--
.../distsql/handler/update/DropShadowAlgorithmExecutor.java | 6 +++---
.../shadow/distsql/update/AlterShadowRuleExecutorTest.java | 6 +++---
.../handler/update/DropShardingAlgorithmExecutor.java | 4 ++--
.../distsql/handler/update/DropShardingAuditorExecutor.java | 4 ++--
.../handler/update/DropShardingKeyGeneratorExecutor.java | 4 ++--
.../distsql/update/DropShardingAlgorithmExecutorTest.java | 6 +++---
.../distsql/update/DropShardingAuditorExecutorTest.java | 13 ++++---------
.../update/DropShardingKeyGeneratorExecutorTest.java | 4 ++--
...hmInUsedException.java => InUsedAlgorithmException.java} | 6 +++---
11 files changed, 28 insertions(+), 33 deletions(-)
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
index f476f8325b5..6aa3b03be65 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleAlterExecutor;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.exception.rule.DuplicateRuleException;
import
org.apache.shardingsphere.infra.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
@@ -65,7 +65,7 @@ public final class AlterShadowRuleExecutor implements
DatabaseRuleAlterExecutor<
private void checkAlgorithms(final Collection<ShadowRuleSegment> segments)
{
Collection<String> requiredAlgorithms =
ShadowRuleStatementSupporter.getAlgorithmNames(segments);
- ShadowRuleStatementChecker.checkDuplicated(requiredAlgorithms,
duplicated -> new AlgorithmInUsedException("Shadow", database.getName(),
duplicated));
+ ShadowRuleStatementChecker.checkDuplicated(requiredAlgorithms,
duplicated -> new InUsedAlgorithmException("Shadow", database.getName(),
duplicated));
}
private void checkAlgorithmType(final AlterShadowRuleStatement
sqlStatement) {
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
index b8f88fa57de..565a3fa7027 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
@@ -21,7 +21,7 @@ import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.EmptyAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
@@ -56,7 +56,7 @@ public final class CreateDefaultShadowAlgorithmExecutor
implements DatabaseRuleC
private void checkAlgorithmExisted() {
boolean isDuplicatedAlgorithmName = null != rule &&
rule.getShadowAlgorithms().containsKey("default_shadow_algorithm");
- ShardingSpherePreconditions.checkState(!isDuplicatedAlgorithmName, ()
-> new AlgorithmInUsedException("Shadow", database.getName(),
Collections.singleton("default_shadow_algorithm")));
+ ShardingSpherePreconditions.checkState(!isDuplicatedAlgorithmName, ()
-> new InUsedAlgorithmException("Shadow", database.getName(),
Collections.singleton("default_shadow_algorithm")));
}
private void checkAlgorithmCompleteness(final
CreateDefaultShadowAlgorithmStatement sqlStatement) {
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
index 2d379f21e40..a7220781363 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
@@ -64,9 +64,9 @@ public final class DropShadowAlgorithmExecutor implements
DatabaseRuleDropExecut
ShadowRuleStatementChecker.checkExisted(requiredAlgorithms,
currentAlgorithms,
notExistedAlgorithms -> new
UnregisteredAlgorithmException("Shadow", notExistedAlgorithms, new
SQLExceptionIdentifier(database.getName())));
}
- checkAlgorithmInUsed(requiredAlgorithms, getAlgorithmInUse(),
identical -> new AlgorithmInUsedException("Shadow", database.getName(),
identical));
+ checkAlgorithmInUsed(requiredAlgorithms, getAlgorithmInUse(),
identical -> new InUsedAlgorithmException("Shadow", database.getName(),
identical));
ShardingSpherePreconditions.checkState(!requiredAlgorithms.contains(defaultShadowAlgorithmName),
- () -> new AlgorithmInUsedException("Shadow",
database.getName(), Collections.singleton(defaultShadowAlgorithmName)));
+ () -> new InUsedAlgorithmException("Shadow",
database.getName(), Collections.singleton(defaultShadowAlgorithmName)));
}
private void checkAlgorithmInUsed(final Collection<String>
requiredAlgorithms, final Collection<String> currentAlgorithms, final
Function<Collection<String>, KernelSQLException> thrower) {
diff --git
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java
index c0bbe711a89..c5ce72ca9bc 100644
---
a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java
+++
b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.update;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.exception.rule.DuplicateRuleException;
import
org.apache.shardingsphere.infra.exception.rule.MissingRequiredRuleException;
import
org.apache.shardingsphere.infra.exception.storageunit.MissingRequiredStorageUnitsException;
@@ -115,7 +115,7 @@ class AlterShadowRuleExecutorTest {
ShadowRule rule = mock(ShadowRule.class);
when(rule.getConfiguration()).thenReturn(currentConfig);
executor.setRule(rule);
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
}
@Test
@@ -127,7 +127,7 @@ class AlterShadowRuleExecutorTest {
ShadowRule rule = mock(ShadowRule.class);
when(rule.getConfiguration()).thenReturn(currentConfig);
executor.setRule(rule);
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
index 81c7a56e49d..0ac1a6a321b 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
@@ -66,7 +66,7 @@ public final class DropShardingAlgorithmExecutor implements
DatabaseRuleDropExec
private void checkShardingAlgorithmsInUsed(final
DropShardingAlgorithmStatement sqlStatement) {
Collection<String> allInUsed = getAllOfAlgorithmsInUsed();
Collection<String> usedAlgorithms =
sqlStatement.getNames().stream().filter(allInUsed::contains).collect(Collectors.toList());
- ShardingSpherePreconditions.checkState(usedAlgorithms.isEmpty(), () ->
new AlgorithmInUsedException("Sharding", database.getName(), usedAlgorithms));
+ ShardingSpherePreconditions.checkState(usedAlgorithms.isEmpty(), () ->
new InUsedAlgorithmException("Sharding", database.getName(), usedAlgorithms));
}
private Collection<String> getAllOfAlgorithmsInUsed() {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
index 9e6dffe0c72..e44bc3f310b 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
@@ -65,7 +65,7 @@ public final class DropShardingAuditorExecutor implements
DatabaseRuleDropExecut
private void checkInUsed(final DropShardingAuditorStatement sqlStatement) {
Collection<String> usedAuditors = getUsedAuditors();
Collection<String> inUsedNames =
sqlStatement.getNames().stream().filter(usedAuditors::contains).collect(Collectors.toList());
- ShardingSpherePreconditions.checkState(inUsedNames.isEmpty(), () ->
new AlgorithmInUsedException("Sharding auditor", database.getName(),
inUsedNames));
+ ShardingSpherePreconditions.checkState(inUsedNames.isEmpty(), () ->
new InUsedAlgorithmException("Sharding auditor", database.getName(),
inUsedNames));
}
private Collection<String> getUsedAuditors() {
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
index 8a3808f8188..4e28fedc8f1 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import lombok.Setter;
import
org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDropExecutor;
import
org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
@@ -66,7 +66,7 @@ public final class DropShardingKeyGeneratorExecutor
implements DatabaseRuleDropE
private void checkInUsed(final DropShardingKeyGeneratorStatement
sqlStatement) {
Collection<String> usedKeyGenerators = getUsedKeyGenerators();
Collection<String> inUsedNames =
sqlStatement.getNames().stream().filter(usedKeyGenerators::contains).collect(Collectors.toList());
- ShardingSpherePreconditions.checkState(inUsedNames.isEmpty(), () ->
new AlgorithmInUsedException("Key generator", database.getName(), inUsedNames));
+ ShardingSpherePreconditions.checkState(inUsedNames.isEmpty(), () ->
new InUsedAlgorithmException("Key generator", database.getName(), inUsedNames));
}
private Collection<String> getUsedKeyGenerators() {
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java
index 60e7f6fc933..d1b376b5400 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.update;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.RuleDefinitionException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -75,7 +75,7 @@ class DropShardingAlgorithmExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
executor.setRule(rule);
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(createSQLStatement("t_order_tb_inline")));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(createSQLStatement("t_order_tb_inline")));
}
@Test
@@ -83,7 +83,7 @@ class DropShardingAlgorithmExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(createCurrentRuleConfiguration());
executor.setRule(rule);
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order_tb_inline")));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(createSQLStatementWithIfExists("t_order_tb_inline")));
}
@Test
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorExecutorTest.java
index 7606e70e6d9..16d71779195 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.update;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Properties;
@@ -56,7 +55,7 @@ class DropShardingAuditorExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(new
ShardingRuleConfiguration());
executor.setRule(rule);
- assertThrows(UnregisteredAlgorithmException.class, () ->
executor.checkBeforeUpdate(createSQLStatement("sharding_key_required_auditor")));
+ assertThrows(UnregisteredAlgorithmException.class, () ->
executor.checkBeforeUpdate(new DropShardingAuditorStatement(false,
Collections.singleton("sharding_key_required_auditor"))));
}
@Test
@@ -75,7 +74,7 @@ class DropShardingAuditorExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
executor.setRule(rule);
- ShardingRuleConfiguration actual =
executor.buildToBeDroppedRuleConfiguration(createSQLStatement("sharding_key_required_auditor"));
+ ShardingRuleConfiguration actual =
executor.buildToBeDroppedRuleConfiguration(new
DropShardingAuditorStatement(false,
Collections.singleton("sharding_key_required_auditor")));
assertFalse(actual.getAuditors().isEmpty());
}
@@ -87,7 +86,7 @@ class DropShardingAuditorExecutorTest {
ShardingRule rule = mock(ShardingRule.class);
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
executor.setRule(rule);
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(createSQLStatement("sharding_key_required_auditor")));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(new DropShardingAuditorStatement(false,
Collections.singleton("sharding_key_required_auditor"))));
}
private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration() {
@@ -95,8 +94,4 @@ class DropShardingAuditorExecutorTest {
result.setAuditStrategy(new
ShardingAuditStrategyConfiguration(Collections.singleton("sharding_key_required_auditor"),
true));
return result;
}
-
- private DropShardingAuditorStatement createSQLStatement(final String...
auditorNames) {
- return new DropShardingAuditorStatement(false,
Arrays.asList(auditorNames));
- }
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorExecutorTest.java
index 2f2043d97d3..c0656554f05 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.update;
import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInUsedException;
+import
org.apache.shardingsphere.infra.algorithm.core.exception.type.InUsedAlgorithmException;
import
org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
@@ -85,7 +85,7 @@ class DropShardingKeyGeneratorExecutorTest {
when(rule.getConfiguration()).thenReturn(currentRuleConfig);
executor.setRule(rule);
DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(false,
Collections.singleton("uuid_key_generator"));
- assertThrows(AlgorithmInUsedException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
+ assertThrows(InUsedAlgorithmException.class, () ->
executor.checkBeforeUpdate(sqlStatement));
}
private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration() {
diff --git
a/infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/AlgorithmInUsedException.java
b/infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/InUsedAlgorithmException.java
similarity index 89%
rename from
infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/AlgorithmInUsedException.java
rename to
infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/InUsedAlgorithmException.java
index 3138bf5c787..cb4ba4d2454 100644
---
a/infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/AlgorithmInUsedException.java
+++
b/infra/algorithm/core/src/main/java/org/apache/shardingsphere/infra/algorithm/core/exception/type/InUsedAlgorithmException.java
@@ -23,13 +23,13 @@ import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpe
import java.util.Collection;
/**
- * Algorithm in used exception.
+ * in used algorithm exception.
*/
-public final class AlgorithmInUsedException extends
AlgorithmDefinitionException {
+public final class InUsedAlgorithmException extends
AlgorithmDefinitionException {
private static final long serialVersionUID = -8735125626190637177L;
- public AlgorithmInUsedException(final String type, final String
databaseName, final Collection<String> algorithmNames) {
+ public InUsedAlgorithmException(final String type, final String
databaseName, final Collection<String> algorithmNames) {
super(XOpenSQLState.CHECK_OPTION_VIOLATION, 93, "%s algorithms '%s' in
database '%s' are still in used.", type, algorithmNames, databaseName);
}
}
