Add DataNodeDefinitionException (#30774)

* Move UnsupportedActualDataNodeStructureException * Move UnsupportedActualDataNodeStructureException * Add DataNodeDefinitionException * Move SingleDefinitionException * Refactor AlgorithmDefinitionException
apache · Apr 4, 2024 · 7199fb2 · 7199fb2
1 parent 32b5812
commit 7199fb2
Show file tree

Hide file tree

Showing 105 changed files with 202 additions and 169 deletions.
diff --git a/docs/document/content/user-manual/error-code/sql-error-code.cn.md b/docs/document/content/user-manual/error-code/sql-error-code.cn.md
@@ -14,12 +14,10 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 
 | SQL State | Vendor Code | 错误信息                                                                                |
 |-----------|-------------|-------------------------------------------------------------------------------------|
-| HY000     | 10000       | Can not support 3-tier structure for actual data node '%s' with JDBC '%s'.          |
-| HY004     | 10001       | Invalid format for actual data node '%s'.                                           |
-| 42S02     | 10010       | Database is required.                                                               |
-| 42S02     | 10011       | Schema '%s' does not exist.                                                         |
-| 42S02     | 10012       | Table or view '%s' does not exist.                                                  |
-| 42S02     | 10013       | Unknown column '%s' in '%s'.                                                        |
+| 42S02     | 10000       | Database is required.                                                               |
+| 42S02     | 10001       | Schema '%s' does not exist.                                                         |
+| 42S02     | 10002       | Table or view '%s' does not exist.                                                  |
+| 42S02     | 10003       | Unknown column '%s' in '%s'.                                                        |
 | HY000     | 10100       | Can not %s storage units '%s'.                                                      |
 | 42S02     | 10101       | There is no storage unit in database '%s'.                                          |
 | 44000     | 10102       | Storage units '%s' do not exist in database '%s'.                                   |
@@ -33,16 +31,18 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 | 42S02     | 10202       | %s rules '%s' do not exist in database '%s'.                                        |
 | 44000     | 10203       | %s rules '%s' in database '%s' are still in used.                                   |
 | 42S01     | 10204       | Duplicate %s rule names '%s' in database '%s'.                                      |
-| 44000     | 10300       | Algorithm '%s.'%s' initialization failed, reason is: %s.                            |
-| 44000     | 10301       | '%s' algorithm on %s is required.                                                   |
-| 42S02     | 10302       | '%s' algorithm '%s' on %s is unregistered.                                          |
-| 44000     | 10303       | %s algorithms '%s' in database '%s' are still in used.                              |
-| 44000     | 10304       | Invalid %s algorithm configuration '%s'.                                            |
-| HY000     | 10350       | Algorithm '%s.%s' execute failed, reason is: %s.                                    |
-| 44000     | 10400       | Invalid single rule configuration, reason is: %s.                                   |
-| 42S02     | 10401       | Single table '%s' does not exist.                                                   |
-| HY000     | 10402       | Can not load table with database name '%s' and data source name '%s', reason is: %s |
-| 0A000     | 10403       | Can not drop schema '%s' because of contains tables.                                |
+| HY004     | 13000       | Invalid format for actual data node '%s'.                                           |
+| HY000     | 13001       | Can not support 3-tier structure for actual data node '%s' with JDBC '%s'.          |
+| 44000     | 10400       | Algorithm '%s.'%s' initialization failed, reason is: %s.                            |
+| 44000     | 10401       | '%s' algorithm on %s is required.                                                   |
+| 42S02     | 10402       | '%s' algorithm '%s' on %s is unregistered.                                          |
+| 44000     | 10403       | %s algorithms '%s' in database '%s' are still in used.                              |
+| 44000     | 10404       | Invalid %s algorithm configuration '%s'.                                            |
+| HY000     | 10450       | Algorithm '%s.%s' execute failed, reason is: %s.                                    |
+| 44000     | 10500       | Invalid single rule configuration, reason is: %s.                                   |
+| 42S02     | 10501       | Single table '%s' does not exist.                                                   |
+| HY000     | 10502       | Can not load table with database name '%s' and data source name '%s', reason is: %s |
+| 0A000     | 10503       | Can not drop schema '%s' because of contains tables.                                |
 
 ### 数据
 

diff --git a/docs/document/content/user-manual/error-code/sql-error-code.en.md b/docs/document/content/user-manual/error-code/sql-error-code.en.md
@@ -14,12 +14,10 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 
 | SQL State | Vendor Code | Reason                                                                              |
 |-----------|-------------|-------------------------------------------------------------------------------------|
-| HY000     | 10000       | Can not support 3-tier structure for actual data node '%s' with JDBC '%s'.          |
-| HY004     | 10001       | Invalid format for actual data node '%s'.                                           |
-| 42S02     | 10010       | Database is required.                                                               |
-| 42S02     | 10011       | Schema '%s' does not exist.                                                         |
-| 42S02     | 10012       | Table or view '%s' does not exist.                                                  |
-| 42S02     | 10013       | Unknown column '%s' in '%s'.                                                        |
+| 42S02     | 10000       | Database is required.                                                               |
+| 42S02     | 10001       | Schema '%s' does not exist.                                                         |
+| 42S02     | 10002       | Table or view '%s' does not exist.                                                  |
+| 42S02     | 10003       | Unknown column '%s' in '%s'.                                                        |
 | HY000     | 10100       | Can not %s storage units '%s'.                                                      |
 | 42S02     | 10101       | There is no storage unit in database '%s'.                                          |
 | 44000     | 10102       | Storage units '%s' do not exist in database '%s'.                                   |
@@ -33,16 +31,18 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 | 42S02     | 10202       | %s rules '%s' do not exist in database '%s'.                                        |
 | 44000     | 10203       | %s rules '%s' in database '%s' are still in used.                                   |
 | 42S01     | 10204       | Duplicate %s rule names '%s' in database '%s'.                                      |
-| 44000     | 10300       | Algorithm '%s.'%s' initialization failed, reason is: %s.                            |
-| 44000     | 10301       | '%s' algorithm on %s is required.                                                   |
-| 42S02     | 10302       | '%s' algorithm '%s' on %s is unregistered.                                          |
-| 44000     | 10303       | %s algorithms '%s' in database '%s' are still in used.                              |
-| 44000     | 10304       | Invalid %s algorithm configuration '%s'.                                            |
-| HY000     | 10350       | Algorithm '%s.%s' execute failed, reason is: %s.                                    |
-| 44000     | 10400       | Invalid single rule configuration, reason is: %s.                                   |
-| 42S02     | 10401       | Single table '%s' does not exist.                                                   |
-| HY000     | 10402       | Can not load table with database name '%s' and data source name '%s', reason is: %s |
-| 0A000     | 10403       | Can not drop schema '%s' because of contains tables.                                |
+| HY004     | 13000       | Invalid format for actual data node '%s'.                                           |
+| HY000     | 13001       | Can not support 3-tier structure for actual data node '%s' with JDBC '%s'.          |
+| 44000     | 10400       | Algorithm '%s.'%s' initialization failed, reason is: %s.                            |
+| 44000     | 10401       | '%s' algorithm on %s is required.                                                   |
+| 42S02     | 10402       | '%s' algorithm '%s' on %s is unregistered.                                          |
+| 44000     | 10403       | %s algorithms '%s' in database '%s' are still in used.                              |
+| 44000     | 10404       | Invalid %s algorithm configuration '%s'.                                            |
+| HY000     | 10450       | Algorithm '%s.%s' execute failed, reason is: %s.                                    |
+| 44000     | 10500       | Invalid single rule configuration, reason is: %s.                                   |
+| 42S02     | 10501       | Single table '%s' does not exist.                                                   |
+| HY000     | 10502       | Can not load table with database name '%s' and data source name '%s', reason is: %s |
+| 0A000     | 10503       | Can not drop schema '%s' because of contains tables.                                |
 
 ### Data
 

diff --git a/...c/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java b/...c/main/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithm.java
@@ -26,7 +26,7 @@
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithmMetaData;
 import org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 
 import javax.crypto.Cipher;

diff --git a/.../main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java b/.../main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
@@ -28,8 +28,8 @@
 import org.apache.shardingsphere.encrypt.exception.metadata.EncryptLikeQueryColumnNotFoundException;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
 import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.EmptyAlgorithmException;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.EmptyAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;

diff --git a/...st/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithmTest.java b/...st/java/org/apache/shardingsphere/encrypt/algorithm/standard/AESEncryptAlgorithmTest.java
@@ -20,7 +20,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
 import org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;

diff --git a/...t/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationCheckerTest.java b/...t/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationCheckerTest.java
@@ -22,7 +22,7 @@
 import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration;
 import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
 import org.junit.jupiter.api.Test;

diff --git a/...a/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java b/...a/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java
@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.exception.metadata.rule.DuplicateRuleException;
 import org.apache.shardingsphere.infra.exception.metadata.rule.InvalidRuleConfigurationException;

diff --git a/...g/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java b/...g/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutorTest.java
@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment;
 import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement;
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;

diff --git a/...rc/main/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesChecker.java b/...rc/main/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesChecker.java
@@ -19,7 +19,7 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
 

diff --git a/...c/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java b/...c/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mask.algorithm.cover;
 
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropertiesChecker;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;

diff --git a/...c/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java b/...c/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mask.algorithm.cover;
 
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropertiesChecker;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;

diff --git a/.../org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java b/.../org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java
@@ -19,7 +19,7 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
 

diff --git a/...re/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java b/...re/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mask.checker;
 
 import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;

diff --git a/...est/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java b/...est/java/org/apache/shardingsphere/mask/algorithm/MaskAlgorithmPropertiesCheckerTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.mask.algorithm;
 
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;

diff --git a/.../java/org/apache/shardingsphere/mask/algorithm/parameterized/MaskAlgorithmAssertions.java b/.../java/org/apache/shardingsphere/mask/algorithm/parameterized/MaskAlgorithmAssertions.java
@@ -19,7 +19,7 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
 

diff --git a/...shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java b/...shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.readwritesplitting.checker;
 
 import com.google.common.base.Strings;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.UnregisteredAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
 import org.apache.shardingsphere.infra.algorithm.loadbalancer.core.LoadBalanceAlgorithm;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;

diff --git a/...dingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java b/...dingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.readwritesplitting.checker;
 
 import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
 import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;

diff --git a/...e/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java b/...e/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.algorithm.shadow.column;
 
 import lombok.Getter;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.shadow.algorithm.shadow.validator.ShadowValueValidator;
 import org.apache.shardingsphere.shadow.api.shadow.ShadowOperationType;

diff --git a/...ache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java b/...ache/shardingsphere/shadow/algorithm/shadow/column/ColumnRegexMatchedShadowAlgorithm.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.algorithm.shadow.column;
 
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 
 import java.util.Properties;

diff --git a/...ache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java b/...ache/shardingsphere/shadow/algorithm/shadow/column/ColumnValueMatchedShadowAlgorithm.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.shadow.algorithm.shadow.column;
 
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.AlgorithmInitializationException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.AlgorithmInitializationException;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 
 import java.util.Properties;

diff --git a/...rc/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java b/...rc/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.shadow.checker;
 
 import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.algorithm.core.exception.type.EmptyAlgorithmException;
+import org.apache.shardingsphere.infra.algorithm.core.exception.EmptyAlgorithmException;
 import org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;