[shardingsphere] branch master updated: Remove unreachable branch in DatabaseBackendHandlerFactory (#18218)

[zh...@apache.org]

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 eb649c6d4e9 Remove unreachable branch in DatabaseBackendHandlerFactory (#18218)
eb649c6d4e9 is described below

commit eb649c6d4e97b47db4bb6757af47fdc8b53273a8
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Tue Jun 7 16:12:04 2022 +0800

    Remove unreachable branch in DatabaseBackendHandlerFactory (#18218)
    
    * Remove unreachable branch in DatabaseBackendHandlerFactory
    
    * Remove outdated case in DatabaseBackendHandlerFactoryTest
---
 .../proxy/backend/text/data/DatabaseBackendHandlerFactory.java |  3 +--
 .../backend/text/data/DatabaseBackendHandlerFactoryTest.java   | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactory.java
index 8adb03be7af..0cd3a43f60e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactory.java
@@ -27,7 +27,6 @@ import org.apache.shardingsphere.proxy.backend.text.data.impl.UnicastDatabaseBac
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.SetStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
 
 /**
@@ -46,7 +45,7 @@ public final class DatabaseBackendHandlerFactory {
      */
     public static DatabaseBackendHandler newInstance(final SQLStatementContext<?> sqlStatementContext, final String sql, final ConnectionSession connectionSession) {
         SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
-        if (sqlStatement instanceof SetStatement || sqlStatement instanceof DCLStatement) {
+        if (sqlStatement instanceof SetStatement) {
             return new BroadcastDatabaseBackendHandler(sqlStatementContext, sql, connectionSession);
         }
         if (sqlStatement instanceof DALStatement || (sqlStatement instanceof SelectStatement && null == ((SelectStatement) sqlStatement).getFrom())) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactoryTest.java
index c4af013a71f..2b3bcd15898 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/data/DatabaseBackendHandlerFactoryTest.java
@@ -25,7 +25,6 @@ import org.apache.shardingsphere.proxy.backend.text.data.impl.UnicastDatabaseBac
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.SetStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
 import org.junit.Test;
 
@@ -71,13 +70,4 @@ public final class DatabaseBackendHandlerFactoryTest {
         DatabaseBackendHandler actual = DatabaseBackendHandlerFactory.newInstance(context, sql, mock(ConnectionSession.class));
         assertThat(actual, instanceOf(SchemaAssignedDatabaseBackendHandler.class));
     }
-    
-    @Test
-    public void assertNewInstanceWithDCLStatement() {
-        String sql = "CREATE USER test IDENTIFIED BY '123456'";
-        SQLStatementContext<DCLStatement> context = mock(SQLStatementContext.class);
-        when(context.getSqlStatement()).thenReturn(mock(DCLStatement.class));
-        DatabaseBackendHandler actual = DatabaseBackendHandlerFactory.newInstance(context, sql, mock(ConnectionSession.class));
-        assertThat(actual, instanceOf(BroadcastDatabaseBackendHandler.class));
-    }
 }