diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index bf9372f501..9148b62ff7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -145,6 +145,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements protected volatile long minEvictableIdleTimeMillis = DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS; protected volatile long maxEvictableIdleTimeMillis = DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS; protected volatile long phyTimeoutMillis = DEFAULT_PHY_TIMEOUT_MILLIS; + protected volatile long phyMaxUseCount = -1; protected volatile boolean removeAbandoned; protected volatile long removeAbandonedTimeoutMillis = 300 * 1000; @@ -779,6 +780,14 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements this.phyTimeoutMillis = phyTimeoutMillis; } + public long getPhyMaxUseCount() { + return phyMaxUseCount; + } + + public void setPhyMaxUseCount(long phyMaxUseCount) { + this.phyMaxUseCount = phyMaxUseCount; + } + public int getNumTestsPerEvictionRun() { return numTestsPerEvictionRun; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index 04dfab549f..95aa5958fc 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -52,7 +52,7 @@ public final class DruidConnectionHolder { protected final long connectTimeMillis; protected volatile long lastActiveTimeMillis; protected volatile long lastValidTimeMillis; - private long useCount = 0; + protected long useCount = 0; private long keepAliveCheckCount = 0; private long lastNotEmptyWaitNanos; private final long createNanoSpan; diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 116b776277..3821ad408f 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1671,6 +1671,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return; } + if (phyMaxUseCount > 0 && holder.useCount >= phyMaxUseCount) { + discardConnection(holder.conn); + return; + } + if (physicalConnection.isClosed()) { lock.lock(); try { @@ -2833,7 +2838,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat holer.lastActiveTimeMillis = System.currentTimeMillis(); put(holer); } else { - JdbcUtils.close(connection); + try { + connection.close(); + } catch (Exception e) { + // skip + } } } Arrays.fill(keepAliveConnections, null); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java new file mode 100644 index 0000000000..461d499153 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java @@ -0,0 +1,47 @@ +package com.alibaba.druid.bvt.pool; + +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + +public class DruidDataSourceTest9_phyMaxUseCount extends TestCase { + + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xxx"); + dataSource.setInitialSize(1); + dataSource.setPhyMaxUseCount(10); + dataSource.setFilters("log4j"); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_for_phyMaxUseCount() throws Exception { + Connection phyConn = null; + for (int i = 0; i < 100; ++i) { + DruidPooledConnection conn = dataSource.getConnection(); + if (i % 10 == 0) { + if (conn.getConnection() == phyConn) { + throw new IllegalStateException(); + } + } + + phyConn = conn.getConnection(); + conn.close(); +// System.out.println(i); + } + } + +}