cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Tue, 08 Jan 2013 08:49:39 GMT
Updated Branches:
  refs/heads/trunk 1d641f511 -> 549655f28


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/549655f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/549655f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/549655f2

Branch: refs/heads/trunk
Commit: 549655f285dedcd9d77b70ea6c777ea968410926
Parents: 1d641f5 8349fce
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jan 8 09:49:32 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jan 8 09:49:32 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cql3/statements/AlterTableStatement.java       |   10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/549655f2/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/549655f2/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index e9f5425,7381895..ed100f0
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -93,11 -92,7 +92,9 @@@ public class AlterTableStatement extend
                  {
                      if (!cfDef.isComposite)
                          throw new InvalidRequestException("Cannot use collection types with
non-composite PRIMARY KEY");
 +                    if (cfDef.cfm.isSuper())
 +                        throw new InvalidRequestException("Cannot use collection types with
Super column family");
  
-                     componentIndex--;
- 
                      Map<ByteBuffer, CollectionType> collections = cfDef.hasCollections
                                                                  ? new HashMap<ByteBuffer,
CollectionType>(cfDef.getCollectionType().defined)
                                                                  : new HashMap<ByteBuffer,
CollectionType>();


Mime
View raw message