Skip to content

Commit e000912

Browse files
committed
HBASE-29223 Applied changes which were done on master in the meantime
- HBASE-28388 Avoid index based field sorting in tablesorter apache#6779 - HBASE-27802 Manage static javascript resources programatically apache#6864
1 parent 453316c commit e000912

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

hbase-server/src/main/resources/hbase-webapps/master/regionServerList_baseStats.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
<tr>
4040
<th>ServerName</th>
4141
<th>State</th>
42-
<th>Start time</th>
42+
<th class="cls_dateTime">Start time</th>
4343
<th>Last contact</th>
4444
<th>Version</th>
45-
<th>Requests Per Second</th>
46-
<th>Num. Regions</th>
45+
<th class="cls_separator">Requests Per Second</th>
46+
<th class="cls_separator">Num. Regions</th>
4747
<% if (!master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null) { %>
4848
<% if (RSGroupUtil.isRSGroupEnabled(master.getConfiguration())) { %>
4949
<th style="vertical-align: middle;" rowspan="2">RSGroup</th>

hbase-server/src/main/resources/hbase-webapps/master/regionServerList_compactionStats.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<thead>
3535
<tr>
3636
<th>ServerName</th>
37-
<th>Num. Compacting Cells</th>
38-
<th>Num. Compacted Cells</th>
39-
<th>Remaining Cells</th>
37+
<th class="cls_separator">Num. Compacting Cells</th>
38+
<th class="cls_separator">Num. Compacted Cells</th>
39+
<th class="cls_separator">Remaining Cells</th>
4040
<th>Compaction Progress</th>
4141
</tr>
4242
</thead>

hbase-server/src/main/resources/hbase-webapps/master/regionServerList_memoryStats.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<thead>
3737
<tr>
3838
<th>ServerName</th>
39-
<th>Used Heap</th>
40-
<th>Max Heap</th>
41-
<th>Memstore Size</th>
39+
<th class="cls_filesize">Used Heap</th>
40+
<th class="cls_filesize">Max Heap</th>
41+
<th class="cls_filesize">Memstore Size</th>
4242

4343
</tr>
4444
</thead>

hbase-server/src/main/resources/hbase-webapps/master/regionServerList_requestStats.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<thead>
3535
<tr>
3636
<th>ServerName</th>
37-
<th>Request Per Second</th>
38-
<th>Read Request Count</th>
39-
<th>Filtered Read Request Count</th>
40-
<th>Write Request Count</th>
37+
<th class="cls_separator">Request Per Second</th>
38+
<th class="cls_separator">Read Request Count</th>
39+
<th class="cls_separator">Filtered Read Request Count</th>
40+
<th class="cls_separator">Write Request Count</th>
4141
</tr>
4242
</thead>
4343
<tbody>

hbase-server/src/main/resources/hbase-webapps/master/regionServerList_storeStats.jsp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
<thead>
3636
<tr>
3737
<th>ServerName</th>
38-
<th>Num. Stores</th>
39-
<th>Num. Storefiles</th>
40-
<th>Storefile Size Uncompressed</th>
41-
<th>Storefile Size</th>
42-
<th>Index Size</th>
43-
<th>Bloom Size</th>
38+
<th class="cls_separator">Num. Stores</th>
39+
<th class="cls_separator">Num. Storefiles</th>
40+
<th class="cls_filesize">Storefile Size Uncompressed</th>
41+
<th class="cls_filesize">Storefile Size</th>
42+
<th class="cls_filesize">Index Size</th>
43+
<th class="cls_filesize">Bloom Size</th>
4444
</tr>
4545
</thead>
4646
<tbody>

hbase-server/src/main/resources/hbase-webapps/master/regionVisualizer.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
--%>
2020

21-
<script type="text/javascript" src="/static/js/vega@5.32.0.min.js"></script>
22-
<script type="text/javascript" src="/static/js/vega-lite@5.23.0.min.js"></script>
23-
<script type="text/javascript" src="/static/js/vega-embed@6.29.0.min.js"></script>
21+
<script type="text/javascript" src="/static/js/vega.min.js"></script>
22+
<script type="text/javascript" src="/static/js/vega-lite.min.js"></script>
23+
<script type="text/javascript" src="/static/js/vega-embed.min.js"></script>
2424

2525
<div id="vis" style="width:80%;"></div>
2626
<script type="text/javascript">

0 commit comments

Comments
 (0)