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 c4bc33d949d Throws SQLException instead of wrapped exception in
ShardingSphere-JDBC (#20669)
c4bc33d949d is described below
commit c4bc33d949d5ba3130f40ff7ad937be037b9187b
Author: 吴伟杰 <[email protected]>
AuthorDate: Wed Aug 31 13:46:35 2022 +0800
Throws SQLException instead of wrapped exception in ShardingSphere-JDBC
(#20669)
---
.../statement/ShardingSpherePreparedStatement.java | 20 +-------------------
.../jdbc/core/statement/ShardingSphereStatement.java | 15 +--------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 4a5f8efe1d7..5688eaab1ac 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -78,7 +78,6 @@ import
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRul
import org.apache.shardingsphere.infra.rule.identifier.type.RawExecutionRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.StorageConnectorReusableRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.infra.util.exception.sql.SQLWrapperException;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -228,7 +227,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
executionContext = createExecutionContext(queryContext);
List<QueryResult> queryResults = executeQuery0();
MergedResult mergedResult = mergeQuery(queryResults);
- result = new ShardingSphereResultSet(getShardingSphereResultSet(),
mergedResult, this, executionContext);
+ result = new ShardingSphereResultSet(getResultSets(),
mergedResult, this, executionContext);
} catch (SQLException ex) {
handleExceptionInTransaction(connection, metaDataContexts);
throw ex;
@@ -278,15 +277,6 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
replaySetParameter();
}
- private List<ResultSet> getShardingSphereResultSet() {
- List<ResultSet> result = new ArrayList<>(statements.size());
- for (PreparedStatement each : statements) {
- ResultSet resultSet = getResultSet(each);
- result.add(resultSet);
- }
- return result;
- }
-
private List<QueryResult> executeQuery0() throws SQLException {
if (hasRawExecutionRule()) {
return
executor.getRawExecutor().execute(createRawExecutionGroupContext(),
executionContext.getQueryContext(),
@@ -465,14 +455,6 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
return currentResultSet;
}
- private ResultSet getResultSet(final Statement statement) {
- try {
- return statement.getResultSet();
- } catch (final SQLException ex) {
- throw new SQLWrapperException(ex);
- }
- }
-
private List<ResultSet> getResultSets() throws SQLException {
List<ResultSet> result = new ArrayList<>(statements.size());
for (Statement each : statements) {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 022c89c4b2f..216bfb3062a 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -73,7 +73,6 @@ import
org.apache.shardingsphere.infra.route.context.RouteUnit;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.RawExecutionRule;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.infra.util.exception.sql.SQLWrapperException;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -172,7 +171,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
executionContext = createExecutionContext(queryContext);
List<QueryResult> queryResults = executeQuery0();
MergedResult mergedResult = mergeQuery(queryResults);
- result = new
ShardingSphereResultSet(getShardingSphereResultSets(), mergedResult, this,
executionContext);
+ result = new ShardingSphereResultSet(getResultSets(),
mergedResult, this, executionContext);
} catch (SQLException ex) {
handleExceptionInTransaction(connection, metaDataContexts);
throw ex;
@@ -206,10 +205,6 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
: Optional.empty();
}
- private List<ResultSet> getShardingSphereResultSets() {
- return
statements.stream().map(this::getResultSet).collect(Collectors.toList());
- }
-
private List<QueryResult> executeQuery0() throws SQLException {
if
(metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName()).getRuleMetaData().getRules().stream().anyMatch(each
-> each instanceof RawExecutionRule)) {
return
executor.getRawExecutor().execute(createRawExecutionContext(),
executionContext.getQueryContext(),
@@ -552,14 +547,6 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
return currentResultSet;
}
- private ResultSet getResultSet(final Statement statement) {
- try {
- return statement.getResultSet();
- } catch (final SQLException ex) {
- throw new SQLWrapperException(ex);
- }
- }
-
private List<ResultSet> getResultSets() throws SQLException {
List<ResultSet> result = new ArrayList<>(statements.size());
for (Statement each : statements) {
