Skip to content

Throws SQLException instead of wrapped exception in ShardingSphere-JDBC #20669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tristaZero merged 1 commit into from
Aug 31, 2022
Merged

Throws SQLException instead of wrapped exception in ShardingSphere-JDBC #20669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions ...org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
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;
Expand Down Expand Up @@ -228,7 +227,7 @@ public ResultSet executeQuery() throws SQLException {
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;
Expand Down Expand Up @@ -278,15 +277,6 @@ private void resetParameters() throws SQLException {
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(),
Expand Down Expand Up @@ -465,14 +455,6 @@ public ResultSet getResultSet() throws SQLException {
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) {
Expand Down
15 changes: 1 addition & 14 deletions ...in/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
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;
Expand Down Expand Up @@ -172,7 +171,7 @@ public ResultSet executeQuery(final String sql) throws SQLException {
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;
Expand Down Expand Up @@ -206,10 +205,6 @@ private Optional<String> getInstanceId(final QueryContext queryContext) {
: 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(),
Expand Down Expand Up @@ -552,14 +547,6 @@ public ResultSet getResultSet() throws SQLException {
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) {
Expand Down