Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 2.19.03.4/lts #1865

Merged
merged 5 commits into from
May 29, 2020
Merged

release 2.19.03.4/lts #1865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17b0580
split merge hander #1139 (#1140)
yanhuqing666 Apr 26, 2019
ca67bc2
reachedConCount thread safe #1139
yanhuqing666 Apr 28, 2019
3e1ef65
import feature from 2.19.11.0/rel to 2.19.03/lts
Lordess May 28, 2020
74ad660
import feature from 2.19.11.0/rel to 2.19.03/lts
Lordess May 28, 2020
923fa87
release 2.19.03.4/lts
Lordess May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reachedConCount thread safe #1139
  • Loading branch information
@yanhuqing666 @Lordess
yanhuqing666 authored and Lordess committed May 27, 2020
commit ca67bc2d2b133086644f01e7161c7aa9949c7f00
3 changes: 2 additions & 1 deletion ...a/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeEasyMergeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/actiontech/dble/backend/mysql/nio/handler/query/impl/MultiNodeMergeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down