Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-23208 Unit formatting in Master & RS UI 

Signed-off-by: binlijin <binlijin@gmail.com>
Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit 257ccad31c)
(cherry picked from commit fe23e3fd5b)
This commit is contained in:
Karthik Palanisamy 2019-10-23 15:14:01 -07:00 committed by Sean Busbey
parent 54e46d2e1b
commit 090780c5bd
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/util/StringUtils.java
View File

@ -28,7 +28,7 @@ public final class StringUtils {
public static String humanTimeDiff(long timeDiff) { public static String humanTimeDiff(long timeDiff) {
if (timeDiff < 1000) { if (timeDiff < 1000) {
return String.format("%dmsec", timeDiff); return String.format("%d msec", timeDiff);
} }
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
@ -40,26 +40,38 @@ public final class StringUtils {
if (hours != 0){ if (hours != 0){
buf.append(hours); buf.append(hours);
buf.append("hrs, "); buf.append(" hrs, ");
} }
if (minutes != 0){ if (minutes != 0){
buf.append(minutes); buf.append(minutes);
buf.append("mins, "); buf.append(" mins, ");
} }
if (hours > 0 || minutes > 0) { if (hours > 0 || minutes > 0) {
buf.append(seconds); buf.append(seconds);
buf.append("sec"); buf.append(" sec");
} else { } else {
buf.append(String.format("%.4fsec", seconds)); buf.append(String.format("%.4f sec", seconds));
} }
return buf.toString(); return buf.toString();
} }
public static String humanSize(double size) { public static String humanSize(double size) {
if (size >= (1L << 40)) return String.format("%.1fT", size / (1L << 40)); if (size >= (1L << 40)) {
if (size >= (1L << 30)) return String.format("%.1fG", size / (1L << 30)); return String.format("%.1f T", size / (1L << 40));
if (size >= (1L << 20)) return String.format("%.1fM", size / (1L << 20)); }
if (size >= (1L << 10)) return String.format("%.1fK", size / (1L << 10));
if (size >= (1L << 30)) {
return String.format("%.1f G", size / (1L << 30));
}
if (size >= (1L << 20)) {
return String.format("%.1f M", size / (1L << 20));
}
if (size >= (1L << 10)) {
return String.format("%.1f K", size / (1L << 10));
}
return String.format("%.0f", size); return String.format("%.0f", size);
} }