Updated Branches: refs/heads/cassandra-1.2 ab23afa52 -> 500c3f315
Fix composite comparator with super columns patch by slebresne; reviewed by thobbs for CASSANDRA-5287 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/500c3f31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/500c3f31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/500c3f31 Branch: refs/heads/cassandra-1.2 Commit: 500c3f3158f0becbdbde8bfdc0e2aa934e8f0bec Parents: ab23afa Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 28 14:03:25 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 28 14:03:25 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/500c3f31/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4a7dd1a..9d0468b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249) * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) Merged from 1.1: * nodetool: ability to repair specific range (CASSANDRA-5280) * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) http://git-wip-us.apache.org/repos/asf/cassandra/blob/500c3f31/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 73b7b6b..ae91d23 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -977,7 +977,7 @@ public final class CFMetaData */ public ColumnDefinition getColumnDefinitionFromColumnName(ByteBuffer columnName) { - if (comparator instanceof CompositeType) + if (cfType == ColumnFamilyType.Standard && comparator instanceof CompositeType) { CompositeType composite = (CompositeType)comparator; ByteBuffer[] components = composite.split(columnName);
