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

支持numTestsPerEvictionRun

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@379 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-12 08:45:59 +00:00
parent cde7e3fa7c
commit c239e45c47
1 changed files with 21 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
+21 -14
View File
@@ -168,7 +168,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.dbType = JdbcUtils.getDbType(jdbcUrl, driverClass.getClass().getName());
if ("mysql".equals(dbType)) {
// this.validConnectionChecker = new MySqlValidConnectionChecker();
// this.validConnectionChecker = new MySqlValidConnectionChecker();
this.validConnectionChecker = null;
} else if ("oracle".equals(dbType)) {
this.validConnectionChecker = new OracleValidConnectionChecker();
@@ -630,7 +630,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public void run() {
initedLatch.countDown();
for (;;) {
FOR_0: for (;;) {
// 从前面开始删除
try {
if (timeBetweenEvictionRunsMillis > 0) {
@@ -649,21 +649,28 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
ConnectionHolder first = null;
lock.lock();
try {
first = connections[0];
if (first == null) {
continue;
int numTestsPerEvictionRun = DruidDataSource.this.numTestsPerEvictionRun;
if (numTestsPerEvictionRun <= 0) {
numTestsPerEvictionRun = 1;
}
long millis = System.currentTimeMillis() - first.getLastActiveMillis();
if (millis < minEvictableIdleTimeMillis) {
idleTimeout.await(millis, TimeUnit.MILLISECONDS);
continue;
}
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
first = connections[0];
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
if (first == null) {
continue FOR_0;
}
long millis = System.currentTimeMillis() - first.getLastActiveMillis();
if (millis < minEvictableIdleTimeMillis) {
idleTimeout.await(millis, TimeUnit.MILLISECONDS);
continue FOR_0;
}
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
}
} finally {
lock.unlock();
}