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 88bc84ed7b5 Fix sonar issue on SelectStatementHandler (#27621)
88bc84ed7b5 is described below

commit 88bc84ed7b5ded8d8ed7357e201c9d9e23baaf89
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Aug 2 10:36:05 2023 +0800

    Fix sonar issue on SelectStatementHandler (#27621)
---
 .../handler/dml/SelectStatementHandler.java        | 66 ++++++++++------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git 
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/dml/SelectStatementHandler.java
 
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/dml/SelectStatementHandler.java
index b3f656e9e1f..daeeaeffcde 100644
--- 
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/dml/SelectStatementHandler.java
+++ 
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/dml/SelectStatementHandler.java
@@ -26,17 +26,11 @@ import 
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.WindowSeg
 import 
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.WithSegment;
 import 
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.handler.SQLStatementHandler;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLSelectStatement;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.dml.OpenGaussSelectStatement;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.dml.OracleSelectStatement;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.dml.PostgreSQLSelectStatement;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sql92.SQL92Statement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sql92.dml.SQL92SelectStatement;
-import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLServerStatement;
 import 
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml.SQLServerSelectStatement;
 
 import java.util.Optional;
@@ -54,19 +48,19 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @return limit segment
      */
     public static Optional<LimitSegment> getLimitSegment(final SelectStatement 
selectStatement) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             return ((MySQLSelectStatement) selectStatement).getLimit();
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             return ((PostgreSQLSelectStatement) selectStatement).getLimit();
         }
-        if (selectStatement instanceof SQL92Statement) {
+        if (selectStatement instanceof SQL92SelectStatement) {
             return ((SQL92SelectStatement) selectStatement).getLimit();
         }
-        if (selectStatement instanceof SQLServerStatement) {
+        if (selectStatement instanceof SQLServerSelectStatement) {
             return ((SQLServerSelectStatement) selectStatement).getLimit();
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             return ((OpenGaussSelectStatement) selectStatement).getLimit();
         }
         return Optional.empty();
@@ -79,19 +73,19 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @param  limitSegment limit segment
      */
     public static void setLimitSegment(final SelectStatement selectStatement, 
final LimitSegment limitSegment) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             ((MySQLSelectStatement) selectStatement).setLimit(limitSegment);
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             ((PostgreSQLSelectStatement) 
selectStatement).setLimit(limitSegment);
         }
-        if (selectStatement instanceof SQL92Statement) {
+        if (selectStatement instanceof SQL92SelectStatement) {
             ((SQL92SelectStatement) selectStatement).setLimit(limitSegment);
         }
-        if (selectStatement instanceof SQLServerStatement) {
+        if (selectStatement instanceof SQLServerSelectStatement) {
             ((SQLServerSelectStatement) 
selectStatement).setLimit(limitSegment);
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             ((OpenGaussSelectStatement) 
selectStatement).setLimit(limitSegment);
         }
     }
@@ -103,16 +97,16 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @return lock segment
      */
     public static Optional<LockSegment> getLockSegment(final SelectStatement 
selectStatement) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             return ((MySQLSelectStatement) selectStatement).getLock();
         }
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             return ((OracleSelectStatement) selectStatement).getLock();
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             return ((PostgreSQLSelectStatement) selectStatement).getLock();
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             return ((OpenGaussSelectStatement) selectStatement).getLock();
         }
         return Optional.empty();
@@ -125,16 +119,16 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @param lockSegment lock segment
      */
     public static void setLockSegment(final SelectStatement selectStatement, 
final LockSegment lockSegment) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             ((MySQLSelectStatement) selectStatement).setLock(lockSegment);
         }
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             ((OracleSelectStatement) selectStatement).setLock(lockSegment);
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             ((PostgreSQLSelectStatement) selectStatement).setLock(lockSegment);
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             ((OpenGaussSelectStatement) selectStatement).setLock(lockSegment);
         }
     }
@@ -146,13 +140,13 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @return window segment
      */
     public static Optional<WindowSegment> getWindowSegment(final 
SelectStatement selectStatement) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             return ((MySQLSelectStatement) selectStatement).getWindow();
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             return ((PostgreSQLSelectStatement) selectStatement).getWindow();
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             return ((OpenGaussSelectStatement) selectStatement).getWindow();
         }
         return Optional.empty();
@@ -165,13 +159,13 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @param windowSegment window segment
      */
     public static void setWindowSegment(final SelectStatement selectStatement, 
final WindowSegment windowSegment) {
-        if (selectStatement instanceof MySQLStatement) {
+        if (selectStatement instanceof MySQLSelectStatement) {
             ((MySQLSelectStatement) selectStatement).setWindow(windowSegment);
         }
-        if (selectStatement instanceof PostgreSQLStatement) {
+        if (selectStatement instanceof PostgreSQLSelectStatement) {
             ((PostgreSQLSelectStatement) 
selectStatement).setWindow(windowSegment);
         }
-        if (selectStatement instanceof OpenGaussStatement) {
+        if (selectStatement instanceof OpenGaussSelectStatement) {
             ((OpenGaussSelectStatement) 
selectStatement).setWindow(windowSegment);
         }
     }
@@ -183,10 +177,10 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @return with segment
      */
     public static Optional<WithSegment> getWithSegment(final SelectStatement 
selectStatement) {
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             return ((OracleSelectStatement) selectStatement).getWithSegment();
         }
-        if (selectStatement instanceof SQLServerStatement) {
+        if (selectStatement instanceof SQLServerSelectStatement) {
             return ((SQLServerSelectStatement) 
selectStatement).getWithSegment();
         }
         return Optional.empty();
@@ -199,10 +193,10 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @param withSegment with segment
      */
     public static void setWithSegment(final SelectStatement selectStatement, 
final WithSegment withSegment) {
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             ((OracleSelectStatement) 
selectStatement).setWithSegment(withSegment);
         }
-        if (selectStatement instanceof SQLServerStatement) {
+        if (selectStatement instanceof SQLServerSelectStatement) {
             ((SQLServerSelectStatement) 
selectStatement).setWithSegment(withSegment);
         }
     }
@@ -214,7 +208,7 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @return model segment
      */
     public static Optional<ModelSegment> getModelSegment(final SelectStatement 
selectStatement) {
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             return ((OracleSelectStatement) selectStatement).getModelSegment();
         }
         return Optional.empty();
@@ -227,7 +221,7 @@ public final class SelectStatementHandler implements 
SQLStatementHandler {
      * @param modelSegment model segment
      */
     public static void setModelSegment(final SelectStatement selectStatement, 
final ModelSegment modelSegment) {
-        if (selectStatement instanceof OracleStatement) {
+        if (selectStatement instanceof OracleSelectStatement) {
             ((OracleSelectStatement) 
selectStatement).setModelSegment(modelSegment);
         }
     }

Reply via email to