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@537 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-08-30 04:09:09 +00:00
parent 36f59faf99
commit 3aa0b3c855
6 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/stat/TransactionInfo.java
+38
View File
@@ -0,0 +1,38 @@
package com.alibaba.druid.filter.stat;
import java.util.ArrayList;
import java.util.List;
public class TransactionInfo {
private final long id;
private final List<String> sqlList = new ArrayList<String>();
private final long startTimeMillis;
private long endTimeMillis;
public TransactionInfo(long id){
this.id = id;
this.startTimeMillis = System.currentTimeMillis();
}
public long getId() {
return id;
}
public List<String> getSqlList() {
return sqlList;
}
public long getStartTimeMillis() {
return startTimeMillis;
}
public long getEndTimeMillis() {
return endTimeMillis;
}
public void setEndTimeMillis(long endTimeMillis) {
this.endTimeMillis = endTimeMillis;
}
}
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+9 -3
View File
@@ -683,12 +683,12 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
}
public void setProxyFilters(List<Filter> filters) {
this.filters = filters;
if (filters != null) {
this.filters.addAll(filters);
}
}
public void setFilters(String filters) throws SQLException {
this.filters.clear();
if (filters == null || filters.length() == 0) {
return;
}
@@ -820,6 +820,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
private final AtomicLong connectionIdSeed = new AtomicLong(10000);
private final AtomicLong statementIdSeed = new AtomicLong(20000);
private final AtomicLong resultSetIdSeed = new AtomicLong(50000);
private final AtomicLong transactionIdSeed = new AtomicLong(50000);
public long createConnectionId() {
return connectionIdSeed.incrementAndGet();
@@ -832,6 +833,11 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
public long createResultSetId() {
return resultSetIdSeed.getAndIncrement();
}
@Override
public long createTransactionId() {
return transactionIdSeed.getAndIncrement();
}
void initStatement(Statement stmt) throws SQLException {
if (queryTimeout > 0) {
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+18 -35
View File
@@ -275,6 +275,22 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
JdbcUtils.close(realConnection);
continue;
}
if (isTestWhileIdle()) {
long idleMillis = System.currentTimeMillis() - poolalbeConnection.getConnectionHolder().getLastActiveTimeMillis();
if (idleMillis >= this.getTimeBetweenEvictionRunsMillis()) {
boolean validate = testConnectionInternal(poolalbeConnection.getConnection());
if (!validate) {
if (LOG.isDebugEnabled()) {
LOG.debug("skip not validate connection.");
}
JdbcUtils.close(realConnection);
continue;
}
poolalbeConnection.getConnectionHolder().setLastCheckTimeMillis(System.currentTimeMillis());
}
}
}
if (isRemoveAbandoned()) {
@@ -679,7 +695,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
final List<ConnectionHolder> evictList = new ArrayList<ConnectionHolder>();
final List<ConnectionHolder> idleList = new ArrayList<ConnectionHolder>();
List<ConnectionHolder> checkList = new ArrayList<ConnectionHolder>();
FOR_0: for (;;) {
// 从前面开始删除
try {
@@ -740,40 +755,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
for (ConnectionHolder idleConnection : idleList) {
if (!testConnectionInternal(idleConnection.getConnection())) {
evictList.add(idleConnection);
} else {
idleConnection.setLastCheckTimeMillis(System.currentTimeMillis());
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();
}
if (LOG.isDebugEnabled()) {
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());
}
}
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
@@ -787,11 +771,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
buf.append("evict ");
buf.append(evictList.size());
buf.append(", [");
for (int i = 0; i < size; ++i) {
for (int i = 0; i < evictList.size(); ++i) {
if (i != 0) {
buf.append(",");
}
buf.append(System.identityHashCode(checkList.get(i)));
buf.append(System.identityHashCode(evictList.get(i)));
}
buf.append("]");
LOG.debug(buf.toString());
@@ -799,7 +783,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
idleList.clear();
checkList.clear();
evictList.clear();
} catch (InterruptedException e) {
break;
src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java
+2
View File
@@ -42,4 +42,6 @@ public interface DataSourceProxy {
long createStatementId();
long createResultSetId();
long createTransactionId();
}
src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java
+6
View File
@@ -58,6 +58,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
private final AtomicLong connectionIdSeed = new AtomicLong(10000);
private final AtomicLong statementIdSeed = new AtomicLong(20000);
private final AtomicLong resultSetIdSeed = new AtomicLong(50000);
private final AtomicLong transactionIdSeed = new AtomicLong(0);
public DataSourceProxyImpl(Driver rawDriver, DataSourceProxyConfig config){
super();
@@ -442,4 +443,9 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
public long createResultSetId() {
return resultSetIdSeed.getAndIncrement();
}
@Override
public long createTransactionId() {
return transactionIdSeed.getAndIncrement();
}
}
src/main/java/com/alibaba/druid/stat/JdbcConnectionStat.java
+10
View File
@@ -57,6 +57,7 @@ public class JdbcConnectionStat implements JdbcConnectionStatMBean {
private long connectLastTime = 0;
private final AtomicLong closeCount = new AtomicLong(0); // 执行Connection.close的计数
private final AtomicLong transactionStartCount = new AtomicLong(0);
private final AtomicLong commitCount = new AtomicLong(0); // 执行commit的计数
private final AtomicLong rollbackCount = new AtomicLong(0); // 执行rollback的计数
@@ -94,6 +95,7 @@ public class JdbcConnectionStat implements JdbcConnectionStatMBean {
connectCount.set(0);
closeCount.set(0);
transactionStartCount.set(0);
commitCount.set(0);
rollbackCount.set(0);
connectNanoTotal.set(0);
@@ -379,6 +381,14 @@ public class JdbcConnectionStat implements JdbcConnectionStatMBean {
public void incrementConnectionRollbackCount() {
rollbackCount.incrementAndGet();
}
public void incrementTransactionStartCount() {
transactionStartCount.incrementAndGet();
}
public long getTransactionStartCount() {
return transactionStartCount.get();
}
public static class Entry implements EntryMBean {