diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index dabb6f2b12..7ec576ec40 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -402,9 +402,9 @@ public class StatViewServlet extends HttpServlet { dataMap.put("PSCacheMissCount", dataSource.getCachedPreparedStatementMissCount()); dataMap.put("StartTransactionCount", dataSource.getStartTransactionCount()); - dataMap.put("TransactionHistogramValues", dataSource.getTransactionHistogramValues()); + dataMap.put("TransactionHistogram", dataSource.getTransactionHistogramValues()); - dataMap.put("ConnectionHoldHistogram", dataSource.getDataSourceStat().getConnectionHoldHistogram().toArray()); + dataMap.put("ConnectionHoldTimeHistogram", dataSource.getDataSourceStat().getConnectionHoldHistogram().toArray()); dataMap.put("RemoveAbandoned", dataSource.isRemoveAbandoned()); return dataMap; diff --git a/src/main/resources/support/http/resources/js/datasource.js b/src/main/resources/support/http/resources/js/datasource.js index ba500ab7f5..6b936ca11f 100644 --- a/src/main/resources/support/http/resources/js/datasource.js +++ b/src/main/resources/support/http/resources/js/datasource.js @@ -25,7 +25,7 @@ function fillDataSourceInfo(datasource) { changeInnerHtml("DS-Info-WaitThreadCount" + datasource.Identity, datasource.WaitThreadCount); changeInnerHtml("DS-Info-StartTransactionCount" + datasource.Identity, datasource.StartTransactionCount); - changeInnerHtml("DS-Info-TransactionHistogramValues" + datasource.Identity, '[' + datasource.TransactionHistogramValues + ']'); + changeInnerHtml("DS-Info-TransactionHistogram" + datasource.Identity, '[' + datasource.TransactionHistogram + ']'); changeInnerHtml("DS-Info-PoolingCount" + datasource.Identity, datasource.PoolingCount); changeInnerHtml("DS-Info-PoolingPeak" + datasource.Identity, datasource.PoolingPeak); @@ -47,7 +47,7 @@ function fillDataSourceInfo(datasource) { changeInnerHtml("DS-Info-PSCacheHitCount" + datasource.Identity, datasource.PSCacheHitCount); changeInnerHtml("DS-Info-PSCacheMissCount" + datasource.Identity, datasource.PSCacheMissCount); - changeInnerHtml("DS-Info-ConnectionHoldHistogram" + datasource.Identity, '[' + datasource.ConnectionHoldHistogram + ']'); + changeInnerHtml("DS-Info-ConnectionHoldTimeHistogram" + datasource.Identity, '[' + datasource.ConnectionHoldTimeHistogram + ']'); if (datasource.RemoveAbandoned == true) changeInnerHtml("DS-Info-ActiveConnectionStackTrace" + datasource.Identity, 'View'); @@ -80,7 +80,7 @@ function generateDataSourceDiv(datasource) { listHtml += '