Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/073f0626 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/073f0626 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/073f0626 Branch: refs/heads/cassandra-3.0 Commit: 073f06262a60f661d3db5e308daa9877516cda51 Parents: 95feab6 99617a5 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Nov 20 11:05:01 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Nov 20 11:05:01 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 1 + .../DateTieredCompactionStrategy.java | 34 ++++++++++-------- .../DateTieredCompactionStrategyOptions.java | 30 ++++++++++++++-- .../DateTieredCompactionStrategyTest.java | 37 +++++++++++++------- 5 files changed, 73 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/073f0626/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 14e8c3d,66423c7..867226f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Limit window size in DTCS (CASSANDRA-10280) * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188) * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304) * Don't remove level info when running upgradesstables (CASSANDRA-10692) http://git-wip-us.apache.org/repos/asf/cassandra/blob/073f0626/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/073f0626/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/073f0626/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java index 2824d3a,5afd575..2fab014 --- a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java @@@ -312,10 -311,11 +322,11 @@@ public class DateTieredCompactionStrate Thread.sleep(2000); AbstractCompactionTask t = dtcs.getNextBackgroundTask((int) (System.currentTimeMillis()/1000)); assertNotNull(t); - assertEquals(1, Iterables.size(t.sstables)); - SSTableReader sstable = t.sstables.iterator().next(); + assertEquals(1, Iterables.size(t.transaction.originals())); + SSTableReader sstable = t.transaction.originals().iterator().next(); assertEquals(sstable, expiredSSTable); - cfs.getDataTracker().unmarkCompacting(cfs.getSSTables()); + t.transaction.abort(); + cfs.truncateBlocking(); } @Test @@@ -355,7 -354,9 +365,8 @@@ DateTieredCompactionStrategy dtcs = new DateTieredCompactionStrategy(cfs, options); for (SSTableReader sstable : cfs.getSSTables()) dtcs.addSSTable(sstable); - assertEquals(20, dtcs.getNextBackgroundTask(0).transaction.originals().size()); + AbstractCompactionTask task = dtcs.getNextBackgroundTask(0); - assertEquals(20, task.sstables.size()); - cfs.getDataTracker().unmarkCompacting(task.sstables); - cfs.truncateBlocking(); ++ assertEquals(20, task.transaction.originals().size()); ++ task.transaction.abort(); } - }
