Updated Branches: refs/heads/cassandra-2.0 69397ef5f -> 62b709fa1
cqlsh: add support for multiline comments patch by Aleksey Yeschenko; reviewed by Brandon Williams for CASSANDRA-5798 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41409770 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41409770 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41409770 Branch: refs/heads/cassandra-2.0 Commit: 41409770d458e2367d9379d33a94a5e0d60d463a Parents: ebab9d3 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Aug 16 21:46:42 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Aug 16 21:46:42 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- pylib/cqlshlib/cql3handling.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7630084..f44cdb9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,7 @@ * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table (CASSANDRA-5718) * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) + * cqlsh: add support for multiline comments (CASSANDRA-5798) Merged from 1.1: * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index f0db1b3..b50bcf2 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -32,7 +32,7 @@ exit 1 from __future__ import with_statement description = "CQL Shell for Apache Cassandra" -version = "3.1.6" +version = "3.1.7" from StringIO import StringIO from itertools import groupby http://git-wip-us.apache.org/repos/asf/cassandra/blob/41409770/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index ca95766..82e14d4 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -223,7 +223,7 @@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ; <unclosedString> ::= /'([^']|'')*/ ; <unclosedName> ::= /"([^"]|"")*/ ; -<unclosedComment> ::= /[/][*][^\n]*$/ ; +<unclosedComment> ::= /[/][*].*$/ ; <term> ::= <stringLiteral> | <integer>
