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

支持idlecheck

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@384 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-12 10:34:49 +00:00
parent 945240bf49
commit c0dd7c9f61
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+41 -12
View File
@@ -647,6 +647,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
int evictCount = 0;
int idleCount = 0;
lock.lock();
try {
int numTestsPerEvictionRun = DruidDataSource.this.numTestsPerEvictionRun;
@@ -654,26 +655,54 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
numTestsPerEvictionRun = 1;
}
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
ConnectionHolder first = connections[0];
FOR_1: for (int i = 0; i < numTestsPerEvictionRun; ++i) {
ConnectionHolder connection = connections[i];
if (first == null) {
if (evictCount == 0 && idleCount == 0 && connection == null) {
continue FOR_0;
}
long idleMillis = System.currentTimeMillis() - first.getLastActiveMillis();
long idleMillis = System.currentTimeMillis() - connection.getLastActiveMillis();
if (idleMillis < minEvictableIdleTimeMillis) {
long waitMillis = minEvictableIdleTimeMillis - idleMillis;
idleTimeout.await(waitMillis, TimeUnit.MILLISECONDS);
continue FOR_0;
if (evictCount == 0 && idleCount == 0) {
long waitMillis = minEvictableIdleTimeMillis - idleMillis;
idleTimeout.await(waitMillis, TimeUnit.MILLISECONDS);
continue FOR_0;
}
break FOR_1;
}
if (count > minIdle) {
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
evictList.add(first);
if (count > minIdle + evictCount) {
evictCount++;
} else {
idleCount++;
}
}
if (evictCount > 0) {
System.arraycopy(connections, evictCount, connections, 0, count - evictCount);
for (int i = 0; i < evictCount; ++i) {
int index = --count;
evictList.add(connections[index]);
connections[index] = null;
}
}
if (idleCount > 0) {
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 < evictCount; ++i) {
connections[--count] = null;
}
for (ConnectionHolder idleConnection : idleConnections) {
if (testConnection(idleConnection.getConnection())) {
connections[count++] = idleConnection;
idleConnection.setLastActiveMillis(System.currentTimeMillis());
} else {
evictList.add(idleConnection);
}
}
}
} finally {
src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
+3 -2
View File
@@ -25,7 +25,7 @@ public class Case3 extends TestCase {
private String validationQuery = null; //"SELECT 1";
private int threadCount = 40;
private int TEST_COUNT = 3;
final int LOOP_COUNT = 1000 * 100;
final int LOOP_COUNT = 1000 * 1;
private boolean testOnBorrow = true;
protected void setUp() throws Exception {
@@ -41,7 +41,7 @@ public class Case3 extends TestCase {
public void test_perf() throws Exception {
for (int i = 0; i < 10; ++i) {
druid();
//druid();
dbcp();
}
}
@@ -85,6 +85,7 @@ public class Case3 extends TestCase {
for (int i = 0; i < TEST_COUNT; ++i) {
p0(dataSource, "dbcp", threadCount);
}
dataSource.close();
System.out.println();
}