Updated Branches: refs/heads/trunk f5ec4c7c3 -> 8b0e1868e
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b0e1868/test/system/test_thrift_server.py ---------------------------------------------------------------------- diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py index bcb75e8..8fecd29 100644 --- a/test/system/test_thrift_server.py +++ b/test/system/test_thrift_server.py @@ -230,6 +230,18 @@ class TestMutations(ThriftTester): assert _big_slice('key1', ColumnParent('Standard2')) == [] assert _big_slice('key1', ColumnParent('Super1')) == [] + def test_cas(self): + _set_keyspace('Keyspace1') + assert not client.cas('key1', 'Standard1', _SIMPLE_COLUMNS, _SIMPLE_COLUMNS) + + assert client.cas('key1', 'Standard1', None, _SIMPLE_COLUMNS) + + result = [cosc.column for cosc in _big_slice('key1', ColumnParent('Standard1'))] + # CAS will use its own timestamp, so we can't just compare result == _SIMPLE_COLUMNS + assert dict((c.name, c.value) for c in result) == dict((c.name, c.value) for c in _SIMPLE_COLUMNS), result + + assert not client.cas('key1', 'Standard1', None, _SIMPLE_COLUMNS) + def test_missing_super(self): _set_keyspace('Keyspace1') _expect_missing(lambda: client.get('key1', ColumnPath('Super1', 'sc1', _i64(1)), ConsistencyLevel.ONE)) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b0e1868/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index c986c7b..c11fcf2 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -138,12 +138,12 @@ public class ColumnFamilyStoreTest extends SchemaLoader QueryFilter sliceFilter = QueryFilter.getSliceFilter(Util.dk("key1"), "Standard2", ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1); ColumnFamily cf = store.getColumnFamily(sliceFilter); assert cf.isMarkedForDelete(); - assert cf.isEmpty(); + assert cf.getColumnCount() == 0; QueryFilter namesFilter = QueryFilter.getNamesFilter(Util.dk("key1"), "Standard2", ByteBufferUtil.bytes("a")); cf = store.getColumnFamily(namesFilter); assert cf.isMarkedForDelete(); - assert cf.isEmpty(); + assert cf.getColumnCount() == 0; } }; http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b0e1868/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 218b0fa..1f3aef0 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -316,7 +316,7 @@ public class CompactionsTest extends SchemaLoader Collection<SSTableReader> sstablesBefore = cfs.getSSTables(); QueryFilter filter = QueryFilter.getIdentityFilter(key, cfname); - assert !cfs.getColumnFamily(filter).isEmpty(); + assert !(cfs.getColumnFamily(filter).getColumnCount() == 0); // Remove key rm = new RowMutation(TABLE1, key.key); @@ -324,7 +324,7 @@ public class CompactionsTest extends SchemaLoader rm.apply(); ColumnFamily cf = cfs.getColumnFamily(filter); - assert cf == null || cf.isEmpty() : "should be empty: " + cf; + assert cf == null || cf.getColumnCount() == 0 : "should be empty: " + cf; // Sleep one second so that the removal is indeed purgeable even with gcgrace == 0 Thread.sleep(1000); @@ -340,6 +340,6 @@ public class CompactionsTest extends SchemaLoader Util.compact(cfs, toCompact); cf = cfs.getColumnFamily(filter); - assert cf == null || cf.isEmpty() : "should be empty: " + cf; + assert cf == null || cf.getColumnCount() == 0 : "should be empty: " + cf; } }
