Updated Branches: refs/heads/trunk 908e0e2d7 -> ad4541e6b
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad4541e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad4541e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad4541e6 Branch: refs/heads/trunk Commit: ad4541e6bf3c178677be30a899e21fe63094a552 Parents: 908e0e2 86f5eaa Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 22 13:50:37 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 22 13:50:37 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 163 +++++++++++-- .../apache/cassandra/config/ColumnDefinition.java | 13 +- .../org/apache/cassandra/config/KSMetaData.java | 43 +++- .../apache/cassandra/cql/AlterTableStatement.java | 64 +++--- .../cassandra/cql/CreateColumnFamilyStatement.java | 9 +- .../cassandra/cql/CreateKeyspaceStatement.java | 20 -- .../org/apache/cassandra/cql/QueryProcessor.java | 38 ++-- .../cql3/statements/AlterTableStatement.java | 49 ++-- .../statements/CreateColumnFamilyStatement.java | 7 +- .../cql3/statements/CreateIndexStatement.java | 21 +- .../cql3/statements/CreateKeyspaceStatement.java | 6 +- .../cql3/statements/DropIndexStatement.java | 22 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 22 +- .../apache/cassandra/thrift/ThriftValidation.java | 178 --------------- test/unit/org/apache/cassandra/SchemaLoader.java | 6 +- .../cassandra/thrift/ThriftValidationTest.java | 28 ++-- 18 files changed, 311 insertions(+), 381 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/thrift/ThriftValidation.java ----------------------------------------------------------------------
