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

修正testWhileIdle的行为

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@508 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-25 11:24:29 +00:00
parent e950d073b6
commit d343d1cc2c
4 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/mock/MockConnection.java
+9 -1
View File
@@ -52,6 +52,8 @@ public class MockConnection implements Connection {
private Properties connectProperties;
private long id;
public MockConnection(){
this(null);
}
@@ -63,6 +65,12 @@ public class MockConnection implements Connection {
public MockConnection(MockDriver driver, Properties connectProperties){
this.driver = driver;
this.connectProperties = connectProperties;
this.id = driver.generateConnectionId();
}
public long getId() {
return id;
}
public MockDriver getDriver() {
@@ -145,7 +153,7 @@ public class MockConnection implements Connection {
@Override
public boolean isClosed() throws SQLException {
if (LOG.isDebugEnabled()) {
LOG.debug("check close " + closed);
LOG.debug("conn-" + id + " isClose : " + closed);
}
return closed;
src/main/java/com/alibaba/druid/mock/MockDriver.java
+8 -2
View File
@@ -51,12 +51,18 @@ public class MockDriver implements Driver {
private final AtomicLong connectCount = new AtomicLong();
private final AtomicLong connectionCloseCount = new AtomicLong();
private final AtomicLong connectionIdSeed = new AtomicLong(1000L);
private final List<MockConnection> connections = new CopyOnWriteArrayList<MockConnection>();
static {
registerDriver(instance);
}
public long generateConnectionId() {
return connectionIdSeed.incrementAndGet();
}
public List<MockConnection> getConnections() {
return connections;
}
@@ -75,7 +81,7 @@ public class MockDriver implements Driver {
connections.remove(conn);
if (LOG.isDebugEnabled()) {
LOG.debug("close");
LOG.debug("conn-" + conn.getId() + " close");
}
}
@@ -183,7 +189,7 @@ public class MockDriver implements Driver {
if (LOG.isDebugEnabled()) {
LOG.debug("executeQuery " + sql);
}
MockConnection conn = stmt.getMockConnection();
if (conn != null) {
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+36 -49
View File
@@ -72,7 +72,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private final Condition notEmpty = lock.newCondition();
private final Condition notMaxActive = lock.newCondition();
private final Condition lowWater = lock.newCondition();
private final Condition idleTimeout = lock.newCondition();
// stats
private long connectCount = 0;
@@ -692,6 +691,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
initedLatch.countDown();
final List<ConnectionHolder> evictList = new ArrayList<ConnectionHolder>();
final List<ConnectionHolder> idleList = new ArrayList<ConnectionHolder>();
List<ConnectionHolder> checkList = new ArrayList<ConnectionHolder>();
FOR_0: for (;;) {
// 从前面开始删除
try {
@@ -719,7 +720,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
numTestsPerEvictionRun = 1;
}
FOR_1: for (int i = 0; i < numTestsPerEvictionRun; ++i) {
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
ConnectionHolder connection = connections[i];
if (evictCount == 0 && idleCount == 0 && connection == null) {
@@ -727,63 +728,49 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
long idleMillis = System.currentTimeMillis() - connection.getLastActiveMillis();
if (idleMillis < minEvictableIdleTimeMillis) {
if (evictCount == 0 && idleCount == 0) {
long waitMillis = minEvictableIdleTimeMillis - idleMillis;
idleTimeout.await(waitMillis, TimeUnit.MILLISECONDS);
continue FOR_0;
}
break FOR_1;
}
if (count > minIdle + evictCount) {
evictCount++;
if (idleMillis >= minEvictableIdleTimeMillis) {
evictList.add(connection);
} else {
idleCount++;
idleList.add(connection);
}
}
if (evictCount > 0) {
for (int i = 0; i < evictCount; ++i) {
evictList.add(connections[i]);
}
System.arraycopy(connections, evictCount, connections, 0, count - evictCount);
for (int i = 0; i < evictCount; ++i) {
connections[--count] = null;
}
}
if (idleCount > 0 && isTestWhileIdle()) {
ConnectionHolder[] idleConnections = new ConnectionHolder[idleCount];
System.arraycopy(connections, 0, idleConnections, 0, idleCount);
System.arraycopy(connections, idleCount, connections, 0, count - idleCount);
for (int i = 0; i < idleCount; ++i) {
connections[--count] = null;
}
for (ConnectionHolder idleConnection : idleConnections) {
if (testConnectionInternal(idleConnection.getConnection())) {
connections[count++] = idleConnection;
idleConnection.setLastActiveMillis(System.currentTimeMillis());
idleCheckCount++;
} else {
evictList.add(idleConnection);
}
}
System.arraycopy(connections, numTestsPerEvictionRun, connections, 0, count - numTestsPerEvictionRun);
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
connections[--count] = null;
}
} finally {
lock.unlock();
}
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
try {
connection.close();
destroyCount++;
} catch (SQLException e) {
LOG.error("create connection error", e);
for (ConnectionHolder idleConnection : idleList) {
if (!testConnectionInternal(idleConnection.getConnection())) {
evictList.add(idleConnection);
} else {
checkList.add(idleConnection);
}
}
int size = checkList.size();
if (size > 0) {
lock.lock();
try {
for (int i = 0; i < size; ++i) {
ConnectionHolder connection = checkList.get(i);
connections[count++] = connection;
}
} finally {
lock.unlock();
}
}
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
JdbcUtils.close(connection);
destroyCount++;
}
idleList.clear();
checkList.clear();
evictList.clear();
} catch (InterruptedException e) {
break;