Repository: cassandra Updated Branches: refs/heads/trunk 262170712 -> 63e0eb4fa
Post-merge fixup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d7019cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d7019cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d7019cc Branch: refs/heads/trunk Commit: 3d7019cc3c93acd0c4f3556f10497a2bd07c3a05 Parents: 63b1ef4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 20 21:07:08 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 20 21:07:08 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/composites/AbstractCType.java | 2 ++ src/java/org/apache/cassandra/db/filter/ColumnSlice.java | 5 +++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d7019cc/src/java/org/apache/cassandra/db/composites/AbstractCType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/AbstractCType.java b/src/java/org/apache/cassandra/db/composites/AbstractCType.java index d3b8940..054706d 100644 --- a/src/java/org/apache/cassandra/db/composites/AbstractCType.java +++ b/src/java/org/apache/cassandra/db/composites/AbstractCType.java @@ -90,6 +90,8 @@ public abstract class AbstractCType implements CType { if (c1 == null || c1.isEmpty()) return c2 == null || c2.isEmpty() ? 0 : -1; + if (c2 == null || c2.isEmpty()) + return 1; if (c1.isStatic() != c2.isStatic()) return c1.isStatic() ? -1 : 1; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d7019cc/src/java/org/apache/cassandra/db/filter/ColumnSlice.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java index 02a5a0c..19d26c7 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java @@ -215,6 +215,11 @@ public class ColumnSlice return prefix.size(); } + public boolean isStatic() + { + return prefix.isStatic(); + } + public ByteBuffer get(int i) { return prefix.get(i);
