Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 45678 invoked from network); 9 Apr 2011 18:21:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2011 18:21:27 -0000 Received: (qmail 32315 invoked by uid 500); 9 Apr 2011 18:21:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32292 invoked by uid 500); 9 Apr 2011 18:21:27 -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 32284 invoked by uid 99); 9 Apr 2011 18:21:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 18:21:27 +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; Sat, 09 Apr 2011 18:21:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9DA6F23889D5; Sat, 9 Apr 2011 18:21:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1090644 - in /cassandra/trunk: README.txt src/java/org/apache/cassandra/cli/CliClient.java src/java/org/apache/cassandra/cli/CliUserHelp.java Date: Sat, 09 Apr 2011 18:21:05 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110409182105.9DA6F23889D5@eris.apache.org> Author: jbellis Date: Sat Apr 9 18:21:05 2011 New Revision: 1090644 URL: http://svn.apache.org/viewvc?rev=1090644&view=rev Log: add key_validation_class support to cli patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2432 Modified: cassandra/trunk/README.txt cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java Modified: cassandra/trunk/README.txt URL: http://svn.apache.org/viewvc/cassandra/trunk/README.txt?rev=1090644&r1=1090643&r2=1090644&view=diff ============================================================================== --- cassandra/trunk/README.txt (original) +++ cassandra/trunk/README.txt Sat Apr 9 18:21:05 2011 @@ -62,7 +62,7 @@ something slightly more interesting... ece86bde-dc55-11df-8240-e700f669bcfc [default@unknown] use Keyspace1; Authenticated to keyspace: Keyspace1 - [default@Keyspace1] create column family Users with comparator=UTF8Type and default_validation_class=UTF8Type; + [default@Keyspace1] create column family Users with comparator=UTF8Type and default_validation_class=UTF8Type and key_validation_class=UTF8Type; 737c7a71-dc56-11df-8240-e700f669bcfc [default@KS1] set Users[jsmith][first] = 'John'; Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1090644&r1=1090643&r2=1090644&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Sat Apr 9 18:21:05 2011 @@ -1108,6 +1108,9 @@ public class CliClient extends CliUserHe case ROW_CACHE_PROVIDER: cfDef.setRow_cache_provider(mValue); break; + case KEY_VALIDATION_CLASS: + cfDef.setKey_validation_class(CliUtils.unescapeSQLString(mValue)); + break; default: //must match one of the above or we'd throw an exception at the valueOf statement above. assert(false); @@ -1512,7 +1515,10 @@ public class CliClient extends CliUserHe { sessionState.out.printf(" \"%s\"%n", cf_def.comment); } - + + if (cf_def.key_validation_class != null) + sessionState.out.printf(" Key Validation Class: %s%n", cf_def.key_validation_class); + sessionState.out.printf(" Columns sorted by: %s%s%n", cf_def.comparator_type, cf_def.column_type.equals("Super") ? "/" + cf_def.subcomparator_type : ""); sessionState.out.printf(" Row cache size / save period in seconds: %s/%s%n", cf_def.row_cache_size, cf_def.row_cache_save_period_in_seconds); sessionState.out.printf(" Key cache size / save period in seconds: %s/%s%n", cf_def.key_cache_size, cf_def.key_cache_save_period_in_seconds); Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1090644&r1=1090643&r2=1090644&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java Sat Apr 9 18:21:05 2011 @@ -51,6 +51,7 @@ public class CliUserHelp { MAX_COMPACTION_THRESHOLD, REPLICATE_ON_WRITE, ROW_CACHE_PROVIDER, + KEY_VALIDATION_CLASS } protected EnumMap argumentExplanations = new EnumMap(ColumnFamilyArgument.class)