cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [01/11] git commit: rows,columns -> partitions,cells
Date Sat, 02 Nov 2013 14:11:14 GMT
Updated Branches:
  refs/heads/cassandra-2.0 579eb2295 -> c0ba85a40
  refs/heads/trunk 1fe9a112c -> bb95c1dd0


rows,columns -> partitions,cells


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

Branch: refs/heads/cassandra-2.0
Commit: 84b47c89a1520f41bdf2cb1e0da8ec18a1cbfd21
Parents: 579eb22
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Nov 1 19:43:08 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Nov 1 20:02:46 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/Memtable.java                  | 2 +-
 src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b47c89/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 12d36bf..3bb8c1e 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -446,7 +446,7 @@ public class Memtable
                 else
                     cfs.liveRatio = (cfs.liveRatio + newRatio) / 2.0;
 
-                logger.info("{} liveRatio is {} (just-counted was {}).  calculation took
{}ms for {} columns",
+                logger.info("{} liveRatio is {} (just-counted was {}).  calculation took
{}ms for {} cells",
                             cfs, cfs.liveRatio, newRatio, TimeUnit.NANOSECONDS.toMillis(System.nanoTime()
- start), objects);
             }
             finally

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b47c89/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index cd7d3d9..6c6f852 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -272,7 +272,7 @@ public class CompactionTask extends AbstractCompactionTask
         }
 
         SystemKeyspace.updateCompactionHistory(cfs.keyspace.getName(), cfs.name, start, startsize,
endsize, mergedRows);
-        logger.info(String.format("Compacted %d sstables to [%s].  %,d bytes to %,d (~%d%%
of original) in %,dms = %fMB/s.  %,d total rows, %,d unique.  Row merge counts were {%s}",
+        logger.info(String.format("Compacted %d sstables to [%s].  %,d bytes to %,d (~%d%%
of original) in %,dms = %fMB/s.  %,d total partitions merged to %,d.  Partition merge counts
were {%s}",
                                   toCompact.size(), builder.toString(), startsize, endsize,
(int) (ratio * 100), dTime, mbps, totalSourceRows, totalkeysWritten, mergeSummary.toString()));
         logger.debug(String.format("CF Total Bytes Compacted: %,d", CompactionTask.addToTotalBytesCompacted(endsize)));
     }


Mime
View raw message