HBASE-21207 Add client side sorting functionality in master web UI for table and region server details
Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/eeb7dd7c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/eeb7dd7c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/eeb7dd7c Branch: refs/heads/branch-1.4 Commit: eeb7dd7cf7207d63b4ed9c8ba4ebea5773aa60a2 Parents: 80802cb Author: Archana Katiyar <archanak.au...@gmail.com> Authored: Fri Sep 21 21:04:53 2018 +0530 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Sep 28 15:39:34 2018 -0700 ---------------------------------------------------------------------- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 20 +- .../tmpl/master/RegionServerListTmpl.jamon | 30 ++- .../resources/hbase-webapps/master/table.jsp | 235 ++----------------- .../resources/hbase-webapps/static/css/asc.gif | Bin 0 -> 54 bytes .../resources/hbase-webapps/static/css/bg.gif | Bin 0 -> 64 bytes .../resources/hbase-webapps/static/css/desc.gif | Bin 0 -> 54 bytes .../hbase-webapps/static/css/hbase.css | 16 +- .../static/js/jquery.tablesorter.min.js | 4 + pom.xml | 1 + 9 files changed, 88 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 408471a..efff6f7 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -356,8 +356,22 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); </div> <!-- /container --> <script src="/static/js/jquery.min.js" type="text/javascript"></script> + <script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script> <script src="/static/js/bootstrap.min.js" type="text/javascript"></script> <script src="/static/js/tab.js" type="text/javascript"></script> + <script> + $(document).ready(function() + { + $("#baseStatsTable").tablesorter(); + $("#memoryStatsTable").tablesorter(); + $("#requestStatsTable").tablesorter(); + $("#storeStatsTable").tablesorter(); + $("#compactionStatsTable").tablesorter(); + + $("#userTables").tablesorter(); + } + ); + </script> </body> </html> @@ -420,7 +434,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); } </%java> <%if (tables != null && tables.length > 0)%> -<table class="table table-striped"> +<table id="userTables" class="tablesorter table table-striped"> +<thead> <tr> <th>Namespace</th> <th>Table Name</th> @@ -434,6 +449,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <th>Other Regions</th> <th>Description</th> </tr> +</thead> +<tbody> <%for HTableDescriptor htDesc : tables%> <%java> TableName tableName = htDesc.getTableName(); @@ -469,6 +486,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); </tr> </%for> <p><% tables.length %> table(s) in set. [<a href=tablesDetailed.jsp>Details</a>]</p> +</tbody> </table> </%if> </%def> http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index 451cfa4..29c0f77 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -77,7 +77,8 @@ Arrays.sort(serverNames); <%args> ServerName [] serverNames; </%args> -<table class="table table-striped"> +<table id="baseStatsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>ServerName</th> <th>Start time</th> @@ -86,6 +87,8 @@ Arrays.sort(serverNames); <th>Requests Per Second</th> <th>Num. Regions</th> </tr> +</thead> +<tbody> <%java> int totalRegions = 0; int totalRequests = 0; @@ -124,6 +127,7 @@ Arrays.sort(serverNames); <%java> } </%java> +</tbody> <tr><td>Total:<% servers.size() %></td> <td></td> <td></td> @@ -142,7 +146,8 @@ Arrays.sort(serverNames); <%args> ServerName [] serverNames; </%args> -<table class="table table-striped"> +<table id="memoryStatsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>ServerName</th> <th>Used Heap</th> @@ -150,6 +155,8 @@ Arrays.sort(serverNames); <th>Memstore Size</th> </tr> +</thead> +<tbody> <%java> for (ServerName serverName: serverNames) { @@ -174,6 +181,7 @@ for (ServerName serverName: serverNames) { } } </%java> +</tbody> </table> </%def> @@ -182,13 +190,16 @@ for (ServerName serverName: serverNames) { <%args> ServerName [] serverNames; </%args> -<table class="table table-striped"> +<table id="requestStatsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>ServerName</th> <th>Request Per Second</th> <th>Read Request Count</th> <th>Write Request Count</th> </tr> +</thead> +<tbody> <%java> for (ServerName serverName: serverNames) { @@ -209,6 +220,7 @@ if (sl != null) { } } </%java> +</tbody> </table> </%def> @@ -217,7 +229,8 @@ if (sl != null) { <%args> ServerName [] serverNames; </%args> -<table class="table table-striped"> +<table id="storeStatsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>ServerName</th> <th>Num. Stores</th> @@ -227,6 +240,8 @@ if (sl != null) { <th>Index Size</th> <th>Bloom Size</th> </tr> +</thead> +<tbody> <%java> for (ServerName serverName: serverNames) { @@ -254,6 +269,7 @@ if (sl != null) { } } </%java> +</tbody> </table> </%def> @@ -261,7 +277,8 @@ if (sl != null) { <%args> ServerName [] serverNames; </%args> -<table class="table table-striped"> +<table id="compactionStatsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>ServerName</th> <th>Num. Compacting KVs</th> @@ -269,6 +286,8 @@ if (sl != null) { <th>Remaining KVs</th> <th>Compaction Progress</th> </tr> +</thead> +<tbody> <%java> for (ServerName serverName: serverNames) { @@ -295,6 +314,7 @@ if (sl.getTotalCompactingKVs() > 0) { } } </%java> +</tbody> </table> </%def> http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index 2d77e57..dd39247 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -28,7 +28,6 @@ import="java.util.LinkedHashMap" import="java.util.Map" import="java.util.Collections" - import="java.util.Comparator" import="java.util.Collection" import="org.apache.commons.lang.StringEscapeUtils" import="org.apache.hadoop.conf.Configuration" @@ -60,11 +59,6 @@ MetaTableLocator metaTableLocator = new MetaTableLocator(); String fqtn = request.getParameter("name"); final String escaped_fqtn = StringEscapeUtils.escapeHtml(fqtn); - String sortKey = request.getParameter("sort"); - String reverse = request.getParameter("reverse"); - final boolean reverseOrder = (reverse==null||!reverse.equals("false")); - String showWholeKey = request.getParameter("showwhole"); - final boolean showWhole = (showWholeKey!=null && showWholeKey.equals("true")); HTable table = null; String tableHeader; boolean withReplica = false; @@ -164,10 +158,10 @@ if ( fqtn != null ) { table = new HTable(conf, fqtn); if (table.getTableDescriptor().getRegionReplication() > 1) { - tableHeader = "<h2>Table Regions</h2><table class=\"table table-striped\" style=\"table-layout: fixed; word-wrap: break-word;\"><tr><th>Name</th><th>Region Server</th><th>ReadRequests</th><th>WriteRequests</th><th>StorefileSize</th><th>Num.Storefiles</th><th>MemSize</th><th>Locality</th><th>Start Key</th><th>End Key</th><th>ReplicaID</th></tr>"; + tableHeader = "<h2>Table Regions</h2><table id=\"tableRegionTable\" class=\"tablesorter table table-striped\" style=\"table-layout: fixed; word-wrap: break-word;\"><thead><tr>Name</th><th>Region Server</th>Start Key</th>End Key</th><th>Locality</th><th>Requests</th><th>ReplicaID</th></tr></thead>"; withReplica = true; } else { - tableHeader = "<h2>Table Regions</h2><table class=\"table table-striped\" style=\"table-layout: fixed; word-wrap: break-word;\"><tr><th>Name</th><th>Region Server</th><th>ReadRequests</th><th>WriteRequests</th><th>StorefileSize</th><th>Num.Storefiles</th><th>MemSize</th><th>Locality</th><th>Start Key</th><th>End Key</th></tr>"; + tableHeader = "<h2>Table Regions</h2><table id=\"tableRegionTable\" class=\"tablesorter table table-striped\" style=\"table-layout: fixed; word-wrap: break-word;\"><thead><tr>Name</th><th>Region Server</th>Start Key</th>End Key</th><th>Locality</th><th>Requests</th></tr></thead>"; } if ( !readOnly && action != null ) { %> @@ -219,6 +213,7 @@ if ( fqtn != null ) { if(fqtn.equals(TableName.META_TABLE_NAME.getNameAsString())) { %> <%= tableHeader %> +<tbody> <% // NOTE: Presumes meta with one or more replicas for (int j = 0; j < numMetaReplicas; j++) { @@ -279,6 +274,7 @@ if ( fqtn != null ) { </tr> <% } %> <%} %> +</tbody> </table> <%} else { Admin admin = master.getConnection().getAdmin(); @@ -407,22 +403,8 @@ if ( fqtn != null ) { if(regions != null && regions.size() > 0) { %> <h2>Table Regions</h2> -Sort As -<select id="sel" style="margin-right: 10px"> -<option value="regionName">RegionName</option> -<option value="readrequest">ReadRequest</option> -<option value="writerequest">WriteRequest</option> -<option value="size">StorefileSize</option> -<option value="filecount">Num.Storefiles</option> -<option value="memstore">MemstoreSize</option> -<option value="locality">Locality</option> -</select> -Ascending<input type="checkbox" id="ascending" value="Ascending" style="margin-right:10px"> -ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin-right:10px"> -<input type="button" id="submit" value="Reorder" onClick="reloadAsSort()" style="font-size: 12pt; width: 5em; margin-bottom: 5px" class="btn"> -<p> - -<table class="table table-striped"> +<table id="regionServerDetailsTable" class="tablesorter table table-striped"> +<thead> <tr> <th>Name(<%= String.format("%,1d", regions.size())%>)</th> <th>Region Server</th> @@ -441,161 +423,12 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- <% } %> +</thead> </tr> +<tbody> <% List<Map.Entry<HRegionInfo, RegionLoad>> entryList = new ArrayList<Map.Entry<HRegionInfo, RegionLoad>>(regionsToLoad.entrySet()); - if(sortKey != null) { - if (sortKey.equals("readrequest")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue() == null) { - return -1; - } else if (entry2 == null || entry2.getValue() == null) { - return 1; - } - int result = 0; - if (entry1.getValue().getReadRequestsCount() < entry2.getValue().getReadRequestsCount()) { - result = -1; - } else if (entry1.getValue().getReadRequestsCount() > entry2.getValue().getReadRequestsCount()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } else if (sortKey.equals("writerequest")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue() == null) { - return -1; - } else if (entry2 == null || entry2.getValue() == null) { - return 1; - } - int result = 0; - if (entry1.getValue().getWriteRequestsCount() < entry2.getValue() - .getWriteRequestsCount()) { - result = -1; - } else if (entry1.getValue().getWriteRequestsCount() > entry2.getValue() - .getWriteRequestsCount()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } else if (sortKey.equals("size")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue() == null) { - return -1; - } else if (entry2 == null || entry2.getValue() == null) { - return 1; - } - int result = 0; - if (entry1.getValue().getStorefileSizeMB() < entry2.getValue() - .getStorefileSizeMB()) { - result = -1; - } else if (entry1.getValue().getStorefileSizeMB() > entry2 - .getValue().getStorefileSizeMB()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } else if (sortKey.equals("filecount")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue() == null) { - return -1; - } else if (entry2 == null || entry2.getValue() == null) { - return 1; - } - int result = 0; - if (entry1.getValue().getStorefiles() < entry2.getValue() - .getStorefiles()) { - result = -1; - } else if (entry1.getValue().getStorefiles() > entry2.getValue() - .getStorefiles()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } else if (sortKey.equals("memstore")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue()==null) { - return -1; - } else if (entry2 == null || entry2.getValue()==null) { - return 1; - } - int result = 0; - if (entry1.getValue().getMemStoreSizeMB() < entry2.getValue() - .getMemStoreSizeMB()) { - result = -1; - } else if (entry1.getValue().getMemStoreSizeMB() > entry2 - .getValue().getMemStoreSizeMB()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } else if (sortKey.equals("locality")) { - Collections.sort(entryList, - new Comparator<Map.Entry<HRegionInfo, RegionLoad>>() { - public int compare( - Map.Entry<HRegionInfo, RegionLoad> entry1, - Map.Entry<HRegionInfo, RegionLoad> entry2) { - if (entry1 == null || entry1.getValue()==null) { - return -1; - } else if (entry2 == null || entry2.getValue()==null) { - return 1; - } - int result = 0; - if (entry1.getValue().getDataLocality() < entry2.getValue() - .getDataLocality()) { - result = -1; - } else if (entry1.getValue().getDataLocality() > entry2 - .getValue().getDataLocality()) { - result = 1; - } - if (reverseOrder) { - result = -1 * result; - } - return result; - } - }); - } - } numRegions = regions.size(); int numRegionsRendered = 0; // render all regions @@ -641,7 +474,7 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- numRegionsRendered++; %> <tr> - <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getRegionName()):regionInfo.getEncodedName()) %></td> + <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %></td> <% if (urlRegionServer != null) { %> @@ -661,8 +494,8 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- <td><%= fileCount%></td> <td><%= memSize%></td> <td><%= locality%></td> - <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getStartKey()):"-")%></td> - <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getEndKey()):"-")%></td> + <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%></td> + <td><%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%></td> <% if (withReplica) { %> @@ -673,6 +506,7 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- </tr> <% } %> <% } %> +</tbody> </table> <% if (numRegions > numRegionsRendered) { String allRegionsUrl = "?name=" + URLEncoder.encode(fqtn,"UTF-8") + "&numRegions=all"; @@ -685,11 +519,12 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- <% if (withReplica) { %> -<table class="table table-striped"><tr><th>Region Server</th><th>Region Count</th><th>Primary Region Count</th></tr> +<table id="regionServerTable" class="tablesorter table table-striped"><thead><tr><th>Region Server</th><th>Region Count</th><th>Primary Region Count</th></tr><thead> <% } else { %> -<table class="table table-striped"><tr><th>Region Server</th><th>Region Count</th></tr> +<table id="regionServerTable" class="tablesorter table table-striped"><thead><tr><th>Region Server</th><th>Region Count</th></tr></thead> +<tbody> <% } %> @@ -710,6 +545,7 @@ if (withReplica) { %> </tr> <% } %> +</tbody> </table> <% } } catch(Exception ex) { @@ -803,41 +639,18 @@ Actions: </div> <% } %> <script src="/static/js/jquery.min.js" type="text/javascript"></script> +<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script> <script src="/static/js/bootstrap.min.js" type="text/javascript"></script> </body> </html> <script> -var index=0; -var sortKeyValue='<%= StringEscapeUtils.escapeJavaScript(sortKey) %>'; -if(sortKeyValue=="readrequest")index=1; -else if(sortKeyValue=="writerequest")index=2; -else if(sortKeyValue=="size")index=3; -else if(sortKeyValue=="filecount")index=4; -else if(sortKeyValue=="memstore")index=5; -else if(sortKeyValue=="locality")index=6; -document.getElementById("sel").selectedIndex=index; - -<% // turned into a boolean when we pulled it out of the request. %> -var reverse='<%= reverseOrder %>'; -if(reverse=='false')document.getElementById("ascending").checked=true; - -<% // turned into a boolean when we pulled it out of the request. %> -var showWhole='<%= showWhole %>'; -if(showWhole=='true')document.getElementById("showWhole").checked=true; - -function reloadAsSort(){ - var url="?name="+'<%= fqtn != null ? URLEncoder.encode(fqtn) : "" %>'; - if(document.getElementById("sel").selectedIndex>0){ - url=url+"&sort="+document.getElementById("sel").value; - } - if(document.getElementById("ascending").checked){ - url=url+"&reverse=false"; - } - if(document.getElementById("showWhole").checked){ - url=url+"&showwhole=true"; - } - location.href=url; -} +$(document).ready(function() + { + $("#regionServerTable").tablesorter(); + $("#regionServerDetailsTable").tablesorter(); + $("#tableRegionTable").tablesorter(); + } +); </script> http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/static/css/asc.gif ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/asc.gif b/hbase-server/src/main/resources/hbase-webapps/static/css/asc.gif new file mode 100644 index 0000000..7415786 Binary files /dev/null and b/hbase-server/src/main/resources/hbase-webapps/static/css/asc.gif differ http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/static/css/bg.gif ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/bg.gif b/hbase-server/src/main/resources/hbase-webapps/static/css/bg.gif new file mode 100644 index 0000000..fac668f Binary files /dev/null and b/hbase-server/src/main/resources/hbase-webapps/static/css/bg.gif differ http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/static/css/desc.gif ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/desc.gif b/hbase-server/src/main/resources/hbase-webapps/static/css/desc.gif new file mode 100644 index 0000000..3b30b3c Binary files /dev/null and b/hbase-server/src/main/resources/hbase-webapps/static/css/desc.gif differ http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css index 03d8ff4..2169c23 100644 --- a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css +++ b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css @@ -39,4 +39,18 @@ section { margin-bottom: 3em; } margin-top: 1.2em; } -/* Region Server page styling */ \ No newline at end of file +/* Region Server page styling */ + +/* sortable tables styling */ +table.tablesorter thead tr .header { + background-image: url(bg.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; +} +table.tablesorter thead tr .headerSortUp { + background-image: url(asc.gif); +} +table.tablesorter thead tr .headerSortDown { + background-image: url(desc.gif); +} http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js b/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js new file mode 100755 index 0000000..ad84db6 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.tablesorter.min.js @@ -0,0 +1,4 @@ +/*! jQuery jquery.com | jquery.org/license */ +(function($){$.extend({tablesorter:new +function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata ()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}f unction trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" row s:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){ benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1 +var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHead erOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){ var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0 ;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(typ e=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this, $document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count ++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache );}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}} );$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[ã$ââ¬?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[ã$ââ¬]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}el se if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.confi g.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/eeb7dd7c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f4e7dcd..3662ae9 100644 --- a/pom.xml +++ b/pom.xml @@ -747,6 +747,7 @@ <exclude>**/src/main/asciidoc/hbase.css</exclude> <!-- MIT http://jquery.org/license --> <exclude>**/jquery.min.js</exclude> + <exclude>*/jquery.tablesorter.min.js</exclude> <!-- vector graphics --> <exclude>**/*.vm</exclude> <!-- apache doxia generated -->
