Repository: cassandra Updated Branches: refs/heads/trunk f5f3ae1da -> 412e8743d
Fix handling of thrift non-string comparators patch by slebresne; reviewed by iamaleksey for CASSANDRA-9825 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/412e8743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/412e8743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/412e8743 Branch: refs/heads/trunk Commit: 412e8743d7e933e5b3008242f74007f7ddd435cb Parents: f5f3ae1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jul 16 15:38:02 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jul 17 10:39:10 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/config/CFMetaData.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/412e8743/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 76d6e92..db306ea 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,7 @@ * Metrics should use up to date nomenclature (CASSANDRA-9448) * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384) * Cleanup crc and adler code for java 8 (CASSANDRA-9650) - * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808) + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 9825) * Update Guava to 18.0 (CASSANDRA-9653) * Bloom filter false positive ratio is not honoured (CASSANDRA-8413) * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522) http://git-wip-us.apache.org/repos/asf/cassandra/blob/412e8743/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 84639dc..ee1ed25 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -1117,7 +1117,7 @@ public final class CFMetaData "interval (%d).", maxIndexInterval, minIndexInterval)); } - // The comparator to validate the definition name. + // The comparator to validate the definition name with thrift. public AbstractType<?> thriftColumnNameType() { if (isSuper()) @@ -1127,7 +1127,8 @@ public final class CFMetaData return ((MapType)def.type).nameComparator(); } - return UTF8Type.instance; + assert isStaticCompactTable(); + return clusteringColumns.get(0).type; } public CFMetaData addAllColumnDefinitions(Collection<ColumnDefinition> defs)
