(shardingsphere) branch master updated: Remove useless isReturnGeneratedKeys in preview sql federation logic (#31838)

[zhaojinchao]

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 b60a64baff2 Remove useless isReturnGeneratedKeys in preview sql 
federation logic (#31838)
b60a64baff2 is described below

commit b60a64baff25c9441a8b47e7acd03f036e6d2dfa
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Tue Jun 25 15:44:57 2024 +0800

    Remove useless isReturnGeneratedKeys in preview sql federation logic 
(#31838)
---
 .../proxy/backend/handler/distsql/rul/PreviewExecutor.java       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
index ee923489d1b..e7f04d78227 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
@@ -59,7 +59,6 @@ import org.apache.shardingsphere.parser.rule.SQLParserRule;
 import 
org.apache.shardingsphere.proxy.backend.connector.ProxyDatabaseConnectionManager;
 import org.apache.shardingsphere.proxy.backend.context.BackendExecutorContext;
 import 
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
-import 
org.apache.shardingsphere.sql.parser.statement.mysql.dml.MySQLInsertStatement;
 import org.apache.shardingsphere.sqlfederation.engine.SQLFederationEngine;
 import 
org.apache.shardingsphere.sqlfederation.executor.context.SQLFederationContext;
 
@@ -134,9 +133,7 @@ public final class PreviewExecutor implements 
DistSQLQueryExecutor<PreviewStatem
     
     private Collection<ExecutionUnit> getFederationExecutionUnits(final 
QueryContext queryContext, final ShardingSphereMetaData metaData, final 
SQLFederationEngine federationEngine) {
         SQLStatement sqlStatement = 
queryContext.getSqlStatementContext().getSqlStatement();
-        // TODO move dialect MySQLInsertStatement into database type module 
@zhangliang
-        boolean isReturnGeneratedKeys = sqlStatement instanceof 
MySQLInsertStatement;
-        DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> 
prepareEngine = createDriverExecutionPrepareEngine(isReturnGeneratedKeys, 
metaData.getProps());
+        DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> 
prepareEngine = createDriverExecutionPrepareEngine(metaData.getProps());
         SQLFederationContext context = new SQLFederationContext(true, 
queryContext, metaData,
                 ((ProxyDatabaseConnectionManager) 
connectionContext.getDatabaseConnectionManager()).getConnectionSession().getProcessId());
         federationEngine.executeQuery(prepareEngine, 
createPreviewCallback(sqlStatement), context);
@@ -159,10 +156,10 @@ public final class PreviewExecutor implements 
DistSQLQueryExecutor<PreviewStatem
     }
     
     @SuppressWarnings({"unchecked", "rawtypes"})
-    private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> 
createDriverExecutionPrepareEngine(final boolean isReturnGeneratedKeys, final 
ConfigurationProperties props) {
+    private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> 
createDriverExecutionPrepareEngine(final ConfigurationProperties props) {
         int maxConnectionsSizePerQuery = 
props.<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
         return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT, 
maxConnectionsSizePerQuery, connectionContext.getDatabaseConnectionManager(),
-                connectionContext.getExecutorStatementManager(), new 
StatementOption(isReturnGeneratedKeys), database.getRuleMetaData().getRules(), 
database.getResourceMetaData().getStorageUnits());
+                connectionContext.getExecutorStatementManager(), new 
StatementOption(false), database.getRuleMetaData().getRules(), 
database.getResourceMetaData().getStorageUnits());
     }
     
     @Override