You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/04/16 01:21:34 UTC
[1/3] git commit: fix message spelling
Updated Branches:
refs/heads/trunk 6b332ddcb -> 841ae04f8
fix message spelling
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6db8ac38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6db8ac38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6db8ac38
Branch: refs/heads/trunk
Commit: 6db8ac3898f1263dd33f159835999cdfd1f09a07
Parents: 868e7eb
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 15 19:14:08 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 15 19:14:08 2013 -0400
----------------------------------------------------------------------
.../statements/CreateColumnFamilyStatement.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6db8ac38/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index cffb006..972e947 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -258,7 +258,7 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
{
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));
columns.remove(t);
Boolean isReversed = definedOrdering.get(t);
return isReversed != null && isReversed ? ReversedType.getInstance(type) : type;
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/841ae04f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841ae04f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/841ae04f
Branch: refs/heads/trunk
Commit: 841ae04f80275ed7f097e5a20e4a442d22114f77
Parents: 6b332dd b4ebbae
Author: Dave Brosius <db...@apache.org>
Authored: Mon Apr 15 19:19:36 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon Apr 15 19:19:36 2013 -0400
----------------------------------------------------------------------
.../statements/CreateColumnFamilyStatement.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/841ae04f/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by db...@apache.org.
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 <db...@apache.org>
Authored: Mon Apr 15 19:18:32 2013 -0400
Committer: Dave Brosius <db...@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;