diff --git a/CHANGES.txt b/CHANGES.txt index 3316e87252..438bc91e02 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,7 @@ tasks and upgradesstables (CASSANDRA-3985) * fix NPE on invalid CQL delete command (CASSANDRA-3755) * allow custom types in CLI's assume command (CASSANDRA-4081) + * Fix totalBytes count for parallel compactions (CASSANDRA-3758) 1.0.8 diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java index 53b1ba936f..31822192f5 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java @@ -41,15 +41,24 @@ public abstract class AbstractCompactionIterable implements Iterable scanners; protected final Throttle throttle; - public AbstractCompactionIterable(CompactionController controller, OperationType type) + public AbstractCompactionIterable(CompactionController controller, OperationType type, List scanners) { this.controller = controller; this.type = type; + this.scanners = scanners; + this.bytesRead = 0; + + long bytes = 0; + for (SSTableScanner scanner : scanners) + bytes += scanner.getFileLength(); + this.totalBytes = bytes; + this.throttle = new Throttle(toString(), new Throttle.ThroughputFunction() { /** @return Instantaneous throughput target in bytes per millisecond. */ diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java index 5e0dfa71e7..65e4b54c42 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java @@ -41,7 +41,6 @@ public class CompactionIterable extends AbstractCompactionIterable private static Logger logger = LoggerFactory.getLogger(CompactionIterable.class); private long row; - private final List scanners; private static final Comparator comparator = new Comparator() { @@ -58,12 +57,8 @@ public class CompactionIterable extends AbstractCompactionIterable protected CompactionIterable(OperationType type, List scanners, CompactionController controller) { - super(controller, type); - this.scanners = scanners; + super(controller, type, scanners); row = 0; - totalBytes = bytesRead = 0; - for (SSTableScanner scanner : scanners) - totalBytes += scanner.getFileLength(); } protected static List getScanners(Iterable sstables) throws IOException diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java index dba8f558d8..52f81e0b19 100644 --- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java @@ -59,7 +59,6 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable { private static Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class); - private final List scanners; private final int maxInMemorySize; public ParallelCompactionIterable(OperationType type, Iterable sstables, CompactionController controller) throws IOException @@ -74,8 +73,7 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable protected ParallelCompactionIterable(OperationType type, List scanners, CompactionController controller, int maxInMemorySize) { - super(controller, type); - this.scanners = scanners; + super(controller, type, scanners); this.maxInMemorySize = maxInMemorySize; }