svn commit: r961013 - /cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java

[jb...@apache.org]

Author: jbellis
Date: Tue Jul  6 20:48:23 2010
New Revision: 961013

URL: http://svn.apache.org/viewvc?rev=961013&view=rev
Log:
add commas, percentages to compaction log messages.  patch by Jon Hermes; reviewed by jbellis for CASSANDRA-1251

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=961013&r1=961012&r2=961013&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue Jul  6 20:48:23 2010
@@ -362,9 +362,12 @@ public class CompactionManager implement
         cfs.replaceCompactedSSTables(sstables, Arrays.asList(ssTable));
         submitMinorIfNeeded(cfs);
 
-        String format = "Compacted to %s.  %d/%d bytes for %d keys.  Time: %dms.";
+        String format = "Compacted to %s.  %,d to %,d (~%d%% of original) bytes for %,d keys.  Time: %,dms.";
         long dTime = System.currentTimeMillis() - startTime;
-        logger.info(String.format(format, writer.getFilename(), SSTable.getTotalBytes(sstables), ssTable.length(), totalkeysWritten, dTime));
+        long startsize = SSTable.getTotalBytes(sstables);
+        long endsize = ssTable.length();
+        double ratio = (double)endsize / (double)startsize;
+        logger.info(String.format(format, writer.getFilename(), startsize, endsize, (int) (ratio * 100), totalkeysWritten, dTime));
         return sstables.size();
     }
 
@@ -444,9 +447,13 @@ public class CompactionManager implement
         if (writer != null)
         {
             results.add(writer.closeAndOpenReader(getMaxDataAge(sstables)));
-            String format = "AntiCompacted to %s.  %d/%d bytes for %d keys.  Time: %dms.";
+
+            String format = "AntiCompacted to %s.  %,d to %,d (~%d%% of original) bytes for %,d keys.  Time: %,dms.";
             long dTime = System.currentTimeMillis() - startTime;
-            logger.info(String.format(format, writer.getFilename(), SSTable.getTotalBytes(sstables), results.get(0).length(), totalkeysWritten, dTime));
+            long startsize = SSTable.getTotalBytes(sstables);
+            long endsize = results.get(0).length();
+            double ratio = (double)endsize / (double)startsize;
+            logger.info(String.format(format, writer.getFilename(), startsize, endsize, (int)(ratio*100), totalkeysWritten, dTime));
         }
 
         return results;