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 316E46DE1 for ; Mon, 4 Jul 2011 16:22:35 +0000 (UTC) Received: (qmail 33339 invoked by uid 500); 4 Jul 2011 16:22:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 33285 invoked by uid 500); 4 Jul 2011 16:22:34 -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 33276 invoked by uid 99); 4 Jul 2011 16:22:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 16:22:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 16:22:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43B2E2388897 for ; Mon, 4 Jul 2011 16:22:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142727 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/cli/CliMain.java Date: Mon, 04 Jul 2011 16:22:13 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110704162213.43B2E2388897@eris.apache.org> Author: jbellis Date: Mon Jul 4 16:22:12 2011 New Revision: 1142727 URL: http://svn.apache.org/viewvc?rev=1142727&view=rev Log: improve cli treatment of multiline comments patch by pyaskevich; reviewed by jbellis for CASSANDRA-2852 Modified: cassandra/branches/cassandra-0.7/CHANGES.txt cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java Modified: cassandra/branches/cassandra-0.7/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1142727&r1=1142726&r2=1142727&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.7/CHANGES.txt Mon Jul 4 16:22:12 2011 @@ -31,6 +31,7 @@ (CASSANDRA-2841) * allow deleting a row and updating indexed columns in it in the same mutation (CASSANDRA-2773) + * improve cli treatment of multiline comments (CASSANDRA-2852) 0.7.6 Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java?rev=1142727&r1=1142726&r2=1142727&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java Mon Jul 4 16:22:12 2011 @@ -365,6 +365,8 @@ public class CliMain String line = ""; String currentStatement = ""; + boolean commentedBlock = false; + while ((line = reader.readLine()) != null) { line = line.trim(); @@ -373,6 +375,18 @@ public class CliMain if (line.isEmpty() || line.startsWith("--")) continue; + if (line.startsWith("/*")) + commentedBlock = true; + + if (line.startsWith("*/") || line.endsWith("*/")) + { + commentedBlock = false; + continue; + } + + if (commentedBlock) // skip commented lines + continue; + currentStatement += line; if (line.endsWith(";"))