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/8a5a82b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a5a82b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a5a82b8 Branch: refs/heads/trunk Commit: 8a5a82b8a87314d1e740d94cd40a190bd2681a42 Parents: 3966935 8a2d8a1 Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Jul 15 12:06:51 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Jul 15 12:06:51 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 41 ++-- .../apache/cassandra/cql3/ErrorCollector.java | 242 +++++++++++++++++++ .../apache/cassandra/cql3/ErrorListener.java | 44 ++++ .../apache/cassandra/cql3/QueryProcessor.java | 11 +- .../apache/cassandra/cql3/CqlParserTest.java | 90 +++++++ .../cassandra/cql3/ErrorCollectorTest.java | 218 +++++++++++++++++ 7 files changed, 621 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5a82b8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5a82b8/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5a82b8/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
