Skip to content

HBASE-24704 Make the Table Schema easier to view even there are multi… #2185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bsglz wants to merge 1 commit into from
Closed

HBASE-24704 Make the Table Schema easier to view even there are multi… #2185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 31 additions & 23 deletions hbase-server/src/main/resources/hbase-webapps/master/table.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import="java.util.List"
import="java.util.LinkedHashMap"
import="java.util.Map"
import="java.util.Set"
import="java.util.HashSet"
import="java.util.Collections"
import="java.util.Collection"
import="org.apache.commons.lang.StringEscapeUtils"
Expand All @@ -45,6 +47,7 @@
import="org.apache.hadoop.hbase.zookeeper.MetaTableLocator"
import="org.apache.hadoop.hbase.util.Bytes"
import="org.apache.hadoop.hbase.util.FSUtils"
import="org.apache.hadoop.hbase.io.ImmutableBytesWritable"
import="org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest"
import="org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState"
import="org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos"
Expand Down Expand Up @@ -417,40 +420,45 @@ if ( fqtn != null ) {
</table>
<h2>Table Schema</h2>
<table class="table table-striped">
<%
Collection<HColumnDescriptor> families = table.getTableDescriptor().getFamilies();
Set<ImmutableBytesWritable> familyKeySet = new HashSet<>();
for (HColumnDescriptor family: families) {
familyKeySet.addAll(family.getValues().keySet());
}
%>
<tr>
<th>Column Family Name</th>
<th></th>
</tr>
<%
Collection<HColumnDescriptor> families = table.getTableDescriptor().getFamilies();
<th>Property \ Column Family Name</th>
<%
for (HColumnDescriptor family: families) {
%>
<tr>
<td><%= StringEscapeUtils.escapeHtml(family.getNameAsString()) %></td>
<td>
<table class="table table-striped">
<tr>
<th>Property</th>
<th>Value</th>
</tr>
%>
<th>
<%= StringEscapeUtils.escapeHtml(family.getNameAsString()) %>
</th>
<% } %>
</tr>
<%
Map<ImmutableBytesWritable, ImmutableBytesWritable> familyValues = family.getValues();
for (ImmutableBytesWritable familyKey: familyValues.keySet()) {
final ImmutableBytesWritable familyValue = familyValues.get(familyKey);
for (ImmutableBytesWritable familyKey: familyKeySet) {
%>
<tr>
<td>
<%= StringEscapeUtils.escapeHtml(Bytes.toString(familyKey.get(), familyKey.getOffset(), familyKey.getLength())) %>
</td>
</td>
<%
for (HColumnDescriptor family: families) {
String familyValueStr = "-";
Map<ImmutableBytesWritable, ImmutableBytesWritable> familyValues = family.getValues();
if(familyValues.containsKey(familyKey)){
final ImmutableBytesWritable familyValue = familyValues.get(familyKey);
familyValueStr = Bytes.toString(familyValue.get(), familyValue.getOffset(), familyValue.getLength());
}
%>
<td>
<%= StringEscapeUtils.escapeHtml(Bytes.toString(familyValue.get(), familyValue.getOffset(), familyValue.getLength())) %>
<%= StringEscapeUtils.escapeHtml(familyValueStr) %>
</td>
<% } %>
</tr>
<% } %>
</table>
</td>
</tr>
<% } %>
</table>
<%
long totalReadReq = 0;
Expand Down