From 1d3427b8dc85b98c785285f480eb249894d26744 Mon Sep 17 00:00:00 2001
From: sand <sandzhangtoo@gmail.com>
Date: Thu, 2 Aug 2012 13:02:10 +0800
Subject: [PATCH] StatViewServlet:optimize description

---
 .../druid/support/http/StatViewServlet.java   |  4 ++--
 .../support/http/resources/js/datasource.js   |  8 ++++----
 .../resources/support/http/resources/sql.html | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

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, '<a href="activeConnectionStackTrace-' + datasource.Identity + '.html">View</a>');
@@ -80,7 +80,7 @@ function generateDataSourceDiv(datasource) {
 	listHtml += '<tr><td class="td_lable">WaitThreadCount</td><td id="DS-Info-WaitThreadCount' + datasourceId + '">&nbsp;</td><td>The current waiting thread count</td></tr>';
 
 	listHtml += '<tr><td class="td_lable">StartTransactionCount</td><td id="DS-Info-StartTransactionCount' + datasourceId + '">&nbsp;</td><td>The count of start transaction</td></tr>';
-	listHtml += '<tr><td class="td_lable">TransactionHistogramValues</td><td id="DS-Info-TransactionHistogramValues' + datasourceId + '">&nbsp;</td><td>The histogram values of start transaction</td></tr>';
+	listHtml += '<tr><td class="td_lable">TransactionHistogram</td><td id="DS-Info-TransactionHistogram' + datasourceId + '">&nbsp;</td><td>The histogram values of transaction time, [0-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]</td></tr>';
 
 	listHtml += '<tr><td class="td_lable">PoolingCount</td><td id="DS-Info-PoolingCount' + datasourceId + '">&nbsp;</td><td>The current usefull connection count</td></tr>';
 	listHtml += '<tr><td class="td_lable">PoolingPeak</td><td id="DS-Info-PoolingPeak' + datasourceId + '">&nbsp;</td><td>The usefull connection peak count</td></tr>';
@@ -102,7 +102,7 @@ function generateDataSourceDiv(datasource) {
 	listHtml += '<tr><td class="td_lable">PSCacheHitCount</td><td id="DS-Info-PSCacheHitCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement hit count</td></tr>';
 	listHtml += '<tr><td class="td_lable">PSCacheMissCount</td><td id="DS-Info-PSCacheMissCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement miss count</td></tr>';
 	
-	listHtml += '<tr><td class="td_lable">ConnectionHoldHistogram</td><td id="DS-Info-ConnectionHoldHistogram' + datasourceId + '">&nbsp;</td><td>The histogram values of connectionHold</td></tr>';
+	listHtml += '<tr><td class="td_lable">ConnectionHoldTimeHistogram</td><td id="DS-Info-ConnectionHoldTimeHistogram' + datasourceId + '">&nbsp;</td><td>The histogram values of connection hold time, [0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]</td></tr>';
 
 	listHtml += '<tr><td class="td_lable">ActiveConnection StackTrace</td><td id="DS-Info-ActiveConnectionStackTrace' + datasourceId + '">&nbsp;</td><td>StackTrace for active Connection. <a href="activeConnectionStackTrace-'
 			+ datasourceId + '.json" target="_blank">[View JSON API]</a></td></tr>';
diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index cdbac40866..a2515003be 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -38,11 +38,11 @@
 	                    	<a id="th-Histogram[0]" title="count of '0-1 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[0]');">-</a>
 	                    	<a id="th-Histogram[1]" title="count of '1-10 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[1]');">-</a>
 	                    	<a id="th-Histogram[2]" title="count of '10-100 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[2]');">-</a>
-	                    	<a id="th-Histogram[3]" title="count of '100-1000 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[3]');">-</a>
-	                    	<a id="th-Histogram[4]" title="count of '1000-10*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[4]');">-</a>
-	                    	<a id="th-Histogram[5]" title="count of '10*1000-100*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[5]');">-</a>
-	                    	<a id="th-Histogram[6]" title="count of '100*1000-1000*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[6]');">-</a>
-	                    	<a id="th-Histogram[7]" title="count of '> 1000*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('Histogram[7]');">-</a> ]
+	                    	<a id="th-Histogram[3]" title="count of '100ms-1 s'" href="javascript:void(0)" onclick="setOrderBy('Histogram[3]');">-</a>
+	                    	<a id="th-Histogram[4]" title="count of '1-10 s'" href="javascript:void(0)" onclick="setOrderBy('Histogram[4]');">-</a>
+	                    	<a id="th-Histogram[5]" title="count of '10-100 s'" href="javascript:void(0)" onclick="setOrderBy('Histogram[5]');">-</a>
+	                    	<a id="th-Histogram[6]" title="count of '100-1000 s'" href="javascript:void(0)" onclick="setOrderBy('Histogram[6]');">-</a>
+	                    	<a id="th-Histogram[7]" title="count of '> 1000 s'" href="javascript:void(0)" onclick="setOrderBy('Histogram[7]');">-</a> ]
 	                    </th>
 	                    <th id="th-FetchRowCountHistogram" class="td_lable" align="left" width="100">FetchRow <br />[ 
 	                    	<a id="th-FetchRowCountHistogram[0]" title="count of '0 FetchRow'" href="javascript:void(0)" onclick="setOrderBy('FetchRowCountHistogram[0]');">-</a>
@@ -64,11 +64,11 @@
 	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[0]" title="count of '0-1 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[0]');">-</a>
 	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[1]" title="count of '1-10 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[1]');">-</a>
 	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[2]" title="count of '10-100 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[2]');">-</a>
-	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[3]" title="count of '100-1000 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[3]');">-</a>
-	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[4]" title="count of '1000-10*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[4]');">-</a>
-	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[5]" title="count of '10*1000-100*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[5]');">-</a>
-	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[6]" title="count of '100*1000-1000*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[6]');">-</a>
-	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[7]" title="count of '> 1000*1000 ms'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[7]');">-</a> ]
+	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[3]" title="count of '100ms-1s'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[3]');">-</a>
+	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[4]" title="count of '1-10 s'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[4]');">-</a>
+	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[5]" title="count of '10-100 s'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[5]');">-</a>
+	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[6]" title="count of '100-1000 s'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[6]');">-</a>
+	                    	<a id="th-ExecuteAndResultHoldTimeHistogram[7]" title="count of '> 1000 s'" href="javascript:void(0)" onclick="setOrderBy('ExecuteAndResultHoldTimeHistogram[7]');">-</a> ]
 	                    </th>
                     </tr>
                 </thead>