Repository: hbase Updated Branches: refs/heads/master f5351e2db -> b14fb1488
Revert "HBASE-16677 Add table size (total store file size) to table page" This reverts commit f5351e2dbd29ab32dbd4044844feb6a94d9fea98. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b14fb148 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b14fb148 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b14fb148 Branch: refs/heads/master Commit: b14fb14886686d3135f718ff7e067230ff7d62fc Parents: f5351e2 Author: chenheng <chenh...@apache.org> Authored: Sun Sep 25 10:47:20 2016 +0800 Committer: chenheng <chenh...@apache.org> Committed: Sun Sep 25 10:47:20 2016 +0800 ---------------------------------------------------------------------- .../resources/hbase-webapps/master/table.jsp | 50 +------------------- 1 file changed, 1 insertion(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b14fb148/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 86b70c7..27388e7 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -73,25 +73,6 @@ } String action = request.getParameter("action"); String key = request.getParameter("key"); - long totalStoreFileSizeMB = 0; - - final String numRegionsParam = request.getParameter("numRegions"); - // By default, the page render up to 10000 regions to improve the page load time - int numRegionsToRender = 10000; - if (numRegionsParam != null) { - // either 'all' or a number - if (numRegionsParam.equals("all")) { - numRegionsToRender = -1; - } else { - try { - numRegionsToRender = Integer.parseInt(numRegionsParam); - } catch (NumberFormatException ex) { - // ignore - } - } - } - int numRegions = 0; - %> <!--[if IE]> <!DOCTYPE html> @@ -361,7 +342,6 @@ if ( fqtn != null ) { totalSize += regionload.getStorefileSizeMB(); totalStoreFileCount += regionload.getStorefiles(); totalMemSize += regionload.getMemStoreSizeMB(); - totalStoreFileSizeMB += regionload.getStorefileSizeMB(); } else { RegionLoad load0 = new RegionLoad(ClusterStatusProtos.RegionLoad.newBuilder().setRegionSpecifier(HBaseProtos.RegionSpecifier.newBuilder().setValue(ByteString.copyFrom(regionInfo.getRegionName())).build()).build()); regionsToLoad.put(regionInfo, load0); @@ -567,12 +547,7 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- }); } } - numRegions = regions.size(); - int numRegionsRendered = 0; - // render all regions - if (numRegionsToRender < 0) { - numRegionsToRender = numRegions; - } + for (Map.Entry<HRegionInfo, RegionLoad> hriEntry : entryList) { HRegionInfo regionInfo = hriEntry.getKey(); ServerName addr = regionsToServer.get(regionInfo); @@ -608,8 +583,6 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- } } } - if (numRegionsRendered < numRegionsToRender) { - numRegionsRendered++; %> <tr> <td><%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getRegionName()):regionInfo.getEncodedName()) %></td> @@ -643,15 +616,7 @@ ShowDetailName&Start/End Key<input type="checkbox" id="showWhole" style="margin- %> </tr> <% } %> -+<% } %> </table> -<% if (numRegions > numRegionsRendered) { - String allRegionsUrl = "?name=" + fqtn + "&numRegions=all"; -%> - <p>This table has <b><%= numRegions %></b> regions in total, in order to improve the page load time, - only <b><%= numRegionsRendered %></b> regions are displayed here, <a href="<%= allRegionsUrl %>">click - here</a> to see all regions.</p> -<% } %> <h2>Regions by Region Server</h2> <% if (withReplica) { @@ -691,19 +656,6 @@ if (withReplica) { } // end else %> -<h2>Table Stats</h2> -<table class="table table-striped"> - <tr> - <th>Name</th> - <th>Value</th> - <th>Description</th> - </tr> - <tr> - <td>Size</td> - <td><%= StringUtils.TraditionalBinaryPrefix.long2String(totalStoreFileSizeMB * 1024 * 1024, "B", 2)%></td> - <td>Total size of store files (in bytes)</td> - </tr> -</table> <% if (!readOnly) { %> <p><hr/></p>
