Updated Branches: refs/heads/cassandra-1.1 820411fe4 -> c37fe54f1 refs/heads/trunk bc783baab -> 6e8c23711
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e8c2371 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e8c2371 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e8c2371 Branch: refs/heads/trunk Commit: 6e8c237116e59b50cc415a8cf615db1b8ac84f54 Parents: bc783ba c37fe54 Author: Jonathan Ellis <[email protected]> Authored: Wed May 23 16:15:59 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 23 16:15:59 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 6 ++- src/java/org/apache/cassandra/cql/CFPropDefs.java | 5 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 3 +- .../cassandra/db/compaction/CompactionInfo.java | 2 +- .../io/compress/CompressionParameters.java | 9 ++++- .../cassandra/io/compress/DeflateCompressor.java | 7 +++ .../apache/cassandra/io/compress/ICompressor.java | 3 + .../cassandra/io/compress/SnappyCompressor.java | 33 +++++++++++++++ 9 files changed, 64 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/cql/CFPropDefs.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java index acd8fcb,937557f..374d895 --- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java @@@ -117,22 -114,5 +117,22 @@@ public final class CompactionInfo imple { return stopRequested; } + /** + * report event on the size of the compaction. + */ + public void started() + { + reportedSeverity = StorageService.instance.reportSeverity(getCompactionInfo().getTotalBytes()/load); + } + + /** + * remove the event complete + */ + public void finished() + { + if (reportedSeverity) - StorageService.instance.reportSeverity(-(getCompactionInfo().getTotalBytes()/load)); ++ StorageService.instance.reportSeverity(-(getCompactionInfo().getTotalBytes()/load)); + reportedSeverity = false; + } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/io/compress/CompressionParameters.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/io/compress/ICompressor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e8c2371/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java ----------------------------------------------------------------------
