[shardingsphere] branch master updated: Trim comment of sql to avoid sql parse exception when execute comment sql (#18959)

[tuichenchuxin]

This is an automated email from the ASF dual-hosted git repository.

tuichenchuxin 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 336afce1cc1 Trim comment of sql to avoid sql parse exception when 
execute comment sql (#18959)
336afce1cc1 is described below

commit 336afce1cc10eb5a03d74707ba0abcd14511fb5e
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Fri Jul 8 16:27:35 2022 +0800

    Trim comment of sql to avoid sql parse exception when execute comment sql 
(#18959)
    
    * Trim comment of sql to avoid sql parse exception when execute comment sql
    
    * refactor for code style
---
 .../org/apache/shardingsphere/transaction/rule/TransactionRule.java    | 2 +-
 .../mysql/command/query/text/query/MySQLComQueryPacketExecutor.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java
 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java
index e469fd55283..ec270376883 100644
--- 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java
+++ 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java
@@ -63,7 +63,7 @@ public final class TransactionRule implements GlobalRule, 
ResourceHeldRule<Shard
     }
     
     private synchronized ShardingSphereTransactionManagerEngine 
createTransactionManagerEngine(final Map<String, ShardingSphereDatabase> 
databases) {
-        if (databases.size() == 0) {
+        if (databases.isEmpty()) {
             return new ShardingSphereTransactionManagerEngine();
         }
         ShardingSphereTransactionManagerEngine result = new 
ShardingSphereTransactionManagerEngine();
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index c89828355bb..3032b50a06f 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -47,6 +47,7 @@ import 
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DeleteStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.UpdateStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -79,7 +80,7 @@ public final class MySQLComQueryPacketExecutor implements 
QueryCommandExecutor {
     }
     
     private SQLStatement parseSql(final String sql, final DatabaseType 
databaseType) {
-        if (sql.isEmpty()) {
+        if (SQLUtil.trimComment(sql).isEmpty()) {
             return new EmptyStatement();
         }
         MetaDataContexts metaDataContexts = 
ProxyContext.getInstance().getContextManager().getMetaDataContexts();