You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by br...@apache.org on 2011/07/15 19:42:11 UTC

svn commit: r1147261 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java

Author: brandonwilliams
Date: Fri Jul 15 17:42:11 2011
New Revision: 1147261

URL: http://svn.apache.org/viewvc?rev=1147261&view=rev
Log:
cli validates CFMetaData on update.
Patch by jbellis, reviewed by Pavel Yaskevich for CASSANDRA-2809

Modified:
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1147261&r1=1147260&r2=1147261&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java Fri Jul 15 17:42:11 2011
@@ -960,6 +960,7 @@ public class CassandraServer implements 
         CFMetaData oldCfm = DatabaseDescriptor.getCFMetaData(CFMetaData.getId(cf_def.keyspace, cf_def.name));
         if (oldCfm == null)
             throw new InvalidRequestException("Could not find column family definition to modify.");
+        ThriftValidation.validateCfDef(cf_def, oldCfm);
         validateSchemaAgreement();
 
         try