show-caches: Make output more concise

Instead of showing 12 lines of output per cache, we now show only one,
with the important information packed into a small ASCII table.

  Name               Max |Object Count        |  AvgGet  |Hit Ratio     |
                     Age |  Disk    Mem    Cnt|          |Disk Mem  Agg |
-------------------------+--------------------+----------+--------------+
  accounts           90d |                   6|   0.2ms  |           76%|
  accounts_byemail   90d |                    |          |              |
D diff               90d |    57            57|          |              |
  groups             90d |                    |          |              |
  projects           90d |                   4|          |           95%|
  sshkeys            90d |                   1|          |           75%|
D web_sessions       12h |     3      1      4|          |  0% 100% 100%|

Change-Id: I829ed062e8687a1128924bde4115f2086bad81eb
Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java

@@ -43,35 +43,63 @@ final class AdminShowCaches extends CacheCommand {
   private void display() {
     p = toPrintWriter(out);
 
+    p.print(String.format(//
+        "%1s %-18s %-4s|%-20s|  %-5s  |%-14s|\n" //
+        , "" //
+        , "Name" //
+        , "Max" //
+        , "Object Count" //
+        , "AvgGet" //
+        , "Hit Ratio" //
+    ));
+    p.print(String.format(//
+        "%1s %-18s %-4s|%6s %6s %6s|  %-5s   |%-4s %-4s %-4s|\n" //
+        , "" //
+        , "" //
+        , "Age" //
+        , "Disk" //
+        , "Mem" //
+        , "Cnt" //
+        , "" //
+        , "Disk" //
+        , "Mem" //
+        , "Agg" //
+    ));
+    p.println("------------------"
+        + "-------+--------------------+----------+--------------+");
     for (final Ehcache cache : getAllCaches()) {
       final CacheConfiguration cfg = cache.getCacheConfiguration();
       final boolean useDisk = cfg.isDiskPersistent() || cfg.isOverflowToDisk();
       final Statistics stat = cache.getStatistics();
-
-      p.print("cache \"" + cache.getName() + "\"");
-      if (useDisk) {
-        p.print(" (memory, disk)");
-      }
-      p.println(":");
-      fItemCount("items", stat.getObjectCount());
-      if (useDisk) {
-        fItemCount("items.memory", stat.getMemoryStoreObjectCount());
-        fItemCount("items.disk", stat.getDiskStoreObjectCount());
-      }
-      fItemCount("evictions", stat.getEvictionCount());
-
       final long total = stat.getCacheHits() + stat.getCacheMisses();
-      fTimeInterval("ttl.idle", cfg.getTimeToIdleSeconds());
-      fTimeInterval("ttl.live", cfg.getTimeToLiveSeconds());
-      fMilliseconds("avg.get", stat.getAverageGetTime());
-      fPercent("hit%", stat.getCacheHits(), total);
-      if (useDisk) {
-        fPercent("hit%.memory", stat.getInMemoryHits(), total);
-        fPercent("hit%.disk", stat.getOnDiskHits(), total);
-      }
 
-      p.println();
+      if (useDisk) {
+        p.print(String.format(//
+            "D %-18s %-4s|%6s %6s %6s| %7s  |%4s %4s %4s|\n" //
+            , cache.getName() //
+            , interval(cfg.getTimeToLiveSeconds()) //
+            , count(stat.getDiskStoreObjectCount()) //
+            , count(stat.getMemoryStoreObjectCount()) //
+            , count(stat.getObjectCount()) //
+            , duration(stat.getAverageGetTime()) //
+            , percent(stat.getOnDiskHits(), total) //
+            , percent(stat.getInMemoryHits(), total) //
+            , percent(stat.getCacheHits(), total) //
+            ));
+      } else {
+        p.print(String.format(//
+            "  %-18s %-4s|%6s %6s %6s| %7s  |%4s %4s %4s|\n" //
+            , cache.getName() //
+            , interval(cfg.getTimeToLiveSeconds()) //
+            , "", "" //
+            , count(stat.getObjectCount()) //
+            , duration(stat.getAverageGetTime()) //
+            , "", "" //
+            , percent(stat.getCacheHits(), total) //
+            ));
+      }
     }
+    p.println();
 
     final Runtime r = Runtime.getRuntime();
     final long mMax = r.maxMemory();
@@ -116,30 +144,60 @@ final class AdminShowCaches extends CacheCommand {
     p.println(String.format("  %1$-12s: %2$6.2f %3$s", name, value, suffix));
   }
 
-  private void fMilliseconds(final String name, final float ms) {
+  private String count(long cnt) {
-    p.println(String.format("  %1$-12s: %2$6.2f ms", name, ms));
+    if (cnt == 0) {
+      return "";
+    }
+    return String.format("%6d", cnt);
   }
 
-  private void fTimeInterval(final String name, double ttl) {
+  private String duration(double ms) {
+    if (Math.abs(ms) <= 0.05) {
+      return "";
+    }
+    String suffix = "ms";
+    if (ms >= 1000) {
+      ms /= 1000;
+      suffix = "s ";
+    }
+    return String.format("%4.1f%s", ms, suffix);
+  }
+
+  private String interval(double ttl) {
     if (ttl == 0) {
-      p.println(String.format("  %1$-12s:        inf", name));
+      return "inf";
-      return;
     }
 
-    String suffix = "secs";
+    String suffix = "s";
     if (ttl >= 60) {
       ttl /= 60;
-      suffix = "mins";
+      suffix = "m";
+
+      if (ttl >= 60) {
+        ttl /= 60;
+        suffix = "h";
+      }
+
+      if (ttl >= 24) {
+        ttl /= 24;
+        suffix = "d";
+
+        if (ttl >= 365) {
+          ttl /= 365;
+          suffix = "y";
+        }
+      }
     }
-    if (ttl >= 60) {
+
-      ttl /= 60;
+    return Integer.toString((int) ttl) + suffix;
-      suffix = "hrs";
+  }
+
+  private String percent(final long value, final long total) {
+    if (total <= 0) {
+      return "";
     }
-    if (ttl >= 24) {
+    final long pcent = (100 * value) / total;
-      ttl /= 24;
+    return String.format("%3d%%", (int) pcent);
-      suffix = "days";
-    }
-    p.println(String.format("  %1$-12s: %2$6.2f %3$s", name, ttl, suffix));
   }
 
   private void fPercent(final String name, final long value, final long total) {