cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/9] git commit: Fix compaction_history timestamps patch by Chander Pechetty and jbellis for CASSANDRA-6784
Date Fri, 28 Feb 2014 16:08:44 GMT
Fix compaction_history timestamps
patch by Chander Pechetty and jbellis for CASSANDRA-6784


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

Branch: refs/heads/trunk
Commit: 319b42e58c3cc1b3d0ff2b87102e0b5f35169932
Parents: 4eb21ea
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Feb 28 10:07:16 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Feb 28 10:07:16 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/319b42e5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 65de68d..389ee2b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 2.0.6
  * Pool CqlRecordWriter clients by inetaddress rather than Range 
    (CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
  * Compare scores of full replica ordering in DES (CASSANDRA-6883)
  * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
  * Allow repairing between specific replicas (CASSANDRA-6440)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/319b42e5/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 2a23966..10c26db 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -271,7 +271,7 @@ public class CompactionTask extends AbstractCompactionTask
             mergedRows.put(rows, count);
         }
 
-        SystemKeyspace.updateCompactionHistory(cfs.keyspace.getName(), cfs.name, start, startsize,
endsize, mergedRows);
+        SystemKeyspace.updateCompactionHistory(cfs.keyspace.getName(), cfs.name, System.currentTimeMillis(),
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 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