Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 92171104FB for ; Fri, 16 Aug 2013 18:51:58 +0000 (UTC) Received: (qmail 25429 invoked by uid 500); 16 Aug 2013 18:51:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 25405 invoked by uid 500); 16 Aug 2013 18:51:58 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 25372 invoked by uid 99); 16 Aug 2013 18:51:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 18:51:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9DBBD8AE5B9; Fri, 16 Aug 2013 18:51:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 16 Aug 2013 18:51:57 -0000 Message-Id: <2e21012e2abb463b813b7e38b4f8aac8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: cqlsh: add support for multiline comments Updated Branches: refs/heads/trunk 5dabd1cc0 -> d8dfa1703 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/trunk Commit: 41409770d458e2367d9379d33a94a5e0d60d463a Parents: ebab9d3 Author: Aleksey Yeschenko Authored: Fri Aug 16 21:46:42 2013 +0300 Committer: Aleksey Yeschenko 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]|$)|[/][*].*?[*][/])/ ; ::= /'([^']|'')*/ ; ::= /"([^"]|"")*/ ; - ::= /[/][*][^\n]*$/ ; + ::= /[/][*].*$/ ; ::= |