This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 83504218a4a Move package and rename StatementExecuteCallback (#31576)
83504218a4a is described below
commit 83504218a4aac6e841ac417e6a40e42dac5401cd
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 4 12:28:54 2024 +0800
Move package and rename StatementExecuteCallback (#31576)
* Fix javadoc format
* Move package and rename StatementExecuteCallback
---
.../driver/executor/DriverExecuteExecutor.java | 42 +++++++++++-----------
.../executor/DriverExecuteQueryExecutor.java | 24 ++++++-------
.../executor/DriverExecuteUpdateExecutor.java | 36 +++++++++----------
.../driver/executor/DriverJDBCExecutor.java | 2 +-
.../callback/{ => add}/StatementAddCallback.java | 2 +-
.../{ => execute}/ExecuteQueryCallback.java | 2 +-
.../StatementExecuteCallback.java} | 6 ++--
.../StatementExecuteUpdateCallback.java} | 6 ++--
.../PreparedStatementExecuteQueryCallback.java | 4 +--
.../impl/StatementExecuteQueryCallback.java | 4 +--
.../{ => replay}/StatementReplayCallback.java | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../core/statement/ShardingSphereStatement.java | 12 +++----
13 files changed, 72 insertions(+), 72 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 7fc37656309..1c7e24d5bd8 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
@@ -18,13 +18,13 @@
package org.apache.shardingsphere.driver.executor;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.driver.executor.callback.ExecuteCallback;
-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.executor.callback.execute.StatementExecuteCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.impl.PreparedStatementExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.impl.StatementExecuteQueryCallback;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
+import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.replay.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;
@@ -100,15 +100,15 @@ public final class DriverExecuteExecutor {
* @param database database
* @param queryContext query context
* @param prepareEngine prepare engine
- * @param executeCallback execute callback
- * @param statementAddCallback statement add callback
- * @param statementReplayCallback statement replay callback
+ * @param executeCallback statement execute callback
+ * @param addCallback statement add callback
+ * @param replayCallback 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
StatementAddCallback statementAddCallback, final StatementReplayCallback
statementReplayCallback) throws SQLException {
+ final StatementExecuteCallback executeCallback,
final StatementAddCallback addCallback, final StatementReplayCallback
replayCallback) throws SQLException {
Optional<String> trafficInstanceId =
connection.getTrafficInstanceId(metaData.getGlobalRuleMetaData().getSingleRule(TrafficRule.class),
queryContext);
if (trafficInstanceId.isPresent()) {
executeType = ExecuteType.TRAFFIC;
@@ -127,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,
statementAddCallback, statementReplayCallback);
+ return executeWithExecutionContext(database, executeCallback,
executionContext, prepareEngine, isNeedImplicitCommitTransaction, addCallback,
replayCallback);
}
private ExecuteQueryCallback getExecuteQueryCallback(final
ShardingSphereDatabase database, final QueryContext queryContext, final String
jdbcDriverType) {
@@ -194,30 +194,30 @@ public final class DriverExecuteExecutor {
}
@SuppressWarnings("rawtypes")
- private boolean executeWithExecutionContext(final ShardingSphereDatabase
database, final ExecuteCallback executeCallback, final ExecutionContext
executionContext,
+ private boolean executeWithExecutionContext(final ShardingSphereDatabase
database, final StatementExecuteCallback statementExecuteCallback, final
ExecutionContext executionContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final boolean isNeedImplicitCommitTransaction,
- final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
+ final StatementAddCallback
addCallback, final StatementReplayCallback replayCallback) throws SQLException {
return isNeedImplicitCommitTransaction
- ? executeWithImplicitCommitTransaction(() ->
useDriverToExecute(database, executeCallback, executionContext, prepareEngine,
statementAddCallback, statementReplayCallback), connection,
+ ? executeWithImplicitCommitTransaction(() ->
useDriverToExecute(database, statementExecuteCallback, executionContext,
prepareEngine, addCallback, replayCallback), connection,
database.getProtocolType())
- : useDriverToExecute(database, executeCallback,
executionContext, prepareEngine, statementAddCallback, statementReplayCallback);
+ : useDriverToExecute(database, statementExecuteCallback,
executionContext, prepareEngine, addCallback, replayCallback);
}
@SuppressWarnings({"rawtypes", "unchecked"})
- private boolean useDriverToExecute(final ShardingSphereDatabase database,
final ExecuteCallback callback, final ExecutionContext executionContext,
+ private boolean useDriverToExecute(final ShardingSphereDatabase database,
final StatementExecuteCallback callback, final ExecutionContext
executionContext,
final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
+ final StatementAddCallback addCallback,
final StatementReplayCallback replayCallback) 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());
+ addCallback.add(getStatements(each),
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
}
- statementReplayCallback.replay();
+ replayCallback.replay();
JDBCExecutorCallback<Boolean> jdbcExecutorCallback =
createExecuteCallback(database, callback,
executionContext.getSqlStatementContext().getSqlStatement(),
prepareEngine.getType());
return regularExecutor.execute(executionGroupContext,
executionContext.getQueryContext(),
executionContext.getRouteContext().getRouteUnits(), jdbcExecutorCallback);
}
- private JDBCExecutorCallback<Boolean> createExecuteCallback(final
ShardingSphereDatabase database, final ExecuteCallback executeCallback,
- final
SQLStatement sqlStatement, final String jdbcDriverType) {
+ private JDBCExecutorCallback<Boolean> createExecuteCallback(final
ShardingSphereDatabase database,
+ final
StatementExecuteCallback executeCallback, final SQLStatement sqlStatement,
final String jdbcDriverType) {
boolean isExceptionThrown =
SQLExecutorExceptionHandler.isExceptionThrown();
return new JDBCExecutorCallback<Boolean>(database.getProtocolType(),
database.getResourceMetaData(), sqlStatement, isExceptionThrown) {
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 d4a1574fe6a..16ef156e8ad 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
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.driver.executor;
import lombok.RequiredArgsConstructor;
-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.executor.callback.execute.ExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.impl.PreparedStatementExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.impl.StatementExecuteQueryCallback;
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.executor.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
+import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.replay.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 statementAddCallback statement add callback
- * @param statementReplayCallback statement replay callback
+ * @param addCallback statement add callback
+ * @param replayCallback 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 StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
+ final StatementAddCallback addCallback,
final StatementReplayCallback replayCallback) 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, statementAddCallback, statementReplayCallback);
+ List<QueryResult> queryResults = executePushDownQuery(database,
queryContext, prepareEngine, addCallback, replayCallback);
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 StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
+ final StatementAddCallback
addCallback, final StatementReplayCallback replayCallback) throws SQLException {
ExecutionContext executionContext = createExecutionContext(database,
queryContext);
if (hasRawExecutionRule(database)) {
return rawExecutor.execute(
@@ -156,9 +156,9 @@ public final class DriverExecuteQueryExecutor {
for (ExecutionGroup<JDBCExecutionUnit> each :
executionGroupContext.getInputGroups()) {
Collection<Statement> statements = getStatements(each);
this.statements.addAll(statements);
- statementAddCallback.add(statements,
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
+ addCallback.add(statements,
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
}
- statementReplayCallback.replay();
+ replayCallback.replay();
return regularExecutor.executeQuery(executionGroupContext,
queryContext, getExecuteQueryCallback(database, queryContext,
prepareEngine.getType()));
}
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 4eaab1d0b6d..ab8709dfcc8 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
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.driver.executor;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.driver.executor.callback.ExecuteUpdateCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteUpdateCallback;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.driver.executor.callback.StatementAddCallback;
-import
org.apache.shardingsphere.driver.executor.callback.StatementReplayCallback;
+import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.replay.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;
@@ -90,15 +90,15 @@ public final class DriverExecuteUpdateExecutor {
* @param database database
* @param queryContext query context
* @param prepareEngine prepare engine
- * @param updateCallback update callback
- * @param statementReplayCallback statement replay callback
- * @param statementAddCallback statement add callback
+ * @param updateCallback statement execute update callback
+ * @param replayCallback statement replay callback
+ * @param addCallback statement add callback
* @return updated row count
* @throws SQLException SQL exception
*/
@SuppressWarnings("rawtypes")
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 {
+ final StatementExecuteUpdateCallback
updateCallback, final StatementAddCallback addCallback, final
StatementReplayCallback replayCallback) 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);
@@ -107,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), statementAddCallback,
statementReplayCallback);
+ connection,
queryContext.getSqlStatementContext().getSqlStatement(),
executionContext.getExecutionUnits().size() > 1), addCallback, replayCallback);
}
@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 StatementAddCallback statementAddCallback,
final StatementReplayCallback statementReplayCallback) throws SQLException {
+ private int executeUpdate(final ShardingSphereDatabase database, final
StatementExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext,
+ final ExecutionContext executionContext, final
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final boolean isNeedImplicitCommitTransaction,
+ final StatementAddCallback addCallback, final
StatementReplayCallback replayCallback) throws SQLException {
return isNeedImplicitCommitTransaction
? executeWithImplicitCommitTransaction(() ->
useDriverToExecuteUpdate(
- database, updateCallback, sqlStatementContext,
executionContext, prepareEngine, statementAddCallback,
statementReplayCallback), connection, database.getProtocolType())
- : useDriverToExecuteUpdate(database, updateCallback,
sqlStatementContext, executionContext, prepareEngine, statementAddCallback,
statementReplayCallback);
+ database, updateCallback, sqlStatementContext,
executionContext, prepareEngine, addCallback, replayCallback), connection,
database.getProtocolType())
+ : useDriverToExecuteUpdate(database, updateCallback,
sqlStatementContext, executionContext, prepareEngine, addCallback,
replayCallback);
}
private boolean hasRawExecutionRule(final ShardingSphereDatabase database)
{
@@ -170,14 +170,14 @@ public final class DriverExecuteUpdateExecutor {
}
@SuppressWarnings({"rawtypes", "unchecked"})
- private int useDriverToExecuteUpdate(final ShardingSphereDatabase
database, final ExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext,
+ private int useDriverToExecuteUpdate(final ShardingSphereDatabase
database, final StatementExecuteUpdateCallback updateCallback, final
SQLStatementContext sqlStatementContext,
final ExecutionContext
executionContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit,
Connection> prepareEngine,
- final StatementAddCallback
statementAddCallback, final StatementReplayCallback statementReplayCallback)
throws SQLException {
+ final StatementAddCallback
addCallback, final StatementReplayCallback replayCallback) 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());
+ addCallback.add(getStatements(each),
JDBCDriverType.PREPARED_STATEMENT.equals(prepareEngine.getType()) ?
getParameterSets(each) : Collections.emptyList());
}
- statementReplayCallback.replay();
+ replayCallback.replay();
JDBCExecutorCallback<Integer> callback =
createExecuteUpdateCallback(database, updateCallback, sqlStatementContext,
prepareEngine.getType());
return regularExecutor.executeUpdate(executionGroupContext,
executionContext.getQueryContext(),
executionContext.getRouteContext().getRouteUnits(), callback);
}
@@ -189,7 +189,7 @@ public final class DriverExecuteUpdateExecutor {
}
private JDBCExecutorCallback<Integer> createExecuteUpdateCallback(final
ShardingSphereDatabase database,
- final
ExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext, final String jdbcDriverType) {
+ final
StatementExecuteUpdateCallback updateCallback, final SQLStatementContext
sqlStatementContext, final String jdbcDriverType) {
boolean isExceptionThrown =
SQLExecutorExceptionHandler.isExceptionThrown();
return new JDBCExecutorCallback<Integer>(database.getProtocolType(),
database.getResourceMetaData(), sqlStatementContext.getSqlStatement(),
isExceptionThrown) {
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index 766ac35c181..3dd4237af47 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.executor;
-import org.apache.shardingsphere.driver.executor.callback.ExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/add/StatementAddCallback.java
similarity index 95%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/add/StatementAddCallback.java
index 0f63ab63e5f..80494e65778 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementAddCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/add/StatementAddCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback;
+package org.apache.shardingsphere.driver.executor.callback.add;
import java.sql.Statement;
import java.util.Collection;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/ExecuteQueryCallback.java
similarity index 97%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/ExecuteQueryCallback.java
index e1caae0ef6f..99864cd8812 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteQueryCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/ExecuteQueryCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback;
+package org.apache.shardingsphere.driver.executor.callback.execute;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteCallback.java
similarity index 89%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteCallback.java
index a925e43261b..e07394843db 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteCallback.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback;
+package org.apache.shardingsphere.driver.executor.callback.execute;
import java.sql.SQLException;
import java.sql.Statement;
/**
- * Execute callback.
+ * Statement execute callback.
*/
-public interface ExecuteCallback {
+public interface StatementExecuteCallback {
/**
* Execute.
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteUpdateCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteUpdateCallback.java
similarity index 88%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteUpdateCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteUpdateCallback.java
index 81566ac9b73..148ecf67667 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/ExecuteUpdateCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/StatementExecuteUpdateCallback.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback;
+package org.apache.shardingsphere.driver.executor.callback.execute;
import java.sql.SQLException;
import java.sql.Statement;
/**
- * Execute update callback.
+ * Statement execute update callback.
*/
-public interface ExecuteUpdateCallback {
+public interface StatementExecuteUpdateCallback {
/**
* Execute update.
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/PreparedStatementExecuteQueryCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/PreparedStatementExecuteQueryCallback.java
similarity index 91%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/PreparedStatementExecuteQueryCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/PreparedStatementExecuteQueryCallback.java
index 8d5b4c084f0..9ab88718322 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/PreparedStatementExecuteQueryCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/PreparedStatementExecuteQueryCallback.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback.impl;
+package org.apache.shardingsphere.driver.executor.callback.execute.impl;
-import org.apache.shardingsphere.driver.executor.callback.ExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/StatementExecuteQueryCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/StatementExecuteQueryCallback.java
similarity index 91%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/StatementExecuteQueryCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/StatementExecuteQueryCallback.java
index 30fa6af5c3c..0d51767d45a 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/impl/StatementExecuteQueryCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/execute/impl/StatementExecuteQueryCallback.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback.impl;
+package org.apache.shardingsphere.driver.executor.callback.execute.impl;
-import org.apache.shardingsphere.driver.executor.callback.ExecuteQueryCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/replay/StatementReplayCallback.java
similarity index 94%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/replay/StatementReplayCallback.java
index ad511eafbfa..90cf1d7d06a 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/StatementReplayCallback.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/callback/replay/StatementReplayCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.callback;
+package org.apache.shardingsphere.driver.executor.callback.replay;
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 eff0cefadcd..20a595aadbd 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.executor.callback.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.add.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;
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 0fb32f7b65a..90d48bb9a45 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
@@ -21,13 +21,13 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.driver.executor.DriverExecutorFacade;
import org.apache.shardingsphere.driver.executor.batch.BatchStatementExecutor;
-import org.apache.shardingsphere.driver.executor.callback.ExecuteCallback;
-import
org.apache.shardingsphere.driver.executor.callback.ExecuteUpdateCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteCallback;
+import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteUpdateCallback;
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.executor.callback.StatementAddCallback;
+import
org.apache.shardingsphere.driver.executor.callback.add.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;
@@ -191,7 +191,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
}
}
- private int executeUpdate(final String sql, final ExecuteUpdateCallback
updateCallback) throws SQLException {
+ private int executeUpdate(final String sql, final
StatementExecuteUpdateCallback updateCallback) throws SQLException {
currentResultSet = null;
QueryContext queryContext = createQueryContext(sql);
prepareExecute(queryContext);
@@ -253,12 +253,12 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
}
}
- private boolean execute(final String sql, final ExecuteCallback
executeCallback) throws SQLException {
+ private boolean execute(final String sql, final StatementExecuteCallback
statementExecuteCallback) throws SQLException {
currentResultSet = null;
QueryContext queryContext = createQueryContext(sql);
prepareExecute(queryContext);
ShardingSphereDatabase database = metaData.getDatabase(databaseName);
- return driverExecutorFacade.getExecuteExecutor().execute(database,
queryContext, createDriverExecutionPrepareEngine(database), executeCallback,
+ return driverExecutorFacade.getExecuteExecutor().execute(database,
queryContext, createDriverExecutionPrepareEngine(database),
statementExecuteCallback,
(StatementAddCallback<Statement>) (statements, parameterSets)
-> this.statements.addAll(statements), this::replay);
}
