You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/02/18 14:57:51 UTC
[shardingsphere] branch master updated: Move sane to proxy backend module (#24233)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 f824c9ac293 Move sane to proxy backend module (#24233)
f824c9ac293 is described below
commit f824c9ac29319b34d494f9a8182315cd51f67032
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Feb 18 22:57:39 2023 +0800
Move sane to proxy backend module (#24233)
---
.../proxy/backend/communication/ProxySQLExecutor.java | 4 ++--
.../jdbc/executor/callback/ProxyJDBCExecutorCallback.java | 4 ++--
.../backend/communication}/sane/DefaultSaneQueryResultEngine.java | 2 +-
.../proxy/backend/communication}/sane/SaneQueryResultEngine.java | 2 +-
.../backend/communication}/sane/mysql/MySQLDefaultVariable.java | 2 +-
.../communication}/sane/mysql/MySQLSaneQueryResultEngine.java | 4 ++--
.../sane/opengauss/OpenGaussSaneQueryResultEngine.java | 4 ++--
.../sane/postgresql/PostgreSQLSaneQueryResultEngine.java | 4 ++--
...ingsphere.proxy.backend.communication.sane.SaneQueryResultEngine | 6 +++---
.../communication}/sane/DefaultSaneQueryResultEngineTest.java | 2 +-
.../communication}/sane/mysql/MySQLSaneQueryResultEngineTest.java | 2 +-
.../sane/opengauss/OpenGaussSaneQueryResultEngineTest.java | 2 +-
.../sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java | 2 +-
13 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
index 73c2417042f..19f82fda4b8 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java
@@ -30,8 +30,8 @@ import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.DefaultSaneQueryResultEngine;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.sane.DefaultSaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
index b7569a2b81e..477cc0bb270 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/callback/ProxyJDBCExecutorCallback.java
@@ -22,8 +22,8 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.DefaultSaneQueryResultEngine;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.sane.DefaultSaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.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.driver.jdbc.type.memory.JDBCMemoryQueryResult;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngine.java
similarity index 96%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngine.java
index eb670d3ed7b..ea7d8ef0087 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane;
+package org.apache.shardingsphere.proxy.backend.communication.sane;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/SaneQueryResultEngine.java
similarity index 94%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/SaneQueryResultEngine.java
index dd5a0ac41bf..1be6675a1da 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/SaneQueryResultEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/SaneQueryResultEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane;
+package org.apache.shardingsphere.proxy.backend.communication.sane;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLDefaultVariable.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLDefaultVariable.java
similarity index 96%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLDefaultVariable.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLDefaultVariable.java
index 9e8a663fe4d..e0539a7d3d7 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLDefaultVariable.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLDefaultVariable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.mysql;
+package org.apache.shardingsphere.proxy.backend.communication.sane.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngine.java
similarity index 96%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngine.java
index adf5b05a9b9..251f3fb5309 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngine.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.mysql;
+package org.apache.shardingsphere.proxy.backend.communication.sane.mysql;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.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;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngine.java
similarity index 87%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngine.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngine.java
index 24f2623e579..b4ed9efdf2e 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngine.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.opengauss;
+package org.apache.shardingsphere.proxy.backend.communication.sane.opengauss;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngine.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngine.java
similarity index 87%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngine.java
rename to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngine.java
index 452952dd0a9..0d0d36a23f9 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngine.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngine.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.postgresql;
+package org.apache.shardingsphere.proxy.backend.communication.sane.postgresql;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine;
+import org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git a/infra/executor/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine
similarity index 69%
rename from infra/executor/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine
rename to proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine
index 22eb72f1160..0a0bb5f15d4 100644
--- a/infra/executor/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.SaneQueryResultEngine
+++ b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.communication.sane.SaneQueryResultEngine
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.mysql.MySQLSaneQueryResultEngine
-org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.postgresql.PostgreSQLSaneQueryResultEngine
-org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.opengauss.OpenGaussSaneQueryResultEngine
+org.apache.shardingsphere.proxy.backend.communication.sane.mysql.MySQLSaneQueryResultEngine
+org.apache.shardingsphere.proxy.backend.communication.sane.postgresql.PostgreSQLSaneQueryResultEngine
+org.apache.shardingsphere.proxy.backend.communication.sane.opengauss.OpenGaussSaneQueryResultEngine
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngineTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngineTest.java
similarity index 96%
rename from infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngineTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngineTest.java
index 82a216da8a5..d839b742fcd 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/DefaultSaneQueryResultEngineTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/DefaultSaneQueryResultEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane;
+package org.apache.shardingsphere.proxy.backend.communication.sane;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngineTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngineTest.java
similarity index 98%
rename from infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngineTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngineTest.java
index e4ad8ff070d..8a4ca20f7fb 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/mysql/MySQLSaneQueryResultEngineTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/mysql/MySQLSaneQueryResultEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.mysql;
+package org.apache.shardingsphere.proxy.backend.communication.sane.mysql;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java
similarity index 93%
rename from infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java
index 4a754cc6019..61024424390 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/opengauss/OpenGaussSaneQueryResultEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.opengauss;
+package org.apache.shardingsphere.proxy.backend.communication.sane.opengauss;
import org.junit.Test;
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java
similarity index 93%
rename from infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java
index a05809f608b..ca51aca71ae 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/sane/postgresql/PostgreSQLSaneQueryResultEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.sane.postgresql;
+package org.apache.shardingsphere.proxy.backend.communication.sane.postgresql;
import org.junit.Test;