Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d3dfd04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d3dfd04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d3dfd04
Branch: refs/heads/cassandra-2.1
Commit: 9d3dfd04dbc1a79fbcccc0ea0109bb6a23c2677e
Parents: 306de09 53848f7
Author: Marcus Eriksson <[email protected]>
Authored: Wed Apr 15 13:19:43 2015 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Wed Apr 15 13:24:04 2015 +0200
----------------------------------------------------------------------
.../db/compaction/DateTieredCompactionStrategyTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d3dfd04/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 743a337,d7caf6b..14e22f0
---
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -287,8 -287,8 +287,8 @@@ public class DateTieredCompactionStrate
// create 2 sstables
DecoratedKey key = Util.dk(String.valueOf("expired"));
- RowMutation rm = new RowMutation(KEYSPACE1, key.key);
- rm.add(CF_STANDARD1, ByteBufferUtil.bytes("column"), value,
System.currentTimeMillis(), 1);
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
- rm.add(CF_STANDARD1, Util.cellname("column"), value,
System.currentTimeMillis(), 5);
++ rm.add(CF_STANDARD1, Util.cellname("column"), value,
System.currentTimeMillis(), 1);
rm.apply();
cfs.forceBlockingFlush();
SSTableReader expiredSSTable = cfs.getSSTables().iterator().next();
@@@ -306,11 -306,9 +306,11 @@@
options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY,
"MILLISECONDS");
options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY,
Double.toString((1d / (24 * 60 * 60))));
DateTieredCompactionStrategy dtcs = new
DateTieredCompactionStrategy(cfs, options);
+ for (SSTableReader sstable : cfs.getSSTables())
+ dtcs.addSSTable(sstable);
dtcs.startup();
assertNull(dtcs.getNextBackgroundTask((int)
(System.currentTimeMillis() / 1000)));
- Thread.sleep(7000);
+ Thread.sleep(2000);
AbstractCompactionTask t = dtcs.getNextBackgroundTask((int)
(System.currentTimeMillis()/1000));
assertNotNull(t);
assertEquals(1, Iterables.size(t.sstables));
