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 433AA9555 for ; Fri, 2 Dec 2011 23:42:41 +0000 (UTC) Received: (qmail 26004 invoked by uid 500); 2 Dec 2011 23:42:41 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 25969 invoked by uid 500); 2 Dec 2011 23:42:41 -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 25960 invoked by uid 99); 2 Dec 2011 23:42:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 23:42:41 +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; Fri, 02 Dec 2011 23:42:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C334123888FD for ; Fri, 2 Dec 2011 23:42:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209782 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/cql/QueryProcessor.java src/java/org/apache/cassandra/thrift/ThriftValidation.java Date: Fri, 02 Dec 2011 23:42:18 -0000 To: commits@cassandra.apache.org From: xedin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202234218.C334123888FD@eris.apache.org> Author: xedin Date: Fri Dec 2 23:42:18 2011 New Revision: 1209782 URL: http://svn.apache.org/viewvc?rev=1209782&view=rev Log: (CQL) Proper ColumnFamily metadata validation on CREATE COLUMNFAMILY patch by Jonathan Ellis; reviewed by Pavel Yaskevich for CASSANDRA-3565 Modified: cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1209782&r1=1209781&r2=1209782&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Fri Dec 2 23:42:18 2011 @@ -12,6 +12,7 @@ * fix default value validation usage in CLI SET command (CASSANDRA-3553) * Optimize componentsFor method for compaction and startup time (CASSANDRA-3532) + * (CQL) Proper ColumnFamily metadata validation on CREATE COLUMNFAMILY (CASSANDRA-3565) Merged from 0.8: * use cannonical host for local node in nodetool info (CASSANDRA-3556) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1209782&r1=1209781&r2=1209782&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/QueryProcessor.java Fri Dec 2 23:42:18 2011 @@ -783,10 +783,12 @@ public class QueryProcessor CreateColumnFamilyStatement createCf = (CreateColumnFamilyStatement)statement.statement; clientState.hasColumnFamilySchemaAccess(Permission.WRITE); validateSchemaAgreement(); - + CFMetaData cfmd = createCf.getCFMetaData(keyspace); + ThriftValidation.validateCfDef(cfmd.toThrift(), null); + try { - applyMigrationOnStage(new AddColumnFamily(createCf.getCFMetaData(keyspace))); + applyMigrationOnStage(new AddColumnFamily(cfmd)); } catch (ConfigurationException e) { Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1209782&r1=1209781&r2=1209782&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java Fri Dec 2 23:42:18 2011 @@ -587,7 +587,7 @@ public class ThriftValidation if (cf_def.key_alias.equals(columnDef.name)) throw new InvalidRequestException("Invalid column name: " + AsciiType.instance.compose(cf_def.key_alias) - + ", because it equals to the key_alias."); + + ", because it equals the key_alias"); } }