You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/05 15:12:00 UTC

git commit: Better exception msg for invalid CLUSTRING ORDER

Updated Branches:
  refs/heads/cassandra-1.2 65daaf9d6 -> 75d0ac9b2


Better exception msg for invalid CLUSTRING ORDER


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75d0ac9b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75d0ac9b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75d0ac9b

Branch: refs/heads/cassandra-1.2
Commit: 75d0ac9b270a8a82c72e37dfb4b73607b75664cd
Parents: 65daaf9
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 5 15:11:46 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 5 15:11:46 2013 +0200

----------------------------------------------------------------------
 .../cassandra/cql3/statements/CreateColumnFamilyStatement.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/75d0ac9b/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 1dfdc74..c0e6349 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -314,11 +314,11 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
             }
 
 
-            // If we give a clustering order, we must explicitely do so for all aliases and in the order of the PK
+            // If we give a clustering order, we must explicitly do so for all aliases and in the order of the PK
             if (!definedOrdering.isEmpty())
             {
                 if (definedOrdering.size() > columnAliases.size())
-                    throw new InvalidRequestException("Too much columns provided for CLUSTERING ORDER");
+                    throw new InvalidRequestException("Only clustering key columns can be defined in CLUSTERING ORDER directive");
 
                 int i = 0;
                 for (ColumnIdentifier id : definedOrdering.keySet())