You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/07/12 16:41:39 UTC
[3/4] Optimized data structure for range tombstones (trunk version)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88f65a18/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
index f89e96a..f9a1467 100644
--- a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
+++ b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
@@ -111,8 +111,8 @@ public class LazilyCompactedRowTest extends SchemaLoader
// cf metadata
ColumnFamily cf1 = TreeMapBackedSortedColumns.factory.create(cfs.metadata);
ColumnFamily cf2 = TreeMapBackedSortedColumns.factory.create(cfs.metadata);
- cf1.delete(DeletionInfo.serializer().deserializeFromSSTable(in1, Descriptor.Version.CURRENT));
- cf2.delete(DeletionInfo.serializer().deserializeFromSSTable(in2, Descriptor.Version.CURRENT));
+ cf1.delete(DeletionTime.serializer.deserialize(in1));
+ cf2.delete(DeletionTime.serializer.deserialize(in2));
assertEquals(cf1.deletionInfo(), cf2.deletionInfo());
// columns
while (true)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88f65a18/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index b0f22be..c98ba48 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -112,7 +112,7 @@ public class SSTableImportTest extends SchemaLoader
ColumnFamily cf = cloneForAdditions(qf.getSSTableColumnIterator(reader));
qf.collateOnDiskAtom(cf, qf.getSSTableColumnIterator(reader), Integer.MIN_VALUE);
- DeletionTime delTime = cf.deletionInfo().rangeCovering(CompositeType.build(ByteBufferUtil.bytes("superA"))).iterator().next();
+ DeletionTime delTime = cf.deletionInfo().rangeCovering(CompositeType.build(ByteBufferUtil.bytes("superA")));
assertEquals("supercolumn deletion time did not match the expected time", new DeletionInfo(0, 0), new DeletionInfo(delTime));
Column subColumn = cf.getColumn(CompositeType.build(ByteBufferUtil.bytes("superA"), ByteBufferUtil.bytes("636f6c4141")));
assert subColumn.value().equals(hexToBytes("76616c75654141"));