improve StatFilter

src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java

@@ -335,10 +335,11 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
     }
 
     public void addExecuteTime(StatementExecuteType executeType, boolean firstResultSet, long nanoSpan) {
+        addExecuteTime(nanoSpan);
+        
         if (StatementExecuteType.ExecuteQuery != executeType && !firstResultSet) {
             executeAndResultHoldTimeHistogram.record((nanoSpan) / 1000 / 1000);
         }
-        addExecuteTime(nanoSpan);
     }
 
     public void addExecuteTime(long nanoSpan) {

src/main/java/com/alibaba/druid/util/Histogram.java

@@ -81,6 +81,14 @@ public class Histogram {
         return rangeCounters[index].get();
     }
     
+    public long getSum() {
+        long sum = 0;
+        for (int i = 0; i < rangeCounters.length; ++i) {
+            sum += rangeCounters[i].get();
+        }
+        return sum;
+    }
+    
     public String toString() {
     	StringBuilder buf = new StringBuilder();
     	buf.append('[');

src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java

@@ -65,14 +65,11 @@ public class StatFilterExecuteFirstResultSetTest extends TestCase {
         JdbcSqlStat sqlStat = dataSource.getDataSourceStat().getSqlStat(sql);
 
         Histogram histogram = sqlStat.getHistogram();
-        Assert.assertEquals(1,
-                            histogram.getValue(0) + histogram.getValue(1) + histogram.getValue(2)
-                                    + histogram.getValue(3));
+        Assert.assertEquals(1, histogram.getSum());
 
         Histogram rsHoldHistogram = sqlStat.getExecuteAndResultHoldTimeHistogram();
 
-        Assert.assertEquals(1, rsHoldHistogram.getValue(0) + rsHoldHistogram.getValue(1) + rsHoldHistogram.getValue(2)
-                               + rsHoldHistogram.getValue(3));
+        Assert.assertEquals(1, rsHoldHistogram.getSum());
     }
 
     static class MyMockPreparedStatement extends MockPreparedStatement {

src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java

@@ -0,0 +1,88 @@
+package com.alibaba.druid.bvt.filter;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.mock.MockConnection;
+import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.mock.MockPreparedStatement;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.JdbcSqlStat;
+import com.alibaba.druid.util.Histogram;
+import com.alibaba.druid.util.JdbcUtils;
+
+public class StatFilterExecuteTest extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setFilters("stat");
+        dataSource.setTestOnBorrow(false);
+
+        MockDriver driver = new MockDriver() {
+
+            public MockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) {
+                return new MyMockPreparedStatement(conn, sql);
+            }
+        };
+
+        dataSource.setDriver(driver);
+
+        dataSource.init();
+    }
+
+    protected void tearDown() throws Exception {
+        JdbcUtils.close(dataSource);
+    }
+
+    public void test_stat() throws Exception {
+
+        Assert.assertTrue(dataSource.isInited());
+        final String sql = "update x";
+        
+        Connection conn = dataSource.getConnection();
+
+        PreparedStatement stmt = conn.prepareStatement(sql);
+        
+        Assert.assertEquals(0, dataSource.getDataSourceStat().getSqlStat(sql).getExecuteAndResultHoldTimeHistogram().getSum());
+        
+        boolean firstResult = stmt.execute();
+        Assert.assertFalse(firstResult);
+
+        stmt.close();
+
+        conn.close();
+
+        JdbcSqlStat sqlStat = dataSource.getDataSourceStat().getSqlStat(sql);
+
+        Histogram histogram = sqlStat.getHistogram();
+        Assert.assertEquals(1, histogram.getSum());
+
+        Histogram rsHoldHistogram = sqlStat.getExecuteAndResultHoldTimeHistogram();
+
+        Assert.assertEquals(1, rsHoldHistogram.getSum());
+    }
+
+    static class MyMockPreparedStatement extends MockPreparedStatement {
+
+        public MyMockPreparedStatement(MockConnection conn, String sql){
+            super(conn, sql);
+        }
+
+        public boolean execute() throws SQLException {
+            return false;
+        }
+
+        public int getUpdateCount() throws SQLException {
+            return 100;
+        }
+    }
+}