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

去掉多余代码

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@601 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-02 18:35:06 +00:00
parent 73e4e39a63
commit 657889db5f
4 changed files with 137 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+17 -51
View File
@@ -686,7 +686,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public void run() {
initedLatch.countDown();
final List<ConnectionHolder> evictList = new ArrayList<ConnectionHolder>();
for (;;) {
// 从前面开始删除
try {
@@ -705,54 +704,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue;
}
lock.lock();
try {
final int checkCount = poolingCount - minIdle;
for (int i = 0; i < checkCount; ++i) {
ConnectionHolder connection = connections[i];
long idleMillis = System.currentTimeMillis() - connection.getLastActiveTimeMillis();
if (idleMillis >= minEvictableIdleTimeMillis) {
evictList.add(connection);
} else {
break;
}
}
int removeCount = evictList.size();
if (removeCount > 0) {
System.arraycopy(connections, removeCount, connections, 0, poolingCount - removeCount);
Arrays.fill(connections, poolingCount - removeCount, poolingCount, null);
poolingCount -= removeCount;
}
} finally {
lock.unlock();
}
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
JdbcUtils.close(connection);
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 < evictList.size(); ++i) {
if (i != 0) {
buf.append(",");
}
buf.append(System.identityHashCode(evictList.get(i)));
}
buf.append("]");
LOG.debug(buf.toString());
}
}
evictList.clear();
shrink(true);
} catch (InterruptedException e) {
break;
}
@@ -1104,16 +1056,30 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return new CompositeDataSupport(JdbcStatManager.getDataSourceCompositeType(), map);
}
@Override
public void shrink() {
shrink(false);
}
public void shrink(boolean checkTime) {
final List<ConnectionHolder> evictList = new ArrayList<ConnectionHolder>();
lock.lock();
try {
final int checkCount = poolingCount - minIdle;
for (int i = 0; i < checkCount; ++i) {
ConnectionHolder connection = connections[i];
evictList.add(connection);
if (checkTime) {
long idleMillis = System.currentTimeMillis() - connection.getLastActiveTimeMillis();
if (idleMillis >= minEvictableIdleTimeMillis) {
evictList.add(connection);
} else {
break;
}
} else {
evictList.add(connection);
}
}
int removeCount = evictList.size();