This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 9ce019f7d26 Move package of StatementAddCallback and
StatementReplayCallback (#31574)
9ce019f7d26 is described below
commit 9ce019f7d26406bd0afa11822c972545a846f226
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 4 11:48:32 2024 +0800
Move package of StatementAddCallback and StatementReplayCallback (#31574)
---
.../driver/executor/DriverExecuteExecutor.java | 21 ++++++++++-----------
.../driver/executor/DriverExecuteQueryExecutor.java | 12 ++++++------
.../executor/DriverExecuteUpdateExecutor.java | 19 +++++++++----------
.../callback/StatementAddCallback.java | 2 +-
.../callback/StatementReplayCallback.java | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 8 ++++----
.../core/statement/ShardingSphereStatement.java | 8 ++++----
7 files changed, 35 insertions(+), 37 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
index e19437efbc3..7fc37656309 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.driver.executor.callback.ExecuteQueryCallback;
import
org.apache.shardingsphere.driver.executor.callback.impl.PreparedStatementExecuteQueryCallback;
import
org.apache.shardingsphere.driver.executor.callback.impl.StatementExecuteQueryCallback;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementReplayCallback;
+import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -101,15 +101,14 @@ public final class DriverExecuteExecutor {
* @param queryContext query context
* @param prepareEngine prepare engine
* @param executeCallback execute callback
- * @param statementReplayCallback statement replay callback
* @param statementAddCallback statement add callback
+ * @param statementReplayCallback statement replay callback
* @return execute result
* @throws SQLException SQL exception
*/
@SuppressWarnings("rawtypes")
- public boolean execute(final ShardingSphereDatabase database, final
QueryContext queryContext,
- final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final ExecuteCallback executeCallback, final
StatementReplayCallback statementReplayCallback, final StatementAddCallback
statementAddCallback) throws SQLException {
+ public boolean execute(final ShardingSphereDatabase database, final
QueryContext queryContext, final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+ final ExecuteCallback executeCallback, final
StatementAddCallback statementAddCallback, final StatementReplayCallback
statementReplayCallback) throws SQLException {
Optional<String> trafficInstanceId =
connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class),
queryContext);
if (trafficInstanceId.isPresent()) {
executeType = ExecuteType.TRAFFIC;
@@ -128,7 +127,7 @@ public final class DriverExecuteExecutor {
}
boolean isNeedImplicitCommitTransaction =
isNeedImplicitCommitTransaction(
connection,
queryContext.getSqlStatementContext().getSqlStatement(),
executionContext.getExecutionUnits().size() > 1);
- return executeWithExecutionContext(database, executeCallback,
executionContext, prepareEngine, isNeedImplicitCommitTransaction,
statementReplayCallback, statementAddCallback);
+ return executeWithExecutionContext(database, executeCallback,
executionContext, prepareEngine, isNeedImplicitCommitTransaction,
statementAddCallback, statementReplayCallback);
}
private ExecuteQueryCallback getExecuteQueryCallback(final
ShardingSphereDatabase database, final QueryContext queryContext, final String
jdbcDriverType) {
@@ -197,17 +196,17 @@ public final class DriverExecuteExecutor {
@SuppressWarnings("rawtypes")
private boolean executeWithExecutionContext(final ShardingSphereDatabase
database, final ExecuteCallback executeCallback, final ExecutionContext
executionContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final boolean isNeedImplicitCommitTransaction,
- final StatementReplayCallback
statementReplayCallback, final StatementAddCallback statementAddCallback)
throws SQLException {
+ final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
return isNeedImplicitCommitTransaction
- ? executeWithImplicitCommitTransaction(() ->
useDriverToExecute(database, executeCallback, executionContext, prepareEngine,
statementReplayCallback, statementAddCallback), connection,
+ ? executeWithImplicitCommitTransaction(() ->
useDriverToExecute(database, executeCallback, executionContext, prepareEngine,
statementAddCallback, statementReplayCallback), connection,
database.getProtocolType())
- : useDriverToExecute(database, executeCallback,
executionContext, prepareEngine, statementReplayCallback, statementAddCallback);
+ : useDriverToExecute(database, executeCallback,
executionContext, prepareEngine, statementAddCallback, statementReplayCallback);
}
@SuppressWarnings({"rawtypes", "unchecked"})
private boolean useDriverToExecute(final ShardingSphereDatabase database,
final ExecuteCallback callback, final ExecutionContext executionContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final StatementReplayCallback
statementReplayCallback, final StatementAddCallback statementAddCallback)
throws SQLException {
+ final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
createExecutionGroupContext(database, executionContext, prepareEngine);
for (ExecutionGroup<JDBCExecutionUnit> each :
executionGroupContext.getInputGroups()) {
statementAddCallback.add(getStatements(each),
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
index 4897c612f10..d4a1574fe6a 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
@@ -24,8 +24,8 @@ import
org.apache.shardingsphere.driver.executor.callback.impl.StatementExecuteQ
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSetUtils;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementReplayCallback;
+import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
@@ -100,15 +100,15 @@ public final class DriverExecuteQueryExecutor {
* @param prepareEngine prepare engine
* @param statement statement
* @param columnLabelAndIndexMap column label and index map
- * @param statementReplayCallback statement replay callback
* @param statementAddCallback statement add callback
+ * @param statementReplayCallback statement replay callback
* @return result set
* @throws SQLException SQL exception
*/
@SuppressWarnings("rawtypes")
public ResultSet executeQuery(final ShardingSphereDatabase database, final
QueryContext queryContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final Statement statement, final Map<String, Integer> columnLabelAndIndexMap,
- final StatementReplayCallback
statementReplayCallback, final StatementAddCallback statementAddCallback)
throws SQLException {
+ final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
statements.clear();
Optional<String> trafficInstanceId =
connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class),
queryContext);
if (trafficInstanceId.isPresent()) {
@@ -119,7 +119,7 @@ public final class DriverExecuteQueryExecutor {
return sqlFederationEngine.executeQuery(
prepareEngine, getExecuteQueryCallback(database,
queryContext, prepareEngine.getType()), new SQLFederationContext(false,
queryContext, metaData, connection.getProcessId()));
}
- List<QueryResult> queryResults = executePushDownQuery(database,
queryContext, prepareEngine, statementReplayCallback, statementAddCallback);
+ List<QueryResult> queryResults = executePushDownQuery(database,
queryContext, prepareEngine, statementAddCallback, statementReplayCallback);
MergedResult mergedResult = mergeQuery(database, queryResults,
queryContext.getSqlStatementContext());
boolean selectContainsEnhancedTable =
queryContext.getSqlStatementContext() instanceof SelectStatementContext
&& ((SelectStatementContext)
queryContext.getSqlStatementContext()).isContainsEnhancedTable();
@@ -145,7 +145,7 @@ public final class DriverExecuteQueryExecutor {
@SuppressWarnings({"rawtypes", "unchecked"})
private List<QueryResult> executePushDownQuery(final
ShardingSphereDatabase database, final QueryContext queryContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final
StatementReplayCallback statementReplayCallback, final StatementAddCallback
statementAddCallback) throws SQLException {
+ final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
ExecutionContext executionContext = createExecutionContext(database,
queryContext);
if (hasRawExecutionRule(database)) {
return rawExecutor.execute(
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
index 7592dcab94d..4eaab1d0b6d 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.driver.executor;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.executor.callback.ExecuteUpdateCallback;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementReplayCallback;
+import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.connection.kernel.KernelProcessor;
@@ -97,9 +97,8 @@ public final class DriverExecuteUpdateExecutor {
* @throws SQLException SQL exception
*/
@SuppressWarnings("rawtypes")
- public int executeUpdate(final ShardingSphereDatabase database, final
QueryContext queryContext,
- final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final ExecuteUpdateCallback updateCallback, final
StatementReplayCallback statementReplayCallback, final StatementAddCallback
statementAddCallback) throws SQLException {
+ public int executeUpdate(final ShardingSphereDatabase database, final
QueryContext queryContext, final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+ final ExecuteUpdateCallback updateCallback, final
StatementAddCallback statementAddCallback, final StatementReplayCallback
statementReplayCallback) throws SQLException {
Optional<String> trafficInstanceId =
connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class),
queryContext);
if (trafficInstanceId.isPresent()) {
return trafficExecutor.execute(connection.getProcessId(),
database.getName(), trafficInstanceId.get(), queryContext, prepareEngine,
updateCallback::executeUpdate);
@@ -108,17 +107,17 @@ public final class DriverExecuteUpdateExecutor {
return hasRawExecutionRule(database)
?
accumulate(rawExecutor.execute(createRawExecutionGroupContext(database,
executionContext), queryContext, new RawSQLExecutorCallback()))
: executeUpdate(database, updateCallback,
queryContext.getSqlStatementContext(), executionContext, prepareEngine,
isNeedImplicitCommitTransaction(
- connection,
queryContext.getSqlStatementContext().getSqlStatement(),
executionContext.getExecutionUnits().size() > 1), statementReplayCallback,
statementAddCallback);
+ connection,
queryContext.getSqlStatementContext().getSqlStatement(),
executionContext.getExecutionUnits().size() > 1), statementAddCallback,
statementReplayCallback);
}
@SuppressWarnings("rawtypes")
private int executeUpdate(final ShardingSphereDatabase database, final
ExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext, final ExecutionContext executionContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final boolean isNeedImplicitCommitTransaction,
- final StatementReplayCallback
statementReplayCallback, final StatementAddCallback statementAddCallback)
throws SQLException {
+ final StatementAddCallback statementAddCallback,
final StatementReplayCallback statementReplayCallback) throws SQLException {
return isNeedImplicitCommitTransaction
? executeWithImplicitCommitTransaction(() ->
useDriverToExecuteUpdate(
- database, updateCallback, sqlStatementContext,
executionContext, prepareEngine, statementReplayCallback,
statementAddCallback), connection, database.getProtocolType())
- : useDriverToExecuteUpdate(database, updateCallback,
sqlStatementContext, executionContext, prepareEngine, statementReplayCallback,
statementAddCallback);
+ database, updateCallback, sqlStatementContext,
executionContext, prepareEngine, statementAddCallback,
statementReplayCallback), connection, database.getProtocolType())
+ : useDriverToExecuteUpdate(database, updateCallback,
sqlStatementContext, executionContext, prepareEngine, statementAddCallback,
statementReplayCallback);
}
private boolean hasRawExecutionRule(final ShardingSphereDatabase database)
{
@@ -173,7 +172,7 @@ public final class DriverExecuteUpdateExecutor {
@SuppressWarnings({"rawtypes", "unchecked"})
private int useDriverToExecuteUpdate(final ShardingSphereDatabase
database, final ExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext,
final ExecutionContext
executionContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit,
Connection> prepareEngine,
- final StatementReplayCallback
statementReplayCallback, final StatementAddCallback statementAddCallback)
throws SQLException {
+ final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
createExecutionGroupContext(database, executionContext, prepareEngine);
for (ExecutionGroup<JDBCExecutionUnit> each :
executionGroupContext.getInputGroups()) {
statementAddCallback.add(getStatements(each),
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementAddCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
similarity index 94%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementAddCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
index 70482d733cc..0f63ab63e5f 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementAddCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.jdbc.core.statement.callback;
+package org.apache.shardingsphere.driver.executor.callback;
import java.sql.Statement;
import java.util.Collection;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementReplayCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
similarity index 93%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementReplayCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
index 3aefa19a73c..ad511eafbfa 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/callback/StatementReplayCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.jdbc.core.statement.callback;
+package org.apache.shardingsphere.driver.executor.callback;
import java.sql.SQLException;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 49cf8046d88..eff0cefadcd 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne
import
org.apache.shardingsphere.driver.jdbc.core.resultset.GeneratedKeysResultSet;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSetUtils;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementAddCallback;
+import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
import
org.apache.shardingsphere.driver.jdbc.core.statement.metadata.ShardingSphereParameterMetaData;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import org.apache.shardingsphere.infra.binder.context.aware.ParameterAware;
@@ -207,7 +207,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
ShardingSphereDatabase database =
metaData.getDatabase(databaseName);
findGeneratedKey().ifPresent(optional ->
generatedValues.addAll(optional.getGeneratedValues()));
currentResultSet =
driverExecutorFacade.getQueryExecutor().executeQuery(database, queryContext,
createDriverExecutionPrepareEngine(database), this, columnLabelAndIndexMap,
- this::replay, (StatementAddCallback<PreparedStatement>)
this::addStatements);
+ (StatementAddCallback<PreparedStatement>)
this::addStatements, this::replay);
if (currentResultSet instanceof ShardingSphereResultSet) {
columnLabelAndIndexMap = ((ShardingSphereResultSet)
currentResultSet).getColumnLabelAndIndexMap();
}
@@ -256,7 +256,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
handleAutoCommit(queryContext.getSqlStatementContext().getSqlStatement());
ShardingSphereDatabase database =
metaData.getDatabase(databaseName);
int result =
driverExecutorFacade.getUpdateExecutor().executeUpdate(database, queryContext,
createDriverExecutionPrepareEngine(database),
- (sql, statement) -> ((PreparedStatement)
statement).executeUpdate(), this::replay,
(StatementAddCallback<PreparedStatement>) this::addStatements);
+ (sql, statement) -> ((PreparedStatement)
statement).executeUpdate(), (StatementAddCallback<PreparedStatement>)
this::addStatements, this::replay);
findGeneratedKey().ifPresent(optional ->
generatedValues.addAll(optional.getGeneratedValues()));
return result;
// CHECKSTYLE:OFF
@@ -282,7 +282,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
ShardingSphereDatabase database =
metaData.getDatabase(databaseName);
boolean result = driverExecutorFacade.getExecuteExecutor().execute(
database, queryContext,
createDriverExecutionPrepareEngine(database), (sql, statement) ->
((PreparedStatement) statement).execute(),
- this::replay, (StatementAddCallback<PreparedStatement>)
this::addStatements);
+ (StatementAddCallback<PreparedStatement>)
this::addStatements, this::replay);
findGeneratedKey().ifPresent(optional ->
generatedValues.addAll(optional.getGeneratedValues()));
return result;
// CHECKSTYLE:OFF
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index a0b4c90b698..0fb32f7b65a 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.driver.jdbc.adapter.AbstractStatementAdapter;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.GeneratedKeysResultSet;
import
org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
-import
org.apache.shardingsphere.driver.jdbc.core.statement.callback.StatementAddCallback;
+import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
@@ -126,7 +126,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
prepareExecute(queryContext);
ShardingSphereDatabase database =
metaData.getDatabase(databaseName);
currentResultSet =
driverExecutorFacade.getQueryExecutor().executeQuery(database, queryContext,
createDriverExecutionPrepareEngine(database), this, null,
- this::replay, (StatementAddCallback<Statement>)
(statements, parameterSets) -> this.statements.addAll(statements));
+ (StatementAddCallback<Statement>) (statements,
parameterSets) -> this.statements.addAll(statements), this::replay);
return currentResultSet;
// CHECKSTYLE:OFF
} catch (final RuntimeException ex) {
@@ -197,7 +197,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
prepareExecute(queryContext);
ShardingSphereDatabase database = metaData.getDatabase(databaseName);
return
driverExecutorFacade.getUpdateExecutor().executeUpdate(database, queryContext,
createDriverExecutionPrepareEngine(database),
- updateCallback, this::replay,
(StatementAddCallback<Statement>) (statements, parameterSets) ->
this.statements.addAll(statements));
+ updateCallback, (StatementAddCallback<Statement>) (statements,
parameterSets) -> this.statements.addAll(statements), this::replay);
}
@Override
@@ -259,7 +259,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
prepareExecute(queryContext);
ShardingSphereDatabase database = metaData.getDatabase(databaseName);
return driverExecutorFacade.getExecuteExecutor().execute(database,
queryContext, createDriverExecutionPrepareEngine(database), executeCallback,
- this::replay, (StatementAddCallback<Statement>) (statements,
parameterSets) -> this.statements.addAll(statements));
+ (StatementAddCallback<Statement>) (statements, parameterSets)
-> this.statements.addAll(statements), this::replay);
}
private QueryContext createQueryContext(final String originSQL) throws
SQLException {
