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 6C08779E3 for ; Tue, 6 Sep 2011 16:50:56 +0000 (UTC) Received: (qmail 26618 invoked by uid 500); 6 Sep 2011 16:50:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26588 invoked by uid 500); 6 Sep 2011 16:50:55 -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 26579 invoked by uid 99); 6 Sep 2011 16:50:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 16:50:55 +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; Tue, 06 Sep 2011 16:50:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C028F238897A for ; Tue, 6 Sep 2011 16:50:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165758 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java Date: Tue, 06 Sep 2011 16:50:33 -0000 To: commits@cassandra.apache.org From: xedin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110906165033.C028F238897A@eris.apache.org> Author: xedin Date: Tue Sep 6 16:50:33 2011 New Revision: 1165758 URL: http://svn.apache.org/viewvc?rev=1165758&view=rev Log: Fix CLI `show schema;` to output correct keyspace definition statement patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3129 Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1165758&r1=1165757&r2=1165758&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Sep 6 16:50:33 2011 @@ -3,6 +3,8 @@ (CASSANDRA-3138) * prevent users from creating keyspaces with LocalStrategy replication (CASSANDRA-3139) + * fix CLI `show schema;` to output correct keyspace definition statement + (CASSANDRA-3129) 0.8.5 * fix NPE when encryption_options is unspecified (CASSANDRA-3007) Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1165758&r1=1165757&r2=1165758&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java Tue Sep 6 16:50:33 2011 @@ -1607,11 +1607,10 @@ public class CliClient */ private void showKeyspace(StringBuilder sb, KsDef ksDef) { - sb.append("create keyspace " + ksDef.name); - if (ksDef.isSetReplication_factor()) - writeAttr(sb, false, "replication_factor", ksDef.getReplication_factor()); + writeAttr(sb, true, "placement_strategy", normaliseType(ksDef.strategy_class, "org.apache.cassandra.locator")); + if (ksDef.strategy_options != null && !ksDef.strategy_options.isEmpty()) { final StringBuilder opts = new StringBuilder();