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 2014/02/25 10:50:07 UTC
[1/2] git commit: Fix unit test post-merge
Repository: cassandra
Updated Branches:
refs/heads/trunk e975ab8c5 -> 6bc3e7f18
Fix unit test post-merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0857f2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0857f2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0857f2d
Branch: refs/heads/trunk
Commit: e0857f2dc6d2ad1a35a88a4f33c4d49bd0186727
Parents: 3d93053
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 25 10:49:48 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 25 10:49:48 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0857f2d/test/unit/org/apache/cassandra/service/QueryPagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
index 84f51f4..26295af 100644
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
@@ -169,7 +169,7 @@ public class QueryPagerTest extends SchemaLoader
continue;
ByteBuffer expected = names[i++];
- assertEquals("column " + i + " doesn't match: " + toString(r.cf), expected, c.name());
+ assertEquals("column " + i + " doesn't match: " + toString(r.cf), expected, c.name().toByteBuffer());
}
}
@@ -337,7 +337,7 @@ public class QueryPagerTest extends SchemaLoader
String keyspace = "cql_keyspace";
String table = "table2";
ColumnFamilyStore cfs = Keyspace.open(keyspace).getColumnFamilyStore(table);
- CompositeType ct = (CompositeType)cfs.metadata.comparator;
+ CompositeType ct = (CompositeType)cfs.metadata.comparator.asAbstractType();
// Insert rows but with a tombstone as last cell
for (int i = 0; i < 5; i++)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bc3e7f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bc3e7f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bc3e7f1
Branch: refs/heads/trunk
Commit: 6bc3e7f18a6f4792d0544187c7743db822ea4e82
Parents: e975ab8 e0857f2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 25 10:50:01 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 25 10:50:01 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------