#3555, carry PR#5178 to dev-4.x (#5731)

apache · May 21, 2020 · 8ad915c · 8ad915c
1 parent d3aa8e1
commit 8ad915c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 21 deletions.
diff --git a/...hardingproxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/...hardingproxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.frontend.mysql.command.query.binary.execute;
 
+import lombok.Getter;
 import org.apache.shardingsphere.database.protocol.error.CommonErrorCode;
 import org.apache.shardingsphere.database.protocol.mysql.constant.MySQLColumnType;
 import org.apache.shardingsphere.database.protocol.mysql.packet.MySQLPacket;
@@ -57,6 +58,10 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
 
     private volatile boolean isQuery;
 
+    @Getter
+    private volatile boolean isUpdateResponse;
+
+    @Getter
     private volatile boolean isErrorResponse;
 
     private int currentSequenceId;
@@ -77,6 +82,7 @@ public Collection<DatabasePacket> execute() {
             return Collections.singletonList(createErrorPacket(((ErrorResponse) backendResponse).getCause()));
         }
         if (backendResponse instanceof UpdateResponse) {
+            isUpdateResponse = true;
             return Collections.singletonList(createUpdatePacket((UpdateResponse) backendResponse));
         }
         isQuery = true;
@@ -108,11 +114,6 @@ public boolean isQuery() {
         return isQuery;
     }
 
-    @Override
-    public boolean isErrorResponse() {
-        return isErrorResponse;
-    }
-
     @Override
     public boolean next() throws SQLException {
         return databaseCommunicationEngine.next();

diff --git a/...re/shardingproxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java b/...re/shardingproxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.frontend.mysql.command.query.text.query;
 
+import lombok.Getter;
 import org.apache.shardingsphere.database.protocol.error.CommonErrorCode;
 import org.apache.shardingsphere.database.protocol.mysql.constant.MySQLColumnType;
 import org.apache.shardingsphere.database.protocol.mysql.packet.MySQLPacket;
@@ -57,6 +58,10 @@ public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
 
     private volatile boolean isQuery;
 
+    @Getter
+    private volatile boolean isUpdateResponse;
+
+    @Getter
     private volatile boolean isErrorResponse;
 
     private int currentSequenceId;
@@ -76,6 +81,7 @@ public Collection<DatabasePacket> execute() {
             return Collections.singletonList(createErrorPacket(((ErrorResponse) backendResponse).getCause()));
         }
         if (backendResponse instanceof UpdateResponse) {
+            isUpdateResponse = true;
             return Collections.singletonList(createUpdatePacket((UpdateResponse) backendResponse));
         }
         isQuery = true;
@@ -124,11 +130,6 @@ public boolean isQuery() {
         return isQuery;
     }
 
-    @Override
-    public boolean isErrorResponse() {
-        return isErrorResponse;
-    }
-
     @Override
     public boolean next() throws SQLException {
         return textProtocolBackendHandler.next();

diff --git a/...rdingsphere/shardingproxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java b/...rdingsphere/shardingproxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
@@ -80,7 +80,7 @@ public void writeQueryData(final ChannelHandlerContext context,
             context.write(new PostgreSQLReadyForQueryPacket());
             return;
         }
-        if (queryCommandExecutor.isErrorResponse()) {
+        if (queryCommandExecutor.isErrorResponse() || queryCommandExecutor.isUpdateResponse()) {
             context.write(new PostgreSQLReadyForQueryPacket());
             return;
         }

diff --git a/...hardingproxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java b/...hardingproxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.frontend.postgresql.command.query.binary.bind;
 
+import lombok.Getter;
 import org.apache.shardingsphere.database.protocol.packet.DatabasePacket;
 import org.apache.shardingsphere.database.protocol.postgresql.constant.PostgreSQLColumnType;
 import org.apache.shardingsphere.database.protocol.postgresql.packet.PostgreSQLPacket;
@@ -60,6 +61,10 @@ public final class PostgreSQLComBindExecutor implements QueryCommandExecutor {
 
     private volatile boolean isQuery;
 
+    @Getter
+    private volatile boolean isUpdateResponse;
+
+    @Getter
     private volatile boolean isErrorResponse;
 
     public PostgreSQLComBindExecutor(final PostgreSQLComBindPacket packet, final BackendConnection backendConnection) {
@@ -84,6 +89,7 @@ public Collection<DatabasePacket> execute() {
             result.add(createErrorPacket((ErrorResponse) backendResponse));
         }
         if (backendResponse instanceof UpdateResponse) {
+            isUpdateResponse = true;
             result.add(createUpdatePacket((UpdateResponse) backendResponse));
         }
         if (backendResponse instanceof QueryResponse) {
@@ -123,11 +129,6 @@ public boolean isQuery() {
         return isQuery;
     }
 
-    @Override
-    public boolean isErrorResponse() {
-        return isErrorResponse;
-    }
-
     @Override
     public boolean next() throws SQLException {
         return null != databaseCommunicationEngine && databaseCommunicationEngine.next();

diff --git a/...here/shardingproxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java b/...here/shardingproxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.shardingproxy.frontend.postgresql.command.query.text;
 
+import lombok.Getter;
 import org.apache.shardingsphere.database.protocol.packet.DatabasePacket;
 import org.apache.shardingsphere.database.protocol.postgresql.packet.PostgreSQLPacket;
 import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.PostgreSQLColumnDescription;
@@ -54,6 +55,10 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
 
     private volatile boolean isQuery;
 
+    @Getter
+    private volatile boolean isUpdateResponse;
+
+    @Getter
     private volatile boolean isErrorResponse;
 
     public PostgreSQLComQueryExecutor(final PostgreSQLComQueryPacket comQueryPacket, final BackendConnection backendConnection) {
@@ -71,6 +76,7 @@ public Collection<DatabasePacket> execute() {
             return Collections.singletonList(createErrorPacket((ErrorResponse) backendResponse));
         }
         if (backendResponse instanceof UpdateResponse) {
+            isUpdateResponse = true;
             return Collections.singletonList(createUpdatePacket((UpdateResponse) backendResponse));
         }
         Optional<PostgreSQLRowDescriptionPacket> result = createQueryPacket((QueryResponse) backendResponse);
@@ -108,11 +114,6 @@ public boolean isQuery() {
         return isQuery;
     }
 
-    @Override
-    public boolean isErrorResponse() {
-        return isErrorResponse;
-    }
-
     @Override
     public boolean next() throws SQLException {
         return textProtocolBackendHandler.next();

diff --git a/.../main/java/org/apache/shardingsphere/shardingproxy/frontend/api/QueryCommandExecutor.java b/.../main/java/org/apache/shardingsphere/shardingproxy/frontend/api/QueryCommandExecutor.java
@@ -26,6 +26,13 @@
  */
 public interface QueryCommandExecutor extends CommandExecutor {
 
+    /**
+     * Judge is update response.
+     *
+     * @return is update response or not
+     */
+    boolean isUpdateResponse();
+
     /**
      * Judge is error response.
      *