diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index 8d48a6a511..17233e80ba 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -116,8 +116,13 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { public void setMergeSql(boolean mergeSql) { this.mergeSql = mergeSql; } - + + @Deprecated public String mergeSql(String sql) { + return this.mergeSql(sql, dbType); + } + + public String mergeSql(String sql, String dbType) { if (!mergeSql) { return sql; } @@ -125,7 +130,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { try { sql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); } catch (Exception e) { - LOG.error("merge sql error", e); + LOG.error("merge sql error, dbType " + dbType + ", sql : \n" + sql, e); } return sql; @@ -612,14 +617,21 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { } public JdbcSqlStat createSqlStat(StatementProxy statement, String sql) { - JdbcDataSourceStat dataSourceStat = statement.getConnectionProxy().getDirectDataSource().getDataSourceStat(); + DataSourceProxy dataSource = statement.getConnectionProxy().getDirectDataSource(); + JdbcDataSourceStat dataSourceStat = dataSource.getDataSourceStat(); JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); String contextSql = context != null ? context.getSql() : null; if (contextSql != null && contextSql.length() > 0) { return dataSourceStat.createSqlStat(contextSql); } else { - sql = mergeSql(sql); + String dbType = this.dbType; + + if (dbType == null) { + dbType = dataSource.getDbType(); + } + + sql = mergeSql(sql, dbType); return dataSourceStat.createSqlStat(sql); } } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index 42fe1aa40d..41913aa546 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -360,10 +360,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) { diff --git a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java index af419f5ee2..65b7311901 100644 --- a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java +++ b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java @@ -140,7 +140,7 @@ public class WebStatFilter implements Filter { if (uriStat == null) { int status = responseWrapper.getStatus(); if (status == HttpServletResponse.SC_NOT_FOUND) { - String errorUrl = contextPath + "/error_" + status; + String errorUrl = contextPath + "error_" + status; uriStat = webAppStat.getURIStat(errorUrl, true); } else { uriStat = webAppStat.getURIStat(requestURI, true); diff --git a/src/main/java/com/alibaba/druid/util/Histogram.java b/src/main/java/com/alibaba/druid/util/Histogram.java index ed8fa0b57e..50fe849461 100644 --- a/src/main/java/com/alibaba/druid/util/Histogram.java +++ b/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('['); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java index 38c5afbffd..0d999604a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java +++ b/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 { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java new file mode 100644 index 0000000000..d53bf05dc1 --- /dev/null +++ b/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; + } + } +}