Skip to content

Commit 0136b98

Browse files
daisukebewchevreuil
daisukebe
authored and
wchevreuil
committed
HBASE-22543 Revisit HBASE-21207 to make all values fully sortable
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
1 parent 989e09a commit 0136b98

File tree

5 files changed

+185
-30
lines changed

5 files changed

+185
-30
lines changed

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,77 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
404404
<script>
405405
$(document).ready(function()
406406
{
407-
$("#baseStatsTable").tablesorter();
408-
$("#memoryStatsTable").tablesorter();
409-
$("#requestStatsTable").tablesorter();
410-
$("#storeStatsTable").tablesorter();
411-
$("#compactionStatsTable").tablesorter();
407+
$.tablesorter.addParser(
408+
{
409+
id: 'filesize',
410+
is: function(s) {
411+
return s.match(new RegExp( /([\.0-9]+)\ (B|KB|MB|GB|TB)/ ));
412+
},
413+
format: function(s) {
414+
var suf = s.match(new RegExp( /(KB|B|GB|MB|TB)$/ ))[1];
415+
var num = parseFloat(s.match( new RegExp( /([\.0-9]+)\ (B|KB|MB|GB|TB)/ ))[0]);
416+
switch(suf) {
417+
case 'B':
418+
return num;
419+
case 'KB':
420+
return num * 1024;
421+
case 'MB':
422+
return num * 1024 * 1024;
423+
case 'GB':
424+
return num * 1024 * 1024 * 1024;
425+
case 'TB':
426+
return num * 1024 * 1024 * 1024 * 1024;
427+
}
428+
},
429+
type: 'numeric'
430+
});
431+
$.tablesorter.addParser(
432+
{
433+
id: "separator",
434+
is: function (s) {
435+
return /^[0-9]?[0-9,]*$/.test(s);
436+
}, format: function (s) {
437+
return $.tablesorter.formatFloat( s.replace(/,/g,'') );
438+
}, type: "numeric"
439+
});
440+
$("#baseStatsTable").tablesorter({
441+
headers: {
442+
4: {sorter: 'separator'},
443+
5: {sorter: 'separator'}
444+
}
445+
});
446+
$("#memoryStatsTable").tablesorter({
447+
headers: {
448+
1: {sorter: 'filesize'},
449+
2: {sorter: 'filesize'},
450+
3: {sorter: 'filesize'}
451+
}
452+
});
453+
$("#requestStatsTable").tablesorter({
454+
headers: {
455+
1: {sorter: 'separator'},
456+
2: {sorter: 'separator'},
457+
3: {sorter: 'separator'},
458+
4: {sorter: 'separator'}
459+
}
460+
});
461+
$("#storeStatsTable").tablesorter({
462+
headers: {
463+
1: {sorter: 'separator'},
464+
2: {sorter: 'separator'},
465+
3: {sorter: 'filesize'},
466+
4: {sorter: 'filesize'},
467+
5: {sorter: 'filesize'},
468+
6: {sorter: 'filesize'}
469+
}
470+
});
471+
$("#compactionStatsTable").tablesorter({
472+
headers: {
473+
1: {sorter: 'separator'},
474+
2: {sorter: 'separator'},
475+
3: {sorter: 'separator'}
476+
}
477+
});
412478

413479
$("#userTables").tablesorter();
414480
}

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ Arrays.sort(serverNames);
125125
<td><% new Date(startcode) %></td>
126126
<td><% TraditionalBinaryPrefix.long2String(lastContact, "s", 1) %></td>
127127
<td><% version %></td>
128-
<td><% String.format("%.0f", requestsPerSecond) %></td>
129-
<td><% numRegionsOnline %></td>
128+
<td><% String.format("%,.0f", requestsPerSecond) %></td>
129+
<td><% String.format("%,d", numRegionsOnline) %></td>
130130
</tr>
131131
<%java>
132132
}
@@ -225,10 +225,10 @@ if (sl != null) {
225225
</%java>
226226
<tr>
227227
<td><& serverNameLink; serverName=serverName; &></td>
228-
<td><% sl.getRequestCountPerSecond() %></td>
229-
<td><% readRequestCount %></td>
230-
<td><% filteredReadRequestCount %></td>
231-
<td><% writeRequestCount %></td>
228+
<td><% String.format("%,d", sl.getRequestCountPerSecond()) %></td>
229+
<td><% String.format("%,d", readRequestCount) %></td>
230+
<td><% String.format("%,d", filteredReadRequestCount) %></td>
231+
<td><% String.format("%,d", writeRequestCount) %></td>
232232
</tr>
233233
<%java>
234234
} else {
@@ -282,8 +282,8 @@ if (sl != null) {
282282
</%java>
283283
<tr>
284284
<td><& serverNameLink; serverName=serverName; &></td>
285-
<td><% storeCount %></td>
286-
<td><% storeFileCount %></td>
285+
<td><% String.format("%,d", storeCount) %></td>
286+
<td><% String.format("%,d", storeFileCount) %></td>
287287
<td><% TraditionalBinaryPrefix.long2String(
288288
storeUncompressedSizeMB * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td>
289289
<td><% TraditionalBinaryPrefix.long2String(storeFileSizeMB
@@ -339,9 +339,9 @@ if (totalCompactingCells > 0) {
339339
</%java>
340340
<tr>
341341
<td><& serverNameLink; serverName=serverName; &></td>
342-
<td><% totalCompactingCells %></td>
343-
<td><% totalCompactedCells %></td>
344-
<td><% totalCompactingCells - totalCompactedCells %></td>
342+
<td><% String.format("%,d", totalCompactingCells) %></td>
343+
<td><% String.format("%,d", totalCompactedCells) %></td>
344+
<td><% String.format("%,d", totalCompactingCells - totalCompactedCells) %></td>
345345
<td><% percentDone %></td>
346346
</tr>
347347
<%java>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,47 @@ $(document).ready(function()
270270
},
271271
type: 'numeric'
272272
});
273+
$.tablesorter.addParser(
274+
{
275+
id: "separator",
276+
is: function (s) {
277+
return /^[0-9]?[0-9,]*$/.test(s);
278+
},
279+
format: function (s) {
280+
return $.tablesorter.formatFloat( s.replace(/,/g,'') );
281+
},
282+
type: "numeric"
283+
});
284+
273285
$("#baseStatsTable").tablesorter();
274-
$("#requestStatsTable").tablesorter();
275-
$("#storeStatsTable").tablesorter();
276-
$("#compactionStatsTable").tablesorter();
277-
$("#memstoreStatsTable").tablesorter();
286+
$("#requestStatsTable").tablesorter({
287+
headers: {
288+
1: {sorter: 'separator'},
289+
2: {sorter: 'separator'},
290+
3: {sorter: 'separator'}
291+
}
292+
});
293+
$("#storeStatsTable").tablesorter({
294+
headers: {
295+
1: {sorter: 'separator'},
296+
2: {sorter: 'separator'},
297+
3: {sorter: 'filesize'},
298+
4: {sorter: 'filesize'},
299+
5: {sorter: 'filesize'},
300+
6: {sorter: 'filesize'}
301+
}
302+
});
303+
$("#compactionStatsTable").tablesorter({
304+
headers: {
305+
1: {sorter: 'separator'},
306+
2: {sorter: 'separator'}
307+
}
308+
});
309+
$("#memstoreStatsTable").tablesorter({
310+
headers: {
311+
1: {sorter: 'filesize'}
312+
}
313+
});
278314
}
279315
);
280316
</script>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@
142142
</%java>
143143
<td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
144144
<%if load != null %>
145-
<td><% load.getReadRequestsCount() %></td>
146-
<td><% load.getFilteredReadRequestsCount() %></td>
147-
<td><% load.getWriteRequestsCount() %></td>
145+
<td><% String.format("%,1d", load.getReadRequestsCount()) %></td>
146+
<td><% String.format("%,1d", load.getFilteredReadRequestsCount()) %></td>
147+
<td><% String.format("%,1d", load.getWriteRequestsCount()) %></td>
148148
</%if>
149149
</tr>
150150
</%for>
@@ -182,8 +182,8 @@
182182
</%java>
183183
<td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
184184
<%if load != null %>
185-
<td><% load.getStores() %></td>
186-
<td><% load.getStorefiles() %></td>
185+
<td><% String.format("%,1d", load.getStores()) %></td>
186+
<td><% String.format("%,1d", load.getStorefiles()) %></td>
187187
<td><% TraditionalBinaryPrefix.long2String(load.getStoreUncompressedSizeMB()
188188
* TraditionalBinaryPrefix.MEGA.value, "B", 1)%></td>
189189
<td><% TraditionalBinaryPrefix.long2String(load.getStorefileSizeMB()
@@ -239,8 +239,8 @@
239239
</%java>
240240
<td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
241241
<%if load != null %>
242-
<td><% load.getTotalCompactingKVs() %></td>
243-
<td><% load.getCurrentCompactedKVs() %></td>
242+
<td><% String.format("%,1d", load.getTotalCompactingKVs()) %></td>
243+
<td><% String.format("%,1d", load.getCurrentCompactedKVs()) %></td>
244244
<td><% percentDone %></td>
245245
<td><% compactTime %></td>
246246
</%if>

‎hbase-server/src/main/resources/hbase-webapps/master/table.jsp

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,62 @@ Actions:
726726
<script>
727727
$(document).ready(function()
728728
{
729-
$("#regionServerTable").tablesorter();
730-
$("#regionServerDetailsTable").tablesorter();
731-
$("#tableRegionTable").tablesorter();
729+
$.tablesorter.addParser(
730+
{
731+
id: 'filesize',
732+
is: function(s) {
733+
return s.match(new RegExp( /([\.0-9]+)\ (B|KB|MB|GB|TB)/ ));
734+
},
735+
format: function(s) {
736+
var suf = s.match(new RegExp( /(B|KB|MB|GB|TB)$/ ))[1];
737+
var num = parseFloat(s.match( new RegExp( /([\.0-9]+)\ (B|KB|MB|GB|TB)/ ))[0]);
738+
switch(suf) {
739+
case 'B':
740+
return num;
741+
case 'KB':
742+
return num * 1024;
743+
case 'MB':
744+
return num * 1024 * 1024;
745+
case 'GB':
746+
return num * 1024 * 1024 * 1024;
747+
case 'TB':
748+
return num * 1024 * 1024 * 1024 * 1024;
749+
}
750+
},
751+
type: 'numeric'
752+
});
753+
$.tablesorter.addParser(
754+
{
755+
id: "separator",
756+
is: function (s) {
757+
return /^[0-9]?[0-9,]*$/.test(s);
758+
}, format: function (s) {
759+
return $.tablesorter.formatFloat( s.replace(/,/g,'') );
760+
}, type: "numeric"
761+
});
762+
$("#regionServerTable").tablesorter({
763+
headers: {
764+
1: {sorter: 'separator'}
765+
}
766+
});
767+
$("#regionServerDetailsTable").tablesorter({
768+
headers: {
769+
2: {sorter: 'separator'},
770+
3: {sorter: 'separator'},
771+
4: {sorter: 'filesize'},
772+
5: {sorter: 'separator'},
773+
6: {sorter: 'filesize'}
774+
}
775+
});
776+
$("#tableRegionTable").tablesorter({
777+
headers: {
778+
2: {sorter: 'separator'},
779+
3: {sorter: 'separator'},
780+
4: {sorter: 'filesize'},
781+
5: {sorter: 'separator'},
782+
6: {sorter: 'filesize'}
783+
}
784+
});
732785
}
733786
);
734787
</script>

0 commit comments

Comments
 (0)