[5/8] drill git commit: DRILL-2536: Display memory usage > 1KB ("-" otherwise)

[json]

DRILL-2536: Display memory usage > 1KB ("-" otherwise)


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/f71bf6b3
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/f71bf6b3
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/f71bf6b3

Branch: refs/heads/master
Commit: f71bf6b33339011687d9b0fd421d6bb5a3263714
Parents: efb4e70
Author: Sudheesh Katkam <skat...@maprtech.com>
Authored: Tue May 5 09:43:45 2015 -0700
Committer: Jason Altekruse <altekruseja...@gmail.com>
Committed: Thu May 7 10:06:23 2015 -0700

----------------------------------------------------------------------
 .../server/rest/profile/OperatorWrapper.java    |  2 +-
 .../exec/server/rest/profile/TableBuilder.java  | 26 ++++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/f71bf6b3/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java
----------------------------------------------------------------------
diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java
index 7a1d9b0..5ef56cc 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java
@@ -113,7 +113,7 @@ public class OperatorWrapper {
     tb.appendNanos(longWait.getLeft().getWaitNanos(), String.format(fmt, 
longWait.getRight()));
 
     final ImmutablePair<OperatorProfile, Integer> peakMem = 
Collections.max(ops, Comparators.opPeakMem);
-    tb.appendBytes((long) (memSum / ops.size()), null);
+    tb.appendBytes(Math.round(memSum / ops.size()), null);
     tb.appendBytes(peakMem.getLeft().getPeakLocalMemoryAllocated(), null);
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/f71bf6b3/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java
----------------------------------------------------------------------
diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java
index 7d3b322..8616820 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java
@@ -124,19 +124,29 @@ class TableBuilder {
     appendCell(bytePrint(l), link);
   }
 
-  private String bytePrint(final long size){
-    final double m = size/Math.pow(1024, 2);
-    final double g = size/Math.pow(1024, 3);
-    final double t = size/Math.pow(1024, 4);
+  private String bytePrint(final long size) {
+    final double t = size / Math.pow(1024, 4);
     if (t > 1) {
       return dec.format(t).concat("TB");
-    } else if (g > 1) {
+    }
+
+    final double g = size / Math.pow(1024, 3);
+    if (g > 1) {
       return dec.format(g).concat("GB");
-    } else if (m > 1){
+    }
+
+    final double m = size / Math.pow(1024, 2);
+    if (m > 1) {
       return intformat.format(m).concat("MB");
-    } else {
-      return "-";
     }
+
+    final double k = size / 1024;
+    if (k >= 1) {
+      return intformat.format(k).concat("KB");
+    }
+
+    // size < 1 KB
+    return "-";
   }
 
   @Override