This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 050a6dc0789 Add driver.executor.engine package (#31610)
050a6dc0789 is described below
commit 050a6dc078974985f86a9fbebdc19fea996f050d
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 6 23:04:16 2024 +0800
Add driver.executor.engine package (#31610)
---
.../apache/shardingsphere/driver/executor/DriverExecutorFacade.java | 5 +++++
.../executor/{ => batch/engine}/DriverExecuteBatchExecutor.java | 6 +++---
.../driver/executor/batch/{ => statement}/BatchExecutionUnit.java | 2 +-
.../batch/{ => statement}/BatchPreparedStatementExecutor.java | 2 +-
.../executor/batch/{ => statement}/BatchStatementExecutor.java | 2 +-
.../driver/executor/{ => engine}/DriverExecuteExecutor.java | 2 +-
.../driver/executor/{ => engine}/DriverExecuteQueryExecutor.java | 2 +-
.../driver/executor/{ => engine}/DriverExecuteUpdateExecutor.java | 2 +-
.../driver/executor/{ => engine}/DriverJDBCExecutor.java | 2 +-
.../driver/jdbc/core/statement/ShardingSphereStatement.java | 2 +-
.../executor/batch/{ => statement}/BatchExecutionUnitTest.java | 2 +-
.../batch/{ => statement}/BatchPreparedStatementExecutorTest.java | 2 +-
.../executor/batch/{ => statement}/BatchStatementExecutorTest.java | 2 +-
13 files changed, 19 insertions(+), 14 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutorFacade.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutorFacade.java
index 59fea2a24d8..b49ef803c10 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutorFacade.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutorFacade.java
@@ -17,12 +17,17 @@
package org.apache.shardingsphere.driver.executor;
+import
org.apache.shardingsphere.driver.executor.batch.engine.DriverExecuteBatchExecutor;
import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteCallback;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteUpdateCallback;
import
org.apache.shardingsphere.driver.executor.callback.keygen.GeneratedKeyCallback;
import
org.apache.shardingsphere.driver.executor.callback.replay.PreparedStatementParametersReplayCallback;
import
org.apache.shardingsphere.driver.executor.callback.replay.StatementReplayCallback;
+import org.apache.shardingsphere.driver.executor.engine.DriverExecuteExecutor;
+import
org.apache.shardingsphere.driver.executor.engine.DriverExecuteQueryExecutor;
+import
org.apache.shardingsphere.driver.executor.engine.DriverExecuteUpdateExecutor;
+import org.apache.shardingsphere.driver.executor.engine.DriverJDBCExecutor;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.core.statement.StatementManager;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/engine/DriverExecuteBatchExecutor.java
similarity index 97%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/engine/DriverExecuteBatchExecutor.java
index f3de6103f8b..29493307d80 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteBatchExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/engine/DriverExecuteBatchExecutor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor;
+package org.apache.shardingsphere.driver.executor.batch.engine;
import lombok.Getter;
-import org.apache.shardingsphere.driver.executor.batch.BatchExecutionUnit;
-import
org.apache.shardingsphere.driver.executor.batch.BatchPreparedStatementExecutor;
+import
org.apache.shardingsphere.driver.executor.batch.statement.BatchExecutionUnit;
+import
org.apache.shardingsphere.driver.executor.batch.statement.BatchPreparedStatementExecutor;
import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
import
org.apache.shardingsphere.driver.executor.callback.keygen.GeneratedKeyCallback;
import
org.apache.shardingsphere.driver.executor.callback.replay.PreparedStatementParametersReplayCallback;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnit.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnit.java
similarity index 97%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnit.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnit.java
index 00e6162b4cb..04efa4e7a84 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnit.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import com.google.common.collect.Lists;
import lombok.AccessLevel;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutor.java
similarity index 99%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutor.java
index 7975436642e..e2b24e58969 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import lombok.Getter;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutor.java
similarity index 96%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutor.java
index 81a703f9ead..97ad7d8d8be 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import lombok.RequiredArgsConstructor;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
similarity index 99%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
index 9cdddc487fb..d1e4f185f9a 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor;
+package org.apache.shardingsphere.driver.executor.engine;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteCallback;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteQueryExecutor.java
similarity index 99%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteQueryExecutor.java
index 16ef156e8ad..46c0222055c 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteQueryExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteQueryExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor;
+package org.apache.shardingsphere.driver.executor.engine;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java
similarity index 99%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java
index ab8709dfcc8..6fbe92db58f 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecuteUpdateExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor;
+package org.apache.shardingsphere.driver.executor.engine;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteUpdateCallback;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverJDBCExecutor.java
similarity index 99%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverJDBCExecutor.java
index 3dd4237af47..874ebb0c4be 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverJDBCExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor;
+package org.apache.shardingsphere.driver.executor.engine;
import
org.apache.shardingsphere.driver.executor.callback.execute.ExecuteQueryCallback;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
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 89c0b6d6b80..499e2581744 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.jdbc.core.statement;
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.batch.statement.BatchStatementExecutor;
import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteCallback;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteUpdateCallback;
diff --git
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnitTest.java
similarity index 97%
rename from
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
rename to
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnitTest.java
index 1efdd84c80a..a6aadabed3f 100644
---
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchExecutionUnitTest.java
+++
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchExecutionUnitTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
diff --git
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutorTest.java
similarity index 99%
rename from
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
rename to
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutorTest.java
index 7174aac2856..2578614e16d 100644
---
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutorTest.java
+++
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchPreparedStatementExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
diff --git
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutorTest.java
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutorTest.java
similarity index 96%
rename from
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutorTest.java
rename to
jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutorTest.java
index 10d3dc0a2d2..c3d7636cfed 100644
---
a/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/BatchStatementExecutorTest.java
+++
b/jdbc/src/test/java/org/apache/shardingsphere/driver/executor/batch/statement/BatchStatementExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.executor.batch;
+package org.apache.shardingsphere.driver.executor.batch.statement;
import org.junit.jupiter.api.Test;
