From a003d371bceb160b0769623151b1253ea4f7aadb Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 17 Jan 2013 23:34:20 +0800 Subject: [PATCH] bug fixed for stat --- src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java | 2 +- src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java | 3 +-- .../java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java index b96ff057d9..f42bdb4ec9 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java @@ -437,7 +437,7 @@ public abstract class FilterEventAdapter extends FilterAdapter { try { statementExecuteBefore(statement, statement.getSql()); - boolean firstResult = super.preparedStatement_execute(chain, statement); + boolean firstResult = chain.preparedStatement_execute(statement); this.statementExecuteAfter(statement, statement.getSql(), firstResult); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index 771b4aab55..33de13886a 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -673,8 +673,7 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { } } - long millis = nanoSpan / (1000 * 1000); - histogramRecord(millis); + histogramRecord(nanoSpan); } public long getExecuteMillisTotal() { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java index 552c35ff89..6e1c7a1ab4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java @@ -21,6 +21,7 @@ public class ExceptionSorterTest extends TestCase { dataSource.setTestOnBorrow(true); dataSource.setDbType("mysql"); dataSource.setPoolPreparedStatements(true); + dataSource.setFilters("stat"); dataSource.init(); }