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 2e2843d7a4b Refactor FileIOException (#30784)
2e2843d7a4b is described below
commit 2e2843d7a4b82c0a98178549fb0badc7d452630a
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Apr 5 21:52:15 2024 +0800
Refactor FileIOException (#30784)
---
docs/document/content/user-manual/error-code/sql-error-code.cn.md | 2 +-
docs/document/content/user-manual/error-code/sql-error-code.en.md | 2 +-
.../exception/core/external/sql/type/generic}/FileIOException.java | 7 +++----
.../distsql/ral/queryable/ConvertYamlConfigurationExecutor.java | 2 +-
.../distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java | 2 +-
.../handler/distsql/ral/updatable/ImportMetaDataExecutor.java | 2 +-
.../org/apache/shardingsphere/proxy/backend/util/ExportUtils.java | 2 +-
7 files changed, 9 insertions(+), 10 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 33786a21731..e415dd3cc24 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
@@ -102,7 +102,6 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
|-------------|-----------|---------------------------------------------------------------|
| 17000 | 44000 | Mode must be 'cluster'.
|
| 17001 | HY000 | Work ID assigned failed, which can not exceed
1024. |
-| 17002 | HY000 | File access failed, file is: %s
|
| 17010 | HY000 | Cluster persist repository error, reason is: %s
|
| 17020 | HY000 | The cluster status is %s, can not support SQL
statement '%s'. |
@@ -259,3 +258,4 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
| 30003 | 0A000 | Unsupported command: %s |
| 30004 | HY000 | Server exception: %s |
| 30010 | HY000 | Can not find plugin class '%s'. |
+| 30020 | HY000 | File access failed, file is: %s |
\ No newline at end of file
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 e5fed060234..3db04781bd6 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
@@ -103,7 +103,6 @@ SQL error codes provide by standard `SQL State`, `Vendor
Code` and `Reason`, whi
|-------------|-----------|---------------------------------------------------------------|
| 17000 | 44000 | Mode must be 'cluster'.
|
| 17001 | HY000 | Work ID assigned failed, which can not exceed
1024. |
-| 17002 | HY000 | File access failed, file is: %s
|
| 17010 | HY000 | Cluster persist repository error, reason is: %s
|
| 17020 | HY000 | The cluster status is %s, can not support SQL
statement '%s'. |
@@ -260,3 +259,4 @@ SQL error codes provide by standard `SQL State`, `Vendor
Code` and `Reason`, whi
| 30003 | 0A000 | Unsupported command: %s |
| 30004 | HY000 | Server exception: %s |
| 30010 | HY000 | Can not find plugin class '%s'. |
+| 30020 | HY000 | File access failed, file is: %s |
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/exception/FileIOException.java
b/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java
similarity index 76%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/exception/FileIOException.java
rename to
infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java
index 972a92cd4e5..b36cbb1164e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/exception/FileIOException.java
+++
b/infra/exception/core/src/main/java/org/apache/shardingsphere/infra/exception/core/external/sql/type/generic/FileIOException.java
@@ -15,21 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.exception;
+package
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic;
import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
-import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ClusterSQLException;
import java.io.File;
/**
* File IO exception.
*/
-public final class FileIOException extends ClusterSQLException {
+public final class FileIOException extends GenericSQLException {
private static final long serialVersionUID = 1104839422339487793L;
public FileIOException(final File file) {
- super(XOpenSQLState.GENERAL_ERROR, 2, "File access failed, file is:
%s", file.getAbsolutePath());
+ super(XOpenSQLState.GENERAL_ERROR, 20, "File access failed, file is:
%s", file.getAbsolutePath());
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
index 59ec8eebbf9..f5c1db90476 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDataSourceConfiguration;
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConfiguration;
import
org.apache.shardingsphere.proxy.backend.config.yaml.swapper.YamlProxyDataSourceConfigurationSwapper;
-import org.apache.shardingsphere.proxy.backend.exception.FileIOException;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.FileIOException;
import java.io.File;
import java.io.IOException;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java
index f914fd98eca..08af05c6908 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseC
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.mode.manager.ContextManager;
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConfiguration;
-import org.apache.shardingsphere.proxy.backend.exception.FileIOException;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.FileIOException;
import
org.apache.shardingsphere.proxy.backend.util.YamlDatabaseConfigurationImportExecutor;
import java.io.File;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
index d4d317bd0fc..31124ab1d69 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConf
import
org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyServerConfiguration;
import
org.apache.shardingsphere.proxy.backend.distsql.export.ExportedClusterInfo;
import org.apache.shardingsphere.proxy.backend.distsql.export.ExportedMetaData;
-import org.apache.shardingsphere.proxy.backend.exception.FileIOException;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.FileIOException;
import
org.apache.shardingsphere.proxy.backend.util.YamlDatabaseConfigurationImportExecutor;
import java.io.File;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/ExportUtils.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/ExportUtils.java
index cec7854a721..c248440b2ad 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/ExportUtils.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/ExportUtils.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUn
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
-import org.apache.shardingsphere.proxy.backend.exception.FileIOException;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.FileIOException;
import java.io.File;
import java.io.IOException;
