增强监控

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@932 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-10-09 07:14:53 +00:00
parent 8f6bcf8207
commit eb70a31106
4 changed files with 24 additions and 4 deletions
@@ -183,6 +183,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
protected final AtomicLong reusePreparedStatement = new AtomicLong();
protected final AtomicLong preparedStatementCount = new AtomicLong();
protected final AtomicLong closedPreparedStatementCount = new AtomicLong();
protected final AtomicLong cachedPreparedStatementCount = new AtomicLong();
protected final Histogram transactionHistogram = new Histogram(
10,
@@ -195,10 +196,22 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
return transactionHistogram;
}
public void incrementCachedPreparedStatementCount() {
cachedPreparedStatementCount.incrementAndGet();
}
public void decrementCachedPreparedStatementCount() {
cachedPreparedStatementCount.decrementAndGet();
}
public long getCachedPreparedStatementCount() {
return cachedPreparedStatementCount.get();
}
public void incrementClosedPreparedStatementCount() {
closedPreparedStatementCount.incrementAndGet();
}
public long getClosedPreparedStatementCount() {
return closedPreparedStatementCount.get();
}
@@ -1327,13 +1340,13 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException();
}
public void closePreapredStatement(PreparedStatementHolder stmtHolder) {
if (stmtHolder == null) {
return;
}
closedPreparedStatementCount.incrementAndGet();
JdbcUtils.close(stmtHolder.getStatement());
}
}
@@ -125,4 +125,6 @@ public interface DruidAbstractDataSourceMBean {
long getPreparedStatementCount();
long getClosedPreparedStatementCount();
long getCachedPreparedStatementCount();
}
@@ -174,6 +174,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
for (PreparedStatementHolder holder : connection.getStatementPool().getMap().values()) {
closePreapredStatement(holder);
decrementCachedPreparedStatementCount();
}
connection.getStatementPool().getMap().clear();
@@ -1217,6 +1218,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
@Override
public String getVersion() {
return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion + "-2011-10-09 11:42";
return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion + "-2011-10-09 14:58";
}
}
@@ -47,6 +47,7 @@ public class PreparedStatementPool {
if (holder != null) {
holder.incrementReusedCount();
dataSource.decrementCachedPreparedStatementCount();
}
return holder;
@@ -57,6 +58,8 @@ public class PreparedStatementPool {
PreparedStatementHolder oldHolder = map.put(key, holder);
if (oldHolder != null) {
dataSource.closePreapredStatement(oldHolder);
} else {
dataSource.incrementCachedPreparedStatementCount();
}
}
@@ -77,6 +80,7 @@ public class PreparedStatementPool {
if (remove) {
dataSource.closePreapredStatement(eldest.getValue());
dataSource.decrementCachedPreparedStatementCount();
}
return remove;