Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4ebbae6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4ebbae6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4ebbae6 Branch: refs/heads/trunk Commit: b4ebbae67922dc9e8be0d6c607eb382f7c3daab9 Parents: cf532fe 6db8ac3 Author: Dave Brosius <dbros...@apache.org> Authored: Mon Apr 15 19:18:32 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Mon Apr 15 19:18:32 2013 -0400 ---------------------------------------------------------------------- .../statements/CreateColumnFamilyStatement.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4ebbae6/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java index f2c3d6a,972e947..1dfdc74 --- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java @@@ -342,9 -258,7 +342,10 @@@ public class CreateColumnFamilyStatemen { AbstractType type = columns.get(t); if (type == null) - throw new InvalidRequestException(String.format("Unkown definition %s referenced in PRIMARY KEY", t)); + throw new InvalidRequestException(String.format("Unknown definition %s referenced in PRIMARY KEY", t)); + if (type instanceof CollectionType) + throw new InvalidRequestException(String.format("Invalid collection type for PRIMARY KEY component %s", t)); ++ columns.remove(t); Boolean isReversed = definedOrdering.get(t); return isReversed != null && isReversed ? ReversedType.getInstance(type) : type;
