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

删除多余代码

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@208 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-05-28 07:33:19 +00:00
parent e560fdba9b
commit 2b1c21d27e
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+3 -2
View File
@@ -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<String, JdbcSqlStat> 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
src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
+3 -7
View File
@@ -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<String, JdbcSqlStat> 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<String, JdbcSqlStat> entry : this.sqlStatMap.entrySet()) {
if (entry.getValue().getId() == id) {
return entry.getValue();
src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
TabularData data = new TabularDataSupport(tabularType);
for (JdbcDataSourceStat dataSource : dataSources.values()) {
ConcurrentMap<String, JdbcSqlStat> statMap = dataSource.getSqlStatisticMap();
ConcurrentMap<String, JdbcSqlStat> statMap = dataSource.getSqlStatMap();
for (Map.Entry<String, JdbcSqlStat> entry : statMap.entrySet()) {
data.put(entry.getValue().getCompositeData());
}