Skip to content

HBASE-28388 Avoid index based field sorting in tablesorter #6779

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

Merged
NihalJain merged 1 commit into from
Mar 12, 2025
Merged

HBASE-28388 Avoid index based field sorting in tablesorter #6779

Show file tree
Hide file tree
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
26 changes: 7 additions & 19 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,41 +493,29 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
});
$("#baseStatsTable").tablesorter({
headers: {
1: {sorter: 'dateTime'},
4: {sorter: 'separator'},
5: {sorter: 'separator'}
'.cls_dateTime': {sorter: 'dateTime'},
'.cls_separator': {sorter: 'separator'}
}
});
$("#memoryStatsTable").tablesorter({
headers: {
1: {sorter: 'filesize'},
2: {sorter: 'filesize'},
3: {sorter: 'filesize'}
'.cls_filesize': {sorter: 'filesize'}
}
});
$("#requestStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'},
3: {sorter: 'separator'},
4: {sorter: 'separator'}
'.cls_separator': {sorter: 'separator'}
}
});
$("#storeStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'},
3: {sorter: 'filesize'},
4: {sorter: 'filesize'},
5: {sorter: 'filesize'},
6: {sorter: 'filesize'}
'.cls_separator': {sorter: 'separator'},
'.cls_filesize': {sorter: 'filesize'}
}
});
$("#compactionStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'},
3: {sorter: 'separator'}
'.cls_separator': {sorter: 'separator'}
}
});

Expand Down
38 changes: 19 additions & 19 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ Arrays.sort(serverNames);
<tr>
<th>ServerName</th>
<th>State</th>
<th>Start time</th>
<th class="cls_dateTime">Start time</th>
<th>Last contact</th>
<th>Version</th>
<th>Requests Per Second</th>
<th>Num. Regions</th>
<th class="cls_separator">Requests Per Second</th>
<th class="cls_separator">Num. Regions</th>
<%if !master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null %>
<%if RSGroupUtil.isRSGroupEnabled(master.getConfiguration()) %>
<th style="vertical-align: middle;" rowspan="2">RSGroup</th>
Expand Down Expand Up @@ -199,9 +199,9 @@ Arrays.sort(serverNames);
<thead>
<tr>
<th>ServerName</th>
<th>Used Heap</th>
<th>Max Heap</th>
<th>Memstore Size</th>
<th class="cls_filesize">Used Heap</th>
<th class="cls_filesize">Max Heap</th>
<th class="cls_filesize">Memstore Size</th>

</tr>
</thead>
Expand Down Expand Up @@ -261,10 +261,10 @@ for (ServerName serverName: serverNames) {
<thead>
<tr>
<th>ServerName</th>
<th>Request Per Second</th>
<th>Read Request Count</th>
<th>Filtered Read Request Count</th>
<th>Write Request Count</th>
<th class="cls_separator">Request Per Second</th>
<th class="cls_separator">Read Request Count</th>
<th class="cls_separator">Filtered Read Request Count</th>
<th class="cls_separator">Write Request Count</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -310,12 +310,12 @@ if (sl != null) {
<thead>
<tr>
<th>ServerName</th>
<th>Num. Stores</th>
<th>Num. Storefiles</th>
<th>Storefile Size Uncompressed</th>
<th>Storefile Size</th>
<th>Index Size</th>
<th>Bloom Size</th>
<th class="cls_separator">Num. Stores</th>
<th class="cls_separator">Num. Storefiles</th>
<th class="cls_filesize">Storefile Size Uncompressed</th>
<th class="cls_filesize">Storefile Size</th>
<th class="cls_filesize">Index Size</th>
<th class="cls_filesize">Bloom Size</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -390,9 +390,9 @@ for (ServerName serverName: serverNames) {
<thead>
<tr>
<th>ServerName</th>
<th>Num. Compacting Cells</th>
<th>Num. Compacted Cells</th>
<th>Remaining Cells</th>
<th class="cls_separator">Num. Compacting Cells</th>
<th class="cls_separator">Num. Compacted Cells</th>
<th class="cls_separator">Remaining Cells</th>
<th>Compaction Progress</th>
</tr>
</thead>
Expand Down
21 changes: 7 additions & 14 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,36 +298,29 @@ $(document).ready(function()

$("#baseStatsTable").tablesorter({
headers: {
1: {empty: 'emptyMin'},
2: {empty: 'emptyMax'}
'.cls_emptyMin': {empty: 'emptyMin'},
'.cls_emptyMax': {empty: 'emptyMax'}
}
});
$("#requestStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'},
3: {sorter: 'separator'}
'.cls_separator': {sorter: 'separator'}
}
});
$("#storeStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'},
3: {sorter: 'filesize'},
4: {sorter: 'filesize'},
5: {sorter: 'filesize'},
6: {sorter: 'filesize'}
'.cls_separator': {sorter: 'separator'},
'.cls_filesize': {sorter: 'filesize'}
}
});
$("#compactionStatsTable").tablesorter({
headers: {
1: {sorter: 'separator'},
2: {sorter: 'separator'}
'.cls_separator': {sorter: 'separator'}
}
});
$("#memstoreStatsTable").tablesorter({
headers: {
1: {sorter: 'filesize'}
'.cls_filesize': {sorter: 'filesize'}
}
});
}
Expand Down
28 changes: 14 additions & 14 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
<thead>
<tr>
<th>Region Name</th>
<th>Start Key</th>
<th>End Key</th>
<th class="cls_emptyMin">Start Key</th>
<th class="cls_emptyMax">End Key</th>
<th>ReplicaID</th>
</tr>
</thead>
Expand Down Expand Up @@ -129,9 +129,9 @@
<thead>
<tr>
<th>Region Name</th>
<th>Read Request Count</th>
<th>Filtered Read Request Count</th>
<th>Write Request Count</th>
<th class="cls_separator">Read Request Count</th>
<th class="cls_separator">Filtered Read Request Count</th>
<th class="cls_separator">Write Request Count</th>
</tr>
</thead>

Expand Down Expand Up @@ -165,12 +165,12 @@
<thead>
<tr>
<th>Region Name</th>
<th>Num. Stores</th>
<th>Num. Storefiles</th>
<th>Storefile Size Uncompressed</th>
<th>Storefile Size</th>
<th>Index Size</th>
<th>Bloom Size</th>
<th class="cls_separator">Num. Stores</th>
<th class="cls_separator">Num. Storefiles</th>
<th class="cls_filesize">Storefile Size Uncompressed</th>
<th class="cls_filesize">Storefile Size</th>
<th class="cls_filesize">Index Size</th>
<th class="cls_filesize">Bloom Size</th>
<th>Data Locality</th>
<th>Len Of Biggest Cell</th>
<th>% Cached</th>
Expand Down Expand Up @@ -256,8 +256,8 @@
<thead>
<tr>
<th>Region Name</th>
<th>Num. Compacting Cells</th>
<th>Num. Compacted Cells</th>
<th class="cls_separator">Num. Compacting Cells</th>
<th class="cls_separator">Num. Compacted Cells</th>
<th>Compaction Progress</th>
<th data-date-format="yyyymmdd hhmm zz">Last Major Compaction</th>
</tr>
Expand Down Expand Up @@ -305,7 +305,7 @@
<thead>
<tr>
<th>Region Name</th>
<th>Memstore Size</th>
<th class="cls_filesize">Memstore Size</th>
</tr>
</thead>

Expand Down
Loading