This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 51bf80f8e46 Refactor algorithm exceptions (#23420)
51bf80f8e46 is described below
commit 51bf80f8e462a650863dd557772a63bce7b33da3
Author: Chen Jiahao <[email protected]>
AuthorDate: Mon Jan 9 17:01:48 2023 +0800
Refactor algorithm exceptions (#23420)
---
...n.java => AlgorithmDefinitionViolationException.java} | 16 +++++++---------
.../exception/algorithm/AlgorithmInUsedException.java | 5 ++---
.../exception/algorithm/DuplicateAlgorithmException.java | 5 ++---
.../InvalidAlgorithmConfigurationException.java | 5 ++---
.../algorithm/MissingRequiredAlgorithmException.java | 5 ++---
5 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
similarity index 60%
copy from
distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
copy to
distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
index 0b9549eda27..930d9372b30 100644
---
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
+++
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
@@ -17,19 +17,17 @@
package org.apache.shardingsphere.distsql.handler.exception.algorithm;
-import
org.apache.shardingsphere.distsql.handler.exception.rule.RuleDefinitionViolationException;
-import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
-
-import java.util.Collection;
+import org.apache.shardingsphere.distsql.handler.exception.DistSQLException;
+import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.SQLState;
/**
- * Duplicate algorithm exception.
+ * Algorithm definition violation exception.
*/
-public final class DuplicateAlgorithmException extends
RuleDefinitionViolationException {
+public abstract class AlgorithmDefinitionViolationException extends
DistSQLException {
- private static final long serialVersionUID = 4382238091103015055L;
+ private static final long serialVersionUID = -727466071244178933L;
- public DuplicateAlgorithmException(final String type, final String
databaseName, final Collection<String> auditorNames) {
- super(XOpenSQLState.CHECK_OPTION_VIOLATION, 153, "Duplicate %s
algorithms `%s` in database `%s`.", type, auditorNames, databaseName);
+ public AlgorithmDefinitionViolationException(final SQLState sqlState,
final int errorCode, final String reason, final Object... messageArgs) {
+ super(sqlState, errorCode, reason, messageArgs);
}
}
diff --git
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
index b515219b5c4..058d5f9ccd7 100644
---
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
+++
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.distsql.handler.exception.algorithm;
-import
org.apache.shardingsphere.distsql.handler.exception.rule.RuleDefinitionViolationException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
import java.util.Collection;
@@ -25,9 +24,9 @@ import java.util.Collection;
/**
* Algorithm in used exception.
*/
-public final class AlgorithmInUsedException extends
RuleDefinitionViolationException {
+public final class AlgorithmInUsedException extends
AlgorithmDefinitionViolationException {
- private static final long serialVersionUID = -5748228542420285726L;
+ private static final long serialVersionUID = -8735125626190637177L;
public AlgorithmInUsedException(final String type, final String
databaseName, final Collection<String> algorithmNames) {
super(XOpenSQLState.CHECK_OPTION_VIOLATION, 152, "%s algorithms `%s`
in database `%s` are still in used.", type, algorithmNames, databaseName);
diff --git
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
index 0b9549eda27..f98ab25b8d8 100644
---
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
+++
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.distsql.handler.exception.algorithm;
-import
org.apache.shardingsphere.distsql.handler.exception.rule.RuleDefinitionViolationException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
import java.util.Collection;
@@ -25,9 +24,9 @@ import java.util.Collection;
/**
* Duplicate algorithm exception.
*/
-public final class DuplicateAlgorithmException extends
RuleDefinitionViolationException {
+public final class DuplicateAlgorithmException extends
AlgorithmDefinitionViolationException {
- private static final long serialVersionUID = 4382238091103015055L;
+ private static final long serialVersionUID = 3503761639898230997L;
public DuplicateAlgorithmException(final String type, final String
databaseName, final Collection<String> auditorNames) {
super(XOpenSQLState.CHECK_OPTION_VIOLATION, 153, "Duplicate %s
algorithms `%s` in database `%s`.", type, auditorNames, databaseName);
diff --git
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
index 89a8a532402..4cce1c98a38 100644
---
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
+++
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.distsql.handler.exception.algorithm;
-import
org.apache.shardingsphere.distsql.handler.exception.rule.RuleDefinitionViolationException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
import java.util.Collection;
@@ -25,9 +24,9 @@ import java.util.Collection;
/**
* Invalid algorithm configuration exception.
*/
-public final class InvalidAlgorithmConfigurationException extends
RuleDefinitionViolationException {
+public final class InvalidAlgorithmConfigurationException extends
AlgorithmDefinitionViolationException {
- private static final long serialVersionUID = 9076740384552385180L;
+ private static final long serialVersionUID = 1352014079406440573L;
public InvalidAlgorithmConfigurationException(final String algorithmType,
final Collection<String> algorithms) {
super(XOpenSQLState.CHECK_OPTION_VIOLATION, 150,
String.format("Invalid %s algorithms `%s`.", algorithmType, algorithms));
diff --git
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
index 505e6ecfdfa..1997fbc77b2 100644
---
a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
+++
b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.distsql.handler.exception.algorithm;
-import
org.apache.shardingsphere.distsql.handler.exception.rule.RuleDefinitionViolationException;
import
org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
import java.util.Collection;
@@ -25,9 +24,9 @@ import java.util.Collection;
/**
* Missing required algorithm exception.
*/
-public final class MissingRequiredAlgorithmException extends
RuleDefinitionViolationException {
+public final class MissingRequiredAlgorithmException extends
AlgorithmDefinitionViolationException {
- private static final long serialVersionUID = -1952698375135777585L;
+ private static final long serialVersionUID = 4591071898233749618L;
public MissingRequiredAlgorithmException() {
super(XOpenSQLState.CHECK_OPTION_VIOLATION, 151, "Algorithm does not
exist.");
