This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 9ddb082fc1d Update sql-error-code for db-discovery (#23406)
9ddb082fc1d is described below
commit 9ddb082fc1dd43865840ac4966c24992390b6110
Author: zhaojinchao <[email protected]>
AuthorDate: Sun Jan 8 22:34:02 2023 +0800
Update sql-error-code for db-discovery (#23406)
* Refactor sql-error-code for db-discovery
* Fix code style
---
docs/document/content/user-manual/error-code/sql-error-code.cn.md | 6 ++++++
docs/document/content/user-manual/error-code/sql-error-code.en.md | 5 +++++
.../exception/DBDiscoveryDataSourceRuleNotFoundException.java | 2 +-
.../exception/MissingRequiredDBDiscoveryConfigurationException.java | 2 +-
.../exception/MissingRequiredGroupNameConfigurationException.java | 2 +-
.../exception/replica/DuplicatePrimaryDataSourceException.java | 2 +-
6 files changed, 15 insertions(+), 4 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
index 43a44cce6c2..0c2a472fe6d 100644
--- 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
@@ -206,10 +206,16 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
| SQL State | Vendor Code | 错误信息 |
| --------- | ----------- | ------ |
+| 44000 | 20300 | No available database discovery rule configuration
in database \`%s\`. |
+| 44000 | 20301 | Group name is required. |
+| 44000 | 20302 | Data source names are required. |
+| 44000 | 20303 | Can not found database discovery data source rule
in database \`%s\`. |
| HY000 | 20380 | MGR plugin is not active in database \`%s\`. |
| 44000 | 20381 | MGR is not in single primary mode in database
\`%s\`. |
| 44000 | 20382 | \`%s\` is not in MGR replication group member in
database \`%s\`. |
| 44000 | 20383 | Group name in MGR is not same with configured one
\`%s\` in database \`%s\`. |
+| 42S01 | 20390 | MySQL Duplicate primary data source in database
\`%s\`. |
+
### SQL 方言转换
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
index c8f272ef0fe..58b1101957d 100644
--- 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
@@ -206,10 +206,15 @@ SQL error codes provide by standard `SQL State`, `Vendor
Code` and `Reason`, whi
| SQL State | Vendor Code | Reason |
| --------- | ----------- | ------ |
+| 44000 | 20300 | No available database discovery rule configuration
in database \`%s\`. |
+| 44000 | 20301 | Group name is required. |
+| 44000 | 20302 | Data source names are required. |
+| 44000 | 20303 | Can not found database discovery data source rule
in database \`%s\`. |
| HY000 | 20380 | MGR plugin is not active in database \`%s\`. |
| 44000 | 20381 | MGR is not in single primary mode in database
\`%s\`. |
| 44000 | 20382 | \`%s\` is not in MGR replication group member in
database \`%s\`. |
| 44000 | 20383 | Group name in MGR is not same with configured one
\`%s\` in database \`%s\`. |
+| 42S01 | 20390 | MySQL Duplicate primary data source in database
\`%s\`. |
### SQL Dialect Translator
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryDataSourceRuleNotFoundException.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryDataSourceRuleNotFoundException.java
index abdfdb9e021..3067e0ec815 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryDataSourceRuleNotFoundException.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/DBDiscoveryDataSourceRuleNotFoundException.java
@@ -27,6 +27,6 @@ public final class DBDiscoveryDataSourceRuleNotFoundException
extends DBDiscover
private static final long serialVersionUID = -851752979377324961L;
public DBDiscoveryDataSourceRuleNotFoundException(final String
databaseName) {
- super(XOpenSQLState.CHECK_OPTION_VIOLATION, 3, "Can not found database
discovery data source rule in database `%s`", databaseName);
+ super(XOpenSQLState.CHECK_OPTION_VIOLATION, 3, "Can not found database
discovery data source rule in database `%s`.", databaseName);
}
}
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredDBDiscoveryConfigurationException.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredDBDiscoveryConfigurationException.java
index 0867b41a2a0..e373844d334 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredDBDiscoveryConfigurationException.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredDBDiscoveryConfigurationException.java
@@ -27,6 +27,6 @@ public final class
MissingRequiredDBDiscoveryConfigurationException extends DBDi
private static final long serialVersionUID = -7743963772524386090L;
public MissingRequiredDBDiscoveryConfigurationException(final String
databaseName) {
- super(XOpenSQLState.CHECK_OPTION_VIOLATION, 0, "No available database
discovery rule configuration in database `%s.", databaseName);
+ super(XOpenSQLState.CHECK_OPTION_VIOLATION, 0, "No available database
discovery rule configuration in database `%s`.", databaseName);
}
}
diff --git
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredGroupNameConfigurationException.java
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredGroupNameConfigurationException.java
index e2b8ea39433..d6dfe87e900 100644
---
a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredGroupNameConfigurationException.java
+++
b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/exception/MissingRequiredGroupNameConfigurationException.java
@@ -27,6 +27,6 @@ public final class
MissingRequiredGroupNameConfigurationException extends DBDisc
private static final long serialVersionUID = -3591914080387845399L;
public MissingRequiredGroupNameConfigurationException() {
- super(XOpenSQLState.CHECK_OPTION_VIOLATION, 1, "Group name is
required");
+ super(XOpenSQLState.CHECK_OPTION_VIOLATION, 1, "Group name is
required.");
}
}
diff --git
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/exception/replica/DuplicatePrimaryDataSourceException.java
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/exception/replica/DuplicatePrimaryDataSourceException.java
index a34295c9ae9..77d9c7c85aa 100644
---
a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/exception/replica/DuplicatePrimaryDataSourceException.java
+++
b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/exception/replica/DuplicatePrimaryDataSourceException.java
@@ -28,6 +28,6 @@ public final class DuplicatePrimaryDataSourceException
extends DBDiscoveryProvid
private static final long serialVersionUID = -7715117257616134436L;
public DuplicatePrimaryDataSourceException(final String databaseName) {
- super(XOpenSQLState.DUPLICATE, 90, "Duplicate primary data source in
database `%s`..", databaseName);
+ super(XOpenSQLState.DUPLICATE, 90, "Duplicate primary data source in
database `%s`.", databaseName);
}
}
