Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29cb5910 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29cb5910 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29cb5910 Branch: refs/heads/trunk Commit: 29cb5910612b603e312d1e99555113d827f6cd9b Parents: f55d1b9 f33cd55 Author: Branimir Lambov <[email protected]> Authored: Fri Nov 18 12:45:24 2016 +0200 Committer: Branimir Lambov <[email protected]> Committed: Fri Nov 18 12:45:24 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ReadCommand.java | 5 +- .../db/compaction/CompactionController.java | 46 +++++-- .../db/compaction/CompactionIterator.java | 22 +-- .../db/compaction/CompactionManager.java | 5 +- .../db/compaction/SSTableSplitter.java | 5 +- .../cassandra/db/compaction/Upgrader.java | 5 +- .../cassandra/db/compaction/Verifier.java | 5 +- .../cassandra/db/partitions/PurgeFunction.java | 6 +- .../db/compaction/CompactionControllerTest.java | 21 ++- .../db/compaction/CompactionsPurgeTest.java | 138 ++++++++++++++++++- 11 files changed, 213 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29cb5910/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29cb5910/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
