fix : get connection does not execute sql and return, add config 'checkExecuteTime', use 'lastExecTimeMillis' instead of 'lastActiveTimeMillis'

This commit is contained in:
高铁
2019-10-27 17:19:30 +08:00
parent 07b14e88de
commit 1e8cc71c50
4 changed files with 41 additions and 0 deletions
@@ -172,6 +172,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private volatile boolean keepAlive = false;
private boolean asyncInit = false;
protected boolean killWhenSocketReadTimeout = false;
protected boolean checkExecuteTime = false;
private static List<Filter> autoFilters = null;
private boolean loadSpifilterSkip = false;
@@ -526,6 +527,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
loadSpifilterSkip = true;
}
}
{
String property = System.getProperty("druid.checkExecuteTime");
if (property != null && !"false".equals(property)) {
checkExecuteTime = true;
}
}
}
public boolean isKillWhenSocketReadTimeout() {
@@ -1426,8 +1433,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
final DruidConnectionHolder holder = poolableConnection.holder;
long currentTimeMillis = System.currentTimeMillis();
long lastActiveTimeMillis = holder.lastActiveTimeMillis;
long lastExecTimeMillis = holder.lastExecTimeMillis;
long lastKeepTimeMillis = holder.lastKeepTimeMillis;
if (checkExecuteTime
&& lastExecTimeMillis != lastActiveTimeMillis) {
lastActiveTimeMillis = lastExecTimeMillis;
}
if (lastKeepTimeMillis > lastActiveTimeMillis) {
lastActiveTimeMillis = lastKeepTimeMillis;
}
@@ -3804,4 +3817,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public boolean isClosed() {
return this.closed;
}
public boolean isCheckExecuteTime() {
return checkExecuteTime;
}
public void setCheckExecuteTime(boolean checkExecuteTime) {
this.checkExecuteTime = checkExecuteTime;
}
}