You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/09/05 14:57:47 UTC
[1/2] git commit: Fix assertion encountered when using heap_buffers
Repository: cassandra
Updated Branches:
refs/heads/trunk 37a9d405c -> 3f1820f1d
Fix assertion encountered when using heap_buffers
Patch by tjake; reviewed be belliottsmitch for CASSANDRA-7862
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a410175
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a410175
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a410175
Branch: refs/heads/trunk
Commit: 3a410175ff8f5e37c263f18315feb60fc217c3dc
Parents: dd972e6
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Sep 5 08:47:01 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Sep 5 08:47:01 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/db/composites/AbstractSimpleCellNameType.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a410175/src/java/org/apache/cassandra/db/composites/AbstractSimpleCellNameType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/AbstractSimpleCellNameType.java b/src/java/org/apache/cassandra/db/composites/AbstractSimpleCellNameType.java
index f9c9641..b3f4778 100644
--- a/src/java/org/apache/cassandra/db/composites/AbstractSimpleCellNameType.java
+++ b/src/java/org/apache/cassandra/db/composites/AbstractSimpleCellNameType.java
@@ -86,7 +86,6 @@ public abstract class AbstractSimpleCellNameType extends AbstractCellNameType
{
ByteBuffer b1 = c1.toByteBuffer();
ByteBuffer b2 = c2.toByteBuffer();
- assert b1.hasRemaining() & b2.hasRemaining();
return ByteBufferUtil.compareUnsigned(b1, b2);
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/3f1820f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f1820f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f1820f1
Branch: refs/heads/trunk
Commit: 3f1820f1d785d262c4bd7ddc9e487307bceb5e86
Parents: 37a9d40 3a41017
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Sep 5 08:57:34 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Sep 5 08:57:34 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/db/composites/AbstractSimpleCellNameType.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------