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 5a8ed9eaf5..7e6086e4dc 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -613,7 +613,8 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { } public final JdbcSqlStat createSqlStat(StatementProxy statement, String sql) { - JdbcSqlStat sqlStat = dataSourceStat.getSqlStatMap().get(sql); + final ConcurrentMap sqlStatMap = dataSourceStat.getSqlStatMap(); + JdbcSqlStat sqlStat = sqlStatMap.get(sql); if (sqlStat == null) { JdbcSqlStat newSqlStat = new JdbcSqlStat(sql); if (dataSourceStat.getSqlStatMap().putIfAbsent(sql, newSqlStat) == null) { @@ -659,7 +660,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { } public JdbcSqlStat getSqlStat(long id) { - return dataSourceStat.getSqlCounter(id); + return dataSourceStat.getSqlStat(id); } @Override diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java index ed0e5bac9b..d79addb6b3 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java @@ -84,14 +84,10 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { return url; } - public JdbcSqlStat getSqlCounter(String sql) { + public JdbcSqlStat getSqlStat(String sql) { return this.sqlStatMap.get(sql); } - public ConcurrentMap getSqlStatisticMap() { - return this.sqlStatMap; - } - @Override public TabularData getSqlList() throws JMException { CompositeType rowType = JdbcSqlStat.getCompositeType(); @@ -107,7 +103,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { return data; } - public static StatFilter getCounterFilter(DataSourceProxy dataSource) { + public static StatFilter getStatFilter(DataSourceProxy dataSource) { for (Filter filter : dataSource.getFilters()) { if (filter instanceof StatFilter) { return (StatFilter) filter; @@ -117,7 +113,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { return null; } - public JdbcSqlStat getSqlCounter(long id) { + public JdbcSqlStat getSqlStat(long id) { for (Map.Entry entry : this.sqlStatMap.entrySet()) { if (entry.getValue().getId() == id) { return entry.getValue(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java index 1d02e5585d..25a0640196 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java @@ -116,7 +116,7 @@ public class JdbcStatManager implements JdbcStatManagerMBean { TabularData data = new TabularDataSupport(tabularType); for (JdbcDataSourceStat dataSource : dataSources.values()) { - ConcurrentMap statMap = dataSource.getSqlStatisticMap(); + ConcurrentMap statMap = dataSource.getSqlStatMap(); for (Map.Entry entry : statMap.entrySet()) { data.put(entry.getValue().getCompositeData()); }