for apache#675 refine

gaoguanguo · Apr 24, 2018 · f2434d3 · f2434d3
1 parent 5fc3efc
commit f2434d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ng-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java b/...ng-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java
@@ -228,7 +228,7 @@ private CommandResponsePackets merge(final SQLStatement sqlStatement, final List
             return mergeDML(headPackets);
         }
         if (SQLType.DQL == sqlStatement.getType()) {
-            return mergeDQLorDAL(sqlStatement, packets);
+            return mergeDQL(sqlStatement, packets);
         }
         return packets.get(0);
     }
@@ -244,7 +244,7 @@ private CommandResponsePackets mergeDML(final CommandResponsePackets firstPacket
         return new CommandResponsePackets(new OKPacket(1, affectedRows, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
     }
 
-    private CommandResponsePackets mergeDQLorDAL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) {
+    private CommandResponsePackets mergeDQL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) {
         List<QueryResult> queryResults = new ArrayList<>(packets.size());
         for (int i = 0; i < packets.size(); i++) {
             // TODO replace to a common PacketQueryResult

diff --git a/...xy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java b/...xy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java
@@ -266,7 +266,7 @@ private CommandResponsePackets merge(final SQLStatement sqlStatement, final List
             return mergeDML(headPackets);
         }
         if (SQLType.DQL == sqlStatement.getType()) {
-            return mergeDQLorDAL(sqlStatement, packets);
+            return mergeDQL(sqlStatement, packets);
         }
         return packets.get(0);
     }
@@ -282,7 +282,7 @@ private CommandResponsePackets mergeDML(final CommandResponsePackets firstPacket
         return new CommandResponsePackets(new OKPacket(1, affectedRows, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, ""));
     }
 
-    private CommandResponsePackets mergeDQLorDAL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) {
+    private CommandResponsePackets mergeDQL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) {
         List<QueryResult> queryResults = new ArrayList<>(packets.size());
         for (int i = 0; i < packets.size(); i++) {
             // TODO replace to a common PacketQueryResult