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

add testcase & bug fixed

Browse Source
This commit is contained in:
wenshao
2012-08-25 08:34:13 +08:00
parent dcfdf5449e
commit 012899d9d7
3 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+23 -12
View File
@@ -32,6 +32,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import javax.management.JMException;
import javax.management.ObjectName;
@@ -148,7 +149,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (LOG.isInfoEnabled()) {
LOG.info("{dataSource-" + this.getID() + "} restart");
}
this.close();
this.resetStat();
this.inited = false;
@@ -347,7 +348,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (getInitialSize() > maxActive) {
throw new IllegalArgumentException("illegal initialSize " + this.initialSize + ", maxActieve " + maxActive);
throw new IllegalArgumentException("illegal initialSize " + this.initialSize + ", maxActieve "
+ maxActive);
}
if (this.driverClass != null) {
@@ -590,15 +592,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLException {
final int maxWaitThreadCount = getMaxWaitThreadCount();
if (maxWaitThreadCount > 0) {
if (notEmptyWaitThreadCount > maxWaitThreadCount) {
connectErrorCount.incrementAndGet();
throw new SQLException("maxWaitThreadCount " + maxWaitThreadCount + ", current wait Thread count "
+ lock.getQueueLength());
}
}
for (;;) {
DruidPooledConnection poolalbeConnection = getConnectionInternal(maxWaitMillis);
@@ -692,6 +685,15 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
throw new DataSourceDisableException();
}
final int maxWaitThreadCount = getMaxWaitThreadCount();
if (maxWaitThreadCount > 0) {
if (notEmptyWaitThreadCount >= maxWaitThreadCount) {
connectErrorCount.incrementAndGet();
throw new SQLException("maxWaitThreadCount " + maxWaitThreadCount + ", current wait Thread count "
+ lock.getQueueLength());
}
}
connectCount++;
DruidConnectionHolder holder;
@@ -1441,7 +1443,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
public int getNotEmptyWaitThreadCount() {
return notEmptyWaitThreadCount;
lock.lock();
try {
return notEmptyWaitThreadCount;
} finally {
lock.unlock();
}
}
public int getNotEmptyWaitThreadPeak() {
@@ -1814,4 +1821,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public Map<String, JdbcSqlStat> getSqlStatMap() {
return this.getDataSourceStat().getSqlStatMap();
}
public Lock getLock() {
return lock;
}
}