Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

修正evict的bug

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@522 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-26 05:52:52 +00:00
parent 0e4d3d00d2
commit 0fdd23b6c6
7 changed files with 233 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/mock/MockConnection.java
+20 -5
View File
@@ -38,12 +38,12 @@ import com.alibaba.druid.logging.LogFactory;
public class MockConnection implements Connection {
private final static Log LOG = LogFactory.getLog(MockConnection.class);
private final static Log LOG = LogFactory.getLog(MockConnection.class);
private boolean autoCommit = false;
private boolean closed = false;
private boolean readOnly = false;
private String catalog = null;
private boolean autoCommit = false;
private boolean closed = false;
private boolean readOnly = false;
private String catalog = null;
private int transactionIsolation;
private SQLWarning warning;
private int holdability;
@@ -54,10 +54,25 @@ public class MockConnection implements Connection {
private long id;
private final long createdTimeMillis = System.currentTimeMillis();
private long lastActiveTimeMillis = System.currentTimeMillis();
public MockConnection(){
this(null);
}
public long getLastActiveTimeMillis() {
return lastActiveTimeMillis;
}
public void setLastActiveTimeMillis(long lastActiveTimeMillis) {
this.lastActiveTimeMillis = lastActiveTimeMillis;
}
public long getCreatedTimeMillis() {
return createdTimeMillis;
}
public MockConnection(MockDriver driver){
this(driver, new Properties());
}
src/main/java/com/alibaba/druid/mock/MockDriver.java
+17
View File
@@ -55,10 +55,20 @@ public class MockDriver implements Driver {
private final List<MockConnection> connections = new CopyOnWriteArrayList<MockConnection>();
private long idleTimeCount = 1000 * 60 * 3;
static {
registerDriver(instance);
}
public long getIdleTimeCount() {
return idleTimeCount;
}
public void setIdleTimeCount(long idleTimeCount) {
this.idleTimeCount = idleTimeCount;
}
public long generateConnectionId() {
return connectionIdSeed.incrementAndGet();
}
@@ -192,6 +202,13 @@ public class MockDriver implements Driver {
MockConnection conn = stmt.getMockConnection();
long idleTimeMillis = System.currentTimeMillis() - conn.getLastActiveTimeMillis();
if (idleTimeMillis >= this.idleTimeCount) {
throw new SQLException("connection is idle time count");
}
conn.setLastActiveTimeMillis(System.currentTimeMillis());
if (conn != null) {
if (conn.getConnectProperties() != null) {
Object propertyValue = conn.getConnectProperties().get("executeSleep");
src/main/java/com/alibaba/druid/pool/ConnectionHolder.java
+15 -6
View File
@@ -36,7 +36,8 @@ public final class ConnectionHolder {
private final List<ConnectionEventListener> connectionEventListeners = new CopyOnWriteArrayList<ConnectionEventListener>();
private final List<StatementEventListener> statementEventListeners = new CopyOnWriteArrayList<StatementEventListener>();
private final long connecttimeMillis;
private long lastActiveMillis;
private long lastActiveTimeMillis;
private long lastCheckTimeMillis = 0;
private long useCount = 0;
private final boolean poolPreparedStatements;
@@ -49,7 +50,7 @@ public final class ConnectionHolder {
this.conn = conn;
this.poolPreparedStatements = dataSource.isPoolPreparedStatements();
this.connecttimeMillis = System.currentTimeMillis();
this.lastActiveMillis = connecttimeMillis;
this.lastActiveTimeMillis = connecttimeMillis;
if (this.poolPreparedStatements) {
statementPool = new PreparedStatementPool();
@@ -58,12 +59,20 @@ public final class ConnectionHolder {
}
}
public long getLastActiveMillis() {
return lastActiveMillis;
public long getLastCheckTimeMillis() {
return lastCheckTimeMillis;
}
public void setLastActiveMillis(long lastActiveMillis) {
this.lastActiveMillis = lastActiveMillis;
public void setLastCheckTimeMillis(long lastCheckTimeMillis) {
this.lastCheckTimeMillis = lastCheckTimeMillis;
}
public long getLastActiveTimeMillis() {
return lastActiveTimeMillis;
}
public void setLastActiveTimeMillis(long lastActiveMillis) {
this.lastActiveTimeMillis = lastActiveMillis;
}
public void addTrace(Statement stmt) {
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
-13
View File
@@ -41,7 +41,6 @@ import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterChainImpl;
import com.alibaba.druid.pool.DruidDataSource.ActiveConnectionTraceInfo;
import com.alibaba.druid.pool.vendor.NullExceptionSorter;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.util.ConcurrentIdentityHashMap;
import com.alibaba.druid.util.DruidLoaderUtils;
@@ -744,18 +743,6 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
}
}
public boolean testConnection(Connection conn) {
if (conn instanceof PoolableConnection) {
conn = ((PoolableConnection) conn).getConnection();
}
if (conn instanceof ConnectionProxy) {
conn = ((ConnectionProxy) conn).getConnectionRaw();
}
return testConnectionInternal(conn);
}
protected boolean testConnectionInternal(Connection conn) {
try {
if (validConnectionChecker != null) {
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+36 -3
View File
@@ -266,6 +266,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
JdbcUtils.close(realConnection);
continue;
}
poolalbeConnection.getConnectionHolder().setLastCheckTimeMillis(System.currentTimeMillis());
} else {
Connection realConnection = poolalbeConnection.getConnection();
if (realConnection.isClosed()) {
@@ -395,6 +396,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
return;
}
holder.setLastCheckTimeMillis(System.currentTimeMillis());
}
lock.lockInterruptibly();
@@ -480,7 +482,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
throw new NullPointerException();
}
e.setLastActiveMillis(System.currentTimeMillis());
e.setLastActiveTimeMillis(System.currentTimeMillis());
connections[count++] = e;
notEmpty.signal();
@@ -716,7 +718,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue FOR_0;
}
long idleMillis = System.currentTimeMillis() - connection.getLastActiveMillis();
long idleMillis = System.currentTimeMillis() - connection.getLastActiveTimeMillis();
if (idleMillis >= minEvictableIdleTimeMillis && count - evictList.size() > minIdle) {
evictList.add(connection);
} else {
@@ -735,6 +737,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (!testConnectionInternal(idleConnection.getConnection())) {
evictList.add(idleConnection);
} else {
idleConnection.setLastCheckTimeMillis(System.currentTimeMillis());
checkList.add(idleConnection);
}
}
@@ -751,7 +754,20 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
lock.unlock();
}
if (LOG.isDebugEnabled()) {
LOG.debug("checked " + size);
StringBuilder buf = new StringBuilder();
buf.append("checked ");
buf.append(size);
buf.append(", idleCount ");
buf.append(count);
buf.append(", [");
for (int i = 0; i < size; ++i) {
if (i != 0) {
buf.append(",");
}
buf.append(System.identityHashCode(checkList.get(i)));
}
buf.append("]");
LOG.debug(buf.toString());
}
}
@@ -761,6 +777,23 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
destroyCount++;
}
if (evictList.size() > 0) {
if (LOG.isDebugEnabled()) {
StringBuilder buf = new StringBuilder();
buf.append("evict ");
buf.append(evictList.size());
buf.append(", [");
for (int i = 0; i < size; ++i) {
if (i != 0) {
buf.append(",");
}
buf.append(System.identityHashCode(checkList.get(i)));
}
buf.append("]");
LOG.debug(buf.toString());
}
}
idleList.clear();
checkList.clear();
evictList.clear();