reachedConCount thread safe actiontech#1139

Lordess · May 27, 2020 · ca67bc2 · ca67bc2
1 parent 17b0580
commit ca67bc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...a/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeEasyMergeHandler.java b/...a/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeEasyMergeHandler.java
@@ -23,6 +23,7 @@
  */
 public class MultiNodeEasyMergeHandler extends MultiNodeMergeHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(MultiNodeEasyMergeHandler.class);
+    private int rowEndConCount = 0;
 
     public MultiNodeEasyMergeHandler(long id, RouteResultsetNode[] route, boolean autocommit, NonBlockingSession session) {
         super(id, route, autocommit, session);
@@ -88,7 +89,7 @@ public void rowEofResponse(byte[] data, boolean isLeft, BackendConnection conn)
             return;
         lock.lock();
         try {
-            if (reachedConCount == route.length) {
+            if (++rowEndConCount == route.length) {
                 session.setHandlerEnd(this);
                 nextHandler.rowEofResponse(null, this.isLeft, conn);
             }

diff --git a/.../java/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeMergeHandler.java b/.../java/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeMergeHandler.java
@@ -26,7 +26,7 @@ public abstract class MultiNodeMergeHandler extends OwnThreadDMLHandler {
     protected final ReentrantLock lock;
     final List<BaseSelectHandler> exeHandlers;
     protected RouteResultsetNode[] route;
-    int reachedConCount;
+    int reachedConCount = 0;
 
     public MultiNodeMergeHandler(long id, RouteResultsetNode[] route, boolean autocommit, NonBlockingSession session) {
         super(id, session);