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

bug fixed for monitor data lost

Browse Source
This commit is contained in:
wenshao
2013-07-15 21:32:07 +08:00
parent 24471edd8a
commit 4d403fb158
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
+16 -6
View File
@@ -375,7 +375,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
inputStreamOpenCountUpdater.set(this, 0);
readerOpenCountUpdater.set(this, 0);
}
public JdbcSqlStatValue getValueAndReset() {
return getValue(true);
}
@@ -387,7 +387,9 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
val.setSql(sql);
val.setId(id);
val.setExecuteLastStartTime(executeLastStartTime);
executeLastStartTime = 0;
if (reset) {
executeLastStartTime = 0;
}
val.setExecuteBatchSizeTotal(get(this, executeBatchSizeTotalUpdater, reset));
val.setExecuteBatchSizeMax(get(this, executeBatchSizeMaxUpdater, reset));
@@ -396,7 +398,9 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
val.setExecuteSpanNanoTotal(get(this, executeSpanNanoTotalUpdater, reset));
val.setExecuteSpanNanoMax(get(this, executeSpanNanoMaxUpdater, reset));
val.setExecuteNanoSpanMaxOccurTime(executeNanoSpanMaxOccurTime);
executeNanoSpanMaxOccurTime = 0;
if (reset) {
executeNanoSpanMaxOccurTime = 0;
}
val.setRunningCount(this.runningCount);
@@ -405,10 +409,14 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
val.setExecuteErrorCount(get(this, executeErrorCountUpdater, reset));
val.setExecuteErrorLast(executeErrorLast);
executeErrorLast = null;
if (reset) {
executeErrorLast = null;
}
val.setExecuteErrorLastTime(executeErrorLastTime);
executeErrorLastTime = 0;
if (reset) {
executeErrorLastTime = 0;
}
val.setUpdateCount(get(this, updateCountUpdater, reset));
val.setUpdateCountMax(get(this, updateCountMaxUpdater, reset));
@@ -425,7 +433,9 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
val.histogram_1000000_more = get(this, histogram_1000000_more_Updater, reset);
val.setLastSlowParameters(lastSlowParameters);
lastSlowParameters = null;
if (reset) {
lastSlowParameters = null;
}
val.setInTransactionCount(get(this, inTransactionCountUpdater, reset));
val.setResultSetHoldTimeNano(get(this, resultSetHoldTimeNanoUpdater, reset));
src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class DruidStatServiceTest extends TestCase {
dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:xxx");
dataSource.setFilters("stat");
dataSource.setFilters("mergeStat");
dataSource.setTestOnBorrow(false);
dataSource.init();