Merge branch 'cassandra-2.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/56c2f0ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56c2f0ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56c2f0ab Branch: refs/heads/trunk Commit: 56c2f0ab110e2dadb6557de9bc6614829fdc5172 Parents: 4b9fde9 0932ed6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu May 29 11:36:28 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu May 29 11:36:28 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 41 +- doc/native_protocol_v3.spec | 26 +- .../org/apache/cassandra/config/UTMetaData.java | 10 +- .../org/apache/cassandra/cql3/CQL3Type.java | 106 ++ src/java/org/apache/cassandra/cql3/Cql.g | 44 +- src/java/org/apache/cassandra/cql3/Tuples.java | 103 +- .../apache/cassandra/cql3/UntypedResultSet.java | 18 + .../org/apache/cassandra/cql3/UserTypes.java | 14 +- .../cql3/statements/AlterTypeStatement.java | 26 +- .../cql3/statements/CreateTypeStatement.java | 8 +- .../cql3/statements/DropTypeStatement.java | 2 +- .../cql3/statements/SelectStatement.java | 34 +- .../cassandra/cql3/statements/Selection.java | 10 +- .../apache/cassandra/db/marshal/TupleType.java | 56 +- .../apache/cassandra/db/marshal/UserType.java | 174 +-- .../apache/cassandra/transport/DataType.java | 40 +- test/conf/logback-test.xml | 4 +- .../unit/org/apache/cassandra/SchemaLoader.java | 14 +- .../org/apache/cassandra/cql3/CQLTester.java | 472 ++++++ .../cassandra/cql3/MultiColumnRelationTest.java | 1434 +++++------------- .../apache/cassandra/cql3/TupleTypeTest.java | 97 ++ 22 files changed, 1445 insertions(+), 1289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56c2f0ab/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56c2f0ab/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56c2f0ab/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
