refactor ExecuteUpdateResponse

xuse · Jul 21, 2018 · 2124346 · 2124346
1 parent be15756
commit 2124346
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/...g-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java b/...g-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java
@@ -116,7 +116,7 @@ private CommandResponsePackets execute(final SQLRouteResult routeResult) throws
         executeResponse = executeEngine.execute(routeResult, isReturnGeneratedKeys);
         CommandResponsePackets result = merge(sqlStatement);
         if (!ruleRegistry.isMasterSlaveOnly()) {
-            ProxyShardingRefreshHandler.build(routeResult.getSqlStatement()).execute();
+            ProxyShardingRefreshHandler.build(sqlStatement).execute();
         }
         return result;
     }
@@ -129,11 +129,11 @@ private boolean isUnsupportedXA(final SQLType sqlType) throws SystemException {
     private CommandResponsePackets merge(final SQLStatement sqlStatement) {
         if (executeResponse instanceof ExecuteUpdateResponse) {
             Collection<DatabasePacket> headPackets = new LinkedList<>();
-            for (CommandResponsePackets each : ((ExecuteUpdateResponse) executeResponse).getPacketsList()) {
-                if (each.getHeadPacket() instanceof ErrPacket) {
-                    return new CommandResponsePackets(each.getHeadPacket());
+            for (DatabasePacket each : ((ExecuteUpdateResponse) executeResponse).getPacketsList()) {
+                if (each instanceof ErrPacket) {
+                    return new CommandResponsePackets(each);
                 }
-                headPackets.add(each.getHeadPacket());
+                headPackets.add(each);
             }
             return mergeUpdate(headPackets);
         }

diff --git a/...rdingsphere/proxy/backend/common/jdbc/execute/memory/ConnectionStrictlyExecuteEngine.java b/...rdingsphere/proxy/backend/common/jdbc/execute/memory/ConnectionStrictlyExecuteEngine.java
@@ -131,7 +131,7 @@ private ExecuteResponse getExecuteUpdateResponse(final Collection<ExecuteRespons
         for (Future<Collection<ExecuteResponseUnit>> each : futureList) {
             try {
                 for (ExecuteResponseUnit executeResponse : each.get()) {
-                    result.getPacketsList().add(executeResponse.getCommandResponsePackets());
+                    result.getPacketsList().add(executeResponse.getCommandResponsePackets().getHeadPacket());
                 }
             } catch (final InterruptedException | ExecutionException ex) {
                 throw new ShardingException(ex.getMessage(), ex);

diff --git a/...a/io/shardingsphere/proxy/backend/common/jdbc/execute/response/ExecuteUpdateResponse.java b/...a/io/shardingsphere/proxy/backend/common/jdbc/execute/response/ExecuteUpdateResponse.java
@@ -18,7 +18,7 @@
 package io.shardingsphere.proxy.backend.common.jdbc.execute.response;
 
 import io.shardingsphere.proxy.backend.common.jdbc.execute.response.unit.ExecuteResponseUnit;
-import io.shardingsphere.proxy.transport.mysql.packet.command.reponse.CommandResponsePackets;
+import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;
 import lombok.Getter;
 
 import java.util.Collection;
@@ -33,18 +33,18 @@
 @Getter
 public final class ExecuteUpdateResponse implements ExecuteResponse {
 
-    private final List<CommandResponsePackets> packetsList = new LinkedList<>();
+    private final List<DatabasePacket> packetsList = new LinkedList<>();
 
-    private final CommandResponsePackets firstPackets;
+    private final DatabasePacket firstPackets;
 
-    public ExecuteUpdateResponse(final CommandResponsePackets packets) {
-        packetsList.add(packets);
+    public ExecuteUpdateResponse(final DatabasePacket packet) {
+        packetsList.add(packet);
         firstPackets = packetsList.iterator().next();
     }
 
     public ExecuteUpdateResponse(final Collection<ExecuteResponseUnit> responseUnits) {
         for (ExecuteResponseUnit each : responseUnits) {
-            packetsList.add(each.getCommandResponsePackets());
+            packetsList.add(each.getCommandResponsePackets().getHeadPacket());
         }
         firstPackets = packetsList.iterator().next();
     }

diff --git a/.../shardingsphere/proxy/backend/common/jdbc/execute/stream/MemoryStrictlyExecuteEngine.java b/.../shardingsphere/proxy/backend/common/jdbc/execute/stream/MemoryStrictlyExecuteEngine.java
@@ -96,10 +96,10 @@ private ExecuteResponse getExecuteQueryResponse(final ExecuteQueryResponseUnit f
     }
 
     private ExecuteResponse getExecuteUpdateResponse(final ExecuteResponseUnit firstResponseUnit, final List<Future<ExecuteResponseUnit>> futureList) {
-        ExecuteUpdateResponse result = new ExecuteUpdateResponse(firstResponseUnit.getCommandResponsePackets());
+        ExecuteUpdateResponse result = new ExecuteUpdateResponse(firstResponseUnit.getCommandResponsePackets().getHeadPacket());
         for (Future<ExecuteResponseUnit> each : futureList) {
             try {
-                result.getPacketsList().add(each.get().getCommandResponsePackets());
+                result.getPacketsList().add(each.get().getCommandResponsePackets().getHeadPacket());
             } catch (final InterruptedException | ExecutionException ex) {
                 throw new ShardingException(ex.getMessage(), ex);
             }