(shardingsphere) branch master updated: Refactor AdvancedProxySQLExecutor (#32452)

[zhangliang]

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 5052a14b4d7 Refactor AdvancedProxySQLExecutor (#32452)
5052a14b4d7 is described below

commit 5052a14b4d7f4fbd505101a8b41cda17cb54cae8
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Aug 10 15:24:18 2024 +0800

    Refactor AdvancedProxySQLExecutor (#32452)
    
    * Refactor AdvancedProxySQLExecutor
    
    * Refactor AdvancedProxySQLExecutor
---
 .../proxy/backend/connector/AdvancedProxySQLExecutor.java             | 4 +++-
 .../shardingsphere/proxy/backend/connector/DatabaseConnector.java     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
index 209715a52d6..3828adf3be2 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/AdvancedProxySQLExecutor.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.proxy.backend.connector;
 
 import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
 import 
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
+import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 
@@ -36,9 +37,10 @@ public interface AdvancedProxySQLExecutor {
      *
      * @param executionContext execution context
      * @param contextManager context manager
+     * @param database database
      * @param databaseConnector database connector
      * @return execute result
      * @throws SQLException SQL exception
      */
-    List<ExecuteResult> execute(ExecutionContext executionContext, 
ContextManager contextManager, DatabaseConnector databaseConnector) throws 
SQLException;
+    List<ExecuteResult> execute(ExecutionContext executionContext, 
ContextManager contextManager, ShardingSphereDatabase database, 
DatabaseConnector databaseConnector) throws SQLException;
 }
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
index 1283ba58a66..398d7c7de4b 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
@@ -242,7 +242,7 @@ public final class DatabaseConnector implements 
DatabaseBackendHandler {
         Collection<AdvancedProxySQLExecutor> advancedExecutors = 
ShardingSphereServiceLoader.getServiceInstances(AdvancedProxySQLExecutor.class);
         List<ExecuteResult> executeResults = advancedExecutors.isEmpty()
                 ? proxySQLExecutor.execute(executionContext)
-                : 
advancedExecutors.iterator().next().execute(executionContext, contextManager, 
this);
+                : 
advancedExecutors.iterator().next().execute(executionContext, contextManager, 
database, this);
         
getMetaDataRefreshEngine().refresh(queryContext.getSqlStatementContext(), 
executionContext.getRouteContext().getRouteUnits());
         Object executeResultSample = executeResults.iterator().next();
         return executeResultSample instanceof QueryResult