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 2021/01/18 04:38:35 UTC
[shardingsphere] branch master updated: Throw original SQL
exception if sane result mismatched (#9073)
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 b0cf0bb Throw original SQL exception if sane result mismatched (#9073)
b0cf0bb is described below
commit b0cf0bbd4569872291713d4dabb600f0c07e3c18
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Jan 18 12:38:04 2021 +0800
Throw original SQL exception if sane result mismatched (#9073)
---
.../sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java | 12 ++++++++++--
.../driver/jdbc/sane/DefaultSaneQueryResultEngine.java | 7 +++----
.../engine/driver/jdbc/sane/SaneQueryResultEngine.java | 6 +++---
.../driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java | 10 ++++++++--
.../sql/execute/engine/jdbc/JDBCExecutorCallbackTest.java | 5 +++--
.../executor/batch/BatchPreparedStatementExecutor.java | 5 +++--
.../driver/executor/callback/ExecuteQueryCallback.java | 5 +++--
.../jdbc/core/statement/ShardingSpherePreparedStatement.java | 10 +++++-----
.../driver/jdbc/core/statement/ShardingSphereStatement.java | 10 +++++-----
.../jdbc/executor/callback/ProxyJDBCExecutorCallback.java | 5 ++---
10 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
index 58c5c21..4e7de95 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
@@ -34,6 +34,7 @@ import java.sql.Statement;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -82,9 +83,16 @@ public abstract class JDBCExecutorCallback<T> implements ExecutorCallback<JDBCEx
sqlExecutionHook.finishSuccess();
return result;
} catch (final SQLException ex) {
+ if (!isTrunkThread) {
+ return null;
+ }
+ Optional<T> saneResult = getSaneResult(sqlStatement);
+ if (saneResult.isPresent()) {
+ return saneResult.get();
+ }
sqlExecutionHook.finishFailure(ex);
SQLExecutorExceptionHandler.handleException(ex);
- return isTrunkThread ? getSaneResult(sqlStatement) : null;
+ return null;
}
}
@@ -100,5 +108,5 @@ public abstract class JDBCExecutorCallback<T> implements ExecutorCallback<JDBCEx
protected abstract T executeSQL(String sql, Statement statement, ConnectionMode connectionMode) throws SQLException;
- protected abstract T getSaneResult(SQLStatement sqlStatement);
+ protected abstract Optional<T> getSaneResult(SQLStatement sqlStatement);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java
index 35253a7..f2fdd62 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultColumnMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
@@ -24,7 +25,6 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.ra
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.type.memory.row.MemoryQueryResultDataRow;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowOtherStatement;
import java.sql.Types;
import java.util.Collections;
@@ -36,9 +36,8 @@ import java.util.Optional;
public final class DefaultSaneQueryResultEngine implements SaneQueryResultEngine {
@Override
- public Optional<QueryResult> getSaneQueryResult(final SQLStatement sqlStatement) {
- return sqlStatement instanceof SelectStatement || sqlStatement instanceof MySQLShowOtherStatement
- ? Optional.of(createDefaultQueryResult()) : Optional.empty();
+ public Optional<ExecuteResult> getSaneQueryResult(final SQLStatement sqlStatement) {
+ return sqlStatement instanceof SelectStatement ? Optional.of(createDefaultQueryResult()) : Optional.empty();
}
private QueryResult createDefaultQueryResult() {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java
index 3859d2d..acc548c 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -32,7 +32,7 @@ public interface SaneQueryResultEngine extends TypedSPI {
* Get sane query result.
*
* @param sqlStatement SQL statement
- * @return sane query result
+ * @return sane execute result
*/
- Optional<QueryResult> getSaneQueryResult(SQLStatement sqlStatement);
+ Optional<ExecuteResult> getSaneQueryResult(SQLStatement sqlStatement);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java
index 1d3928d..ac30171 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java
@@ -18,15 +18,18 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.mysql;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultColumnMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.type.memory.row.MemoryQueryResultDataRow;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLSetStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowOtherStatement;
import java.sql.Types;
@@ -41,17 +44,20 @@ import java.util.Optional;
public final class MySQLSaneQueryResultEngine implements SaneQueryResultEngine {
@Override
- public Optional<QueryResult> getSaneQueryResult(final SQLStatement sqlStatement) {
+ public Optional<ExecuteResult> getSaneQueryResult(final SQLStatement sqlStatement) {
if (sqlStatement instanceof SelectStatement) {
return createQueryResult((SelectStatement) sqlStatement);
}
if (sqlStatement instanceof MySQLShowOtherStatement) {
return Optional.of(createQueryResult((MySQLShowOtherStatement) sqlStatement));
}
+ if (sqlStatement instanceof MySQLSetStatement) {
+ return Optional.of(new UpdateResult(0, 0));
+ }
return Optional.empty();
}
- private Optional<QueryResult> createQueryResult(final SelectStatement sqlStatement) {
+ private Optional<ExecuteResult> createQueryResult(final SelectStatement sqlStatement) {
List<RawQueryResultColumnMetaData> queryResultColumnMetaDataList = new ArrayList<>(sqlStatement.getProjections().getProjections().size());
List<Object> data = new ArrayList<>(sqlStatement.getProjections().getProjections().size());
for (ProjectionSegment each : sqlStatement.getProjections().getProjections()) {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorCallbackTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorCallbackTest.java
index 6a1c1ea..48e2369 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorCallbackTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorCallbackTest.java
@@ -41,6 +41,7 @@ import java.sql.Statement;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -81,8 +82,8 @@ public final class JDBCExecutorCallbackTest {
}
@Override
- protected Integer getSaneResult(final SQLStatement sqlStatement) {
- return 0;
+ protected Optional<Integer> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(0);
}
};
Field field = JDBCExecutorCallback.class.getDeclaredField("CACHED_DATASOURCE_METADATA");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
index 9ab2191..e490802 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
@@ -127,9 +127,10 @@ public final class BatchPreparedStatementExecutor {
return statement.executeBatch();
}
+ @SuppressWarnings("OptionalContainsCollection")
@Override
- protected int[] getSaneResult(final SQLStatement sqlStatement) {
- return new int[batchCount];
+ protected Optional<int[]> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(new int[batchCount]);
}
};
List<int[]> results = jdbcExecutor.execute(executionGroups, callback);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
index 01a3f9a..bc2f543 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
@@ -28,6 +28,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Optional;
/**
* Execute query callback.
@@ -45,8 +46,8 @@ public abstract class ExecuteQueryCallback extends JDBCExecutorCallback<QueryRes
}
@Override
- protected final QueryResult getSaneResult(final SQLStatement sqlStatement) {
- return null;
+ protected final Optional<QueryResult> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.empty();
}
protected abstract ResultSet executeQuery(String sql, Statement statement) throws SQLException;
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 82cc380..f083335 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
@@ -67,8 +67,8 @@ import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.optimize.execute.CalciteExecutor;
-import org.apache.shardingsphere.infra.optimize.schema.row.CalciteRowExecutor;
import org.apache.shardingsphere.infra.optimize.execute.CalciteJDBCExecutor;
+import org.apache.shardingsphere.infra.optimize.schema.row.CalciteRowExecutor;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.infra.rule.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.type.RawExecutionRule;
@@ -260,8 +260,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
@Override
- protected Integer getSaneResult(final SQLStatement sqlStatement) {
- return 0;
+ protected Optional<Integer> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(0);
}
};
}
@@ -308,8 +308,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
@Override
- protected Boolean getSaneResult(final SQLStatement sqlStatement) {
- return sqlStatement instanceof SelectStatement;
+ protected Optional<Boolean> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(sqlStatement instanceof SelectStatement);
}
};
}
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 89848a6..2130188 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
@@ -65,8 +65,8 @@ import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.optimize.execute.CalciteExecutor;
-import org.apache.shardingsphere.infra.optimize.schema.row.CalciteRowExecutor;
import org.apache.shardingsphere.infra.optimize.execute.CalciteJDBCExecutor;
+import org.apache.shardingsphere.infra.optimize.schema.row.CalciteRowExecutor;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.rule.type.DataNodeContainedRule;
@@ -275,8 +275,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
@Override
- protected Integer getSaneResult(final SQLStatement sqlStatement) {
- return 0;
+ protected Optional<Integer> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(0);
}
};
return driverJDBCExecutor.executeUpdate(executionGroups, sqlStatementContext, routeUnits, callback);
@@ -379,8 +379,8 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
@Override
- protected Boolean getSaneResult(final SQLStatement sqlStatement) {
- return sqlStatement instanceof SelectStatement;
+ protected Optional<Boolean> getSaneResult(final SQLStatement sqlStatement) {
+ return Optional.of(sqlStatement instanceof SelectStatement);
}
};
return driverJDBCExecutor.execute(executionGroups, sqlStatement, routeUnits, jdbcExecutorCallback);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index 7b4089f..3ba6f2a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -89,9 +89,8 @@ public abstract class ProxyJDBCExecutorCallback extends JDBCExecutorCallback<Exe
}
@Override
- protected final ExecuteResult getSaneResult(final SQLStatement sqlStatement) {
- Optional<QueryResult> queryResult = JDBCSaneQueryResultEngineFactory.newInstance(getFrontendDatabaseType()).getSaneQueryResult(sqlStatement);
- return queryResult.isPresent() ? queryResult.get() : new UpdateResult(0, 0);
+ protected final Optional<ExecuteResult> getSaneResult(final SQLStatement sqlStatement) {
+ return JDBCSaneQueryResultEngineFactory.newInstance(getFrontendDatabaseType()).getSaneQueryResult(sqlStatement);
}
private DatabaseType getFrontendDatabaseType() {