Author: stack
Date: Mon Jul 27 17:19:29 2009
New Revision: 798224
URL: http://svn.apache.org/viewvc?rev=798224&view=rev
Log:
HBASE-1692 Web UI is extremely slow / freezes up if you have many tables
Removed:
hadoop/hbase/trunk/src/webapps/static/jquery.treeview.css
hadoop/hbase/trunk/src/webapps/static/scripts/jquery-1.3.1.min.js
hadoop/hbase/trunk/src/webapps/static/scripts/jquery.cookie.js
hadoop/hbase/trunk/src/webapps/static/scripts/jquery.treeview.pack.js
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/webapps/master/master.jsp
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=798224&r1=798223&r2=798224&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Jul 27 17:19:29 2009
@@ -287,6 +287,9 @@
HBASE-1693 NPE close_region ".META." in shell
HBASE-1706 META row with missing HRI breaks UI
HBASE-1709 Thrift getRowWithColumns doesn't accept column-family only
+ (Mathias Lehmann via Stack)
+ HBASE-1692 Web UI is extremely slow / freezes up if you have many tables
+
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk/src/webapps/master/master.jsp
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/master/master.jsp?rev=798224&r1=798223&r2=798224&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/master/master.jsp (original)
+++ hadoop/hbase/trunk/src/webapps/master/master.jsp Mon Jul 27 17:19:29 2009
@@ -30,19 +30,6 @@
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<title>HBase Master: <%= master.getMasterAddress().getHostname()%>:<%=
master.getMasterAddress().getPort() %></title>
<link rel="stylesheet" type="text/css" href="/static/hbase.css" />
-<link rel="stylesheet" type="text/css" href="/static/jquery.treeview.css" />
-<script src="/static/scripts/jquery-1.3.1.min.js"
type="text/javascript"></script>
-<script src="/static/scripts/jquery.cookie.js" type="text/javascript"></script>
-<script src="/static/scripts/jquery.treeview.pack.js"
type="text/javascript"></script>
-<script>
-$(document).ready(function(){
- $("#tables").treeview({
- control: "#tablecontrol",
- persist: "cookie"
- });
-});</script>
-</head>
-
<body>
<a id="logo" href="http://wiki.apache.org/lucene-hadoop/Hbase";><img
src="/static/hbase_logo_med.gif" alt="HBase Logo" title="HBase Logo" /></a>
@@ -80,56 +67,12 @@
<h2>User Tables</h2>
<% HTableDescriptor[] tables = new HBaseAdmin(conf).listTables();
if(tables != null && tables.length > 0) { %>
-<div id="tablecontrol">
- <a title="Collapse the entire tree below" href="#"><img
src="/static/images/minus.gif" /> Collapse All</a>
- <a title="Expand the entire tree below" href="#"><img
src="/static/images/plus.gif" /> Expand All</a>
- <a style="display: none" title="Toggle the tree below, opening closed
branches, closing open branches" href="#"> Toggle All </a>
-</div>
-<br/>
-<ul id="tables">
-<% for(HTableDescriptor htDesc : tables) { %>
-<li class="closed"><span> <a href="/table.jsp?name=<%=
htDesc.getNameAsString() %>"><%= htDesc.getNameAsString() %></a></span>
-<ul>
-<li><span> Parameters</span>
-<ul>
-<% Map<ImmutableBytesWritable, ImmutableBytesWritable> vals =
htDesc.getValues();
- if (vals.size() > 0) {
- for (Map.Entry<ImmutableBytesWritable, ImmutableBytesWritable> e:
vals.entrySet()) { %>
-<li> <%= Bytes.toString(e.getKey().get()).toLowerCase() %>: <%=
Bytes.toString(e.getValue().get()).toLowerCase() %> </li>
-<% }
- } else { %>
-<li> none</li>
-<% } %>
-</ul>
-</li>
-
-<li><span> Families</span>
-<ul>
-<% Collection<HColumnDescriptor> cols = htDesc.getFamilies();
- if (cols.size() > 0) {
- for (HColumnDescriptor hcd: htDesc.getFamilies()) { %>
-<li><span> Name: <%= hcd.getNameAsString() %> </span>
-<ul>
-<% for (Map.Entry<ImmutableBytesWritable, ImmutableBytesWritable> e:
hcd.getValues().entrySet()) { %>
-<li> <%= Bytes.toString(e.getKey().get()).toLowerCase() %>: <%=
Bytes.toString(e.getValue().get()).toLowerCase() %> </li>
-<% } %>
-</ul>
-<% } %>
-</li>
-<% } else { %>
-<li> none</li>
-<% }%>
-</ul>
-</li>
-
-</ul>
-</li>
-
-
+<table>
+<tr><th>Table</th><th>Description</th></tr>
+<% for(HTableDescriptor htDesc : tables ) { %>
+<tr><td><a href=/table.jsp?name=<%= htDesc.getNameAsString() %>><%=
htDesc.getNameAsString() %></a> </td><td><%= htDesc.toString() %></td></tr>
<% } %>
-</ul>
-
<p> <%= tables.length %> table(s) in set.</p>
</table>
<% } %>
