Minor changes (apache#8707)

* Move sequence of AgentPluginLoader.getInstance * Adjust methods sequence of AgentPluginLoader * Refactor TextProtocolBackendHandlerFactory * For code format * Refactor RemoveTokenGenerator * Refactor SingleTableRoutingEngine
boomyamm · Dec 21, 2020 · bf74c0b · bf74c0b
1 parent 3ee1590
commit bf74c0b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/...org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java b/...org/apache/shardingsphere/sharding/route/engine/type/single/SingleTableRoutingEngine.java
@@ -54,6 +54,11 @@ public void route(final RouteContext routeContext, final ShardingRule shardingRu
         routeContext.getRouteUnits().add(new RouteUnit(new RouteMapper(dataSourceName.get(), dataSourceName.get()), routingTables));
     }
 
+    private Optional<String> getRandomDataSourceName(final Collection<String> dataSourceNames) {
+        String dataSourceName = Lists.newArrayList(dataSourceNames).get(ThreadLocalRandom.current().nextInt(dataSourceNames.size()));
+        return Optional.of(dataSourceName);
+    }
+
     private Optional<String> findDataSourceNameOfSingleTable(final ShardingRule shardingRule) {
         for (String each : logicTables) {
             if (shardingRule.getSingleTableRules().containsKey(each)) {
@@ -62,9 +67,4 @@ private Optional<String> findDataSourceNameOfSingleTable(final ShardingRule shar
         }
         return Optional.empty();
     }
-
-    private Optional<String> getRandomDataSourceName(final Collection<String> dataSourceNames) {
-        String dataSourceName = Lists.newArrayList(dataSourceNames).get(ThreadLocalRandom.current().nextInt(dataSourceNames.size()));
-        return Optional.of(dataSourceName);
-    }
 }
diff --git a/...apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java b/...apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
@@ -32,7 +32,7 @@
 /**
  * Remove token generator.
  */
-public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator {
+public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator<SQLStatementContext<?>> {
 
     @Override
     public boolean isGenerateSQLToken(final SQLStatementContext sqlStatementContext) {

diff --git a/.../java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/.../java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -72,6 +72,10 @@ public static TextProtocolBackendHandler newInstance(final DatabaseType database
         if (sqlStatement instanceof TCLStatement) {
             return TransactionBackendHandlerFactory.newInstance((TCLStatement) sqlStatement, sql, backendConnection);
         }
+        Optional<TextProtocolBackendHandler> distSQLBackendHandler = DistSQLBackendHandlerFactory.newInstance(databaseType, sqlStatement, backendConnection);
+        if (distSQLBackendHandler.isPresent()) {
+            return distSQLBackendHandler.get();
+        }
         Optional<DatabaseAdminBackendHandlerFactory> adminBackendHandlerEngine = TypedSPIRegistry.findRegisteredService(
                 DatabaseAdminBackendHandlerFactory.class, databaseType.getName(), new Properties());
         if (adminBackendHandlerEngine.isPresent()) {
@@ -80,10 +84,6 @@ public static TextProtocolBackendHandler newInstance(final DatabaseType database
                 return databaseAdminBackendHandler.get();
             }
         }
-        Optional<TextProtocolBackendHandler> distSQLBackendHandler = DistSQLBackendHandlerFactory.newInstance(databaseType, sqlStatement, backendConnection);
-        if (distSQLBackendHandler.isPresent()) {
-            return distSQLBackendHandler.get();
-        }
         return DatabaseBackendHandlerFactory.newInstance(sqlStatement, sql, backendConnection);
     }
 }
diff --git a/.../apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java b/.../apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLCallStatement.java
@@ -35,8 +35,8 @@
 @NoArgsConstructor
 @Getter
 public final class MySQLCallStatement extends CallStatement implements MySQLStatement {
-
+    
     private String procedureName;
-
+    
     private List<ExpressionSegment> parameters;
 }
diff --git a/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java b/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLInsertStatement.java
@@ -32,11 +32,11 @@
 @Setter
 @ToString
 public final class MySQLInsertStatement extends InsertStatement implements MySQLStatement {
-
+    
     private SetAssignmentSegment setAssignment;
-
+    
     private OnDuplicateKeyColumnsSegment onDuplicateKeyColumns;
-
+    
     /**
      * Get set assignment segment.
      *
@@ -45,7 +45,7 @@ public final class MySQLInsertStatement extends InsertStatement implements MySQL
     public Optional<SetAssignmentSegment> getSetAssignment() {
         return Optional.ofNullable(setAssignment);
     }
-
+    
     /**
      * Get on duplicate key columns segment.
      *

diff --git a/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java b/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLSelectStatement.java
@@ -32,9 +32,9 @@
 @Setter
 @ToString
 public final class MySQLSelectStatement extends SelectStatement implements MySQLStatement {
-
+    
     private LimitSegment limit;
-
+    
     private LockSegment lock;
 
     /**
@@ -45,7 +45,7 @@ public final class MySQLSelectStatement extends SelectStatement implements MySQL
     public Optional<LimitSegment> getLimit() {
         return Optional.ofNullable(limit);
     }
-
+    
     /**
      * Get lock segment.
      *

diff --git a/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java b/...pache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dml/MySQLUpdateStatement.java
@@ -34,9 +34,9 @@
 public final class MySQLUpdateStatement extends UpdateStatement implements MySQLStatement {
 
     private OrderBySegment orderBy;
-
+    
     private LimitSegment limit;
-
+    
     /**
      * Get order by segment.
      *
@@ -45,7 +45,7 @@ public final class MySQLUpdateStatement extends UpdateStatement implements MySQL
     public Optional<OrderBySegment> getOrderBy() {
         return Optional.ofNullable(orderBy);
     }
-
+    
     /**
      * Get order by segment.
      *