mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-02 02:40:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: inner 595 (#2221) (#2227)

Browse Source 
* fix: inner 595

* fix: inner 595

* fix: inner 595
This commit is contained in:
LUA
2020-11-03 14:16:34 +08:00
committed by GitHub
parent 7e57b18cac
commit b11322552c
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/actiontech/dble/rwsplit/RWSplitNonBlockingSession.java
View File

@@ -129,15 +129,6 @@ public class RWSplitNonBlockingSession {
this.conn = bindConn;
}
public void unbindIfSafe(boolean safe) {
if (safe) {
this.conn.release();
this.conn = null;
} else {
unbindIfSafe();
}
}
public void unbindIfSafe() {
if (rwSplitService.isAutocommit() && !rwSplitService.isTxStart() && !rwSplitService.isLocked() &&
!rwSplitService.isInLoadData() &&

8
src/main/java/com/actiontech/dble/services/rwsplit/RWSplitQueryHandler.java
View File

@@ -71,7 +71,6 @@ public class RWSplitQueryHandler implements FrontendQueryHandler {
case RwSplitServerParse.ROLLBACK:
session.execute(true, (isSuccess, rwSplitService) -> {
rwSplitService.setTxStart(false);
rwSplitService.getSession().unbindIfSafe(true);
session.getService().singleTransactionsCount();
});
break;
@@ -109,11 +108,8 @@ public class RWSplitQueryHandler implements FrontendQueryHandler {
case RwSplitServerParse.GRANT:
case RwSplitServerParse.REVOKE:
return (isSuccess, rwSplitService) -> {
if (session.getService().isTxStart()) {
rwSplitService.setTxStart(false);
rwSplitService.getSession().unbindIfSafe(true);
session.getService().singleTransactionsCount();
}
rwSplitService.setTxStart(false);
session.getService().singleTransactionsCount();
};
default:
return null;