You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/09/05 14:43:04 UTC
[shardingsphere] branch master updated: Add ResultSetClosedException (#20805)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 8bd3d2ecd57 Add ResultSetClosedException (#20805)
8bd3d2ecd57 is described below
commit 8bd3d2ecd57d411e258b0eeff6e9f74f5c020a39
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Sep 5 22:42:55 2022 +0800
Add ResultSetClosedException (#20805)
---
.../user-manual/error-code/sql-error-code.cn.md | 1 +
.../user-manual/error-code/sql-error-code.en.md | 1 +
.../shardingsphere/sharding/rule/ShardingRule.java | 14 ++++-----
.../core/resultset/DatabaseMetaDataResultSet.java | 5 ++--
.../jdbc/exception/ResultSetClosedException.java | 33 ++++++++++++++++++++++
5 files changed, 45 insertions(+), 9 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 947bf3c0ad6..eff898aaac9 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
@@ -22,6 +22,7 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
| HY004 | 10301 | Invalid value \`%s\` |
| HV008 | 10302 | Column index \`%d\` is out of range |
| HY004 | 10400 | Invalid format for actual data node \`%s\` |
+| HY000 | 10500 | Result set has been closed |
| 42000 | 11000 | You have an error in your SQL syntax: %s |
| 42000 | 11002 | Resource does not exist |
| 42000 | 11003 | Rule does not exist |
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 eb84e13f0dc..0293d95312f 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
@@ -22,6 +22,7 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
| HY004 | 10301 | Invalid value \`%s\` |
| HV008 | 10302 | Column index \`%d\` is out of range |
| HY004 | 10400 | Invalid format for actual data node \`%s\` |
+| HY000 | 10500 | Result set has been closed |
| 42000 | 11000 | You have an error in your SQL syntax: %s |
| 42000 | 11002 | Resource does not exist |
| 42000 | 11003 | Rule does not exist |
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 3c247477da4..76276802aca 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -22,7 +22,7 @@ import com.google.common.base.Splitter;
import lombok.Getter;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
-import org.apache.shardingsphere.infra.instance.InstanceContextAware;
+import org.apache.shardingsphere.infra.config.algorithm.InstanceAwareAlgorithm;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.datanode.DataNode;
@@ -135,9 +135,9 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
- keyGenerators.values().stream().filter(each -> each instanceof InstanceContextAware).forEach(each -> ((InstanceContextAware) each).setInstanceContext(instanceContext));
- if (defaultKeyGenerateAlgorithm instanceof InstanceContextAware) {
- ((InstanceContextAware) defaultKeyGenerateAlgorithm).setInstanceContext(instanceContext);
+ keyGenerators.values().stream().filter(each -> each instanceof InstanceAwareAlgorithm).forEach(each -> ((InstanceAwareAlgorithm) each).setInstanceContext(instanceContext));
+ if (defaultKeyGenerateAlgorithm instanceof InstanceAwareAlgorithm) {
+ ((InstanceAwareAlgorithm) defaultKeyGenerateAlgorithm).setInstanceContext(instanceContext);
}
}
@@ -162,9 +162,9 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
- keyGenerators.values().stream().filter(each -> each instanceof InstanceContextAware).forEach(each -> ((InstanceContextAware) each).setInstanceContext(instanceContext));
- if (defaultKeyGenerateAlgorithm instanceof InstanceContextAware) {
- ((InstanceContextAware) defaultKeyGenerateAlgorithm).setInstanceContext(instanceContext);
+ keyGenerators.values().stream().filter(each -> each instanceof InstanceAwareAlgorithm).forEach(each -> ((InstanceAwareAlgorithm) each).setInstanceContext(instanceContext));
+ if (defaultKeyGenerateAlgorithm instanceof InstanceAwareAlgorithm) {
+ ((InstanceAwareAlgorithm) defaultKeyGenerateAlgorithm).setInstanceContext(instanceContext);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
index 2ae9729f4d7..1d33bbd3377 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -18,10 +18,11 @@
package org.apache.shardingsphere.driver.jdbc.core.resultset;
import lombok.EqualsAndHashCode;
+import org.apache.shardingsphere.driver.jdbc.exception.ResultSetClosedException;
import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedDatabaseMetaDataResultSet;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtil;
-import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
+import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import java.math.BigDecimal;
import java.net.URL;
@@ -404,7 +405,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
private void checkClosed() throws SQLException {
if (closed) {
- throw new SQLException("ResultSet has closed.");
+ throw new ResultSetClosedException().toSQLException();
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/exception/ResultSetClosedException.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/exception/ResultSetClosedException.java
new file mode 100644
index 00000000000..ca179f2b52b
--- /dev/null
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/exception/ResultSetClosedException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.driver.jdbc.exception;
+
+import org.apache.shardingsphere.infra.util.exception.external.sql.ShardingSphereSQLException;
+import org.apache.shardingsphere.infra.util.exception.external.sql.sqlstate.XOpenSQLState;
+
+/**
+ * Result set closed exception.
+ */
+public final class ResultSetClosedException extends ShardingSphereSQLException {
+
+ private static final long serialVersionUID = 3931974854134322934L;
+
+ public ResultSetClosedException() {
+ super(XOpenSQLState.GENERAL_ERROR.getValue(), 10500, "Result set has been closed");
+ }
+}