Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eda4b58e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eda4b58e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eda4b58e Branch: refs/heads/trunk Commit: eda4b58e1d891e0ad42320c7251af8e6626f36e9 Parents: f467c85 15fd71f Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Aug 11 09:11:32 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Aug 11 09:11:32 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eda4b58e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eda4b58e/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 43a726b,2913dc9..036d522 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@@ -174,15 -170,7 +174,13 @@@ public class CompactionTask extends Abs AbstractCompactionStrategy.ScannerList scanners = strategy.getScanners(actuallyCompact); CompactionIterator ci = new CompactionIterator(compactionType, scanners.scanners, controller, nowInSec, taskId)) { - if (collector != null) - collector.beginCompaction(ci); long lastCheckObsoletion = start; + inputSizeBytes = scanners.getTotalCompressedSize(); + double compressionRatio = scanners.getCompressionRatio(); + if (compressionRatio == MetadataCollector.NO_COMPRESSION_RATIO) + compressionRatio = 1.0; + + long lastBytesScanned = 0; if (!controller.cfs.getCompactionStrategyManager().isActive()) throw new CompactionInterruptedException(ci.getCompactionInfo());
