Repository: cassandra Updated Branches: refs/heads/trunk 0db507454 -> 4bb8f14a5
fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c393208 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c393208 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c393208 Branch: refs/heads/trunk Commit: 1c39320860f2de747a35a922cb04b59585cd74b6 Parents: 0793e56 Author: Marcus Eriksson <[email protected]> Authored: Thu Oct 2 11:49:04 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Oct 2 11:49:04 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/marshal/DynamicCompositeTypeTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c393208/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index 87e6ac9..e248eae 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -207,7 +207,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader ByteBuffer cname5 = createDynamicCompositeKey("test2", uuids[1], 42, false, true); ByteBuffer key = ByteBufferUtil.bytes("kr"); - RowMutation rm = new RowMutation("Keyspace1", key); + Mutation rm = new Mutation("Keyspace1", key); addColumn(rm, cname5); addColumn(rm, cname1); addColumn(rm, cname4); @@ -217,7 +217,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("kr"), cfName, System.currentTimeMillis())); - Iterator<Column> iter = cf.getSortedColumns().iterator(); + Iterator<Cell> iter = cf.getSortedColumns().iterator(); assert iter.next().name().equals(cname5); assert iter.next().name().equals(cname4);
