svn commit: r1177887 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt src/java/org/apache/cassandra/thrift/CassandraServer.java

[jbellis]

Author: jbellis
Date: Sat Oct  1 02:46:51 2011
New Revision: 1177887

URL: http://svn.apache.org/viewvc?rev=1177887&view=rev
Log:
ignore any CF ids sent by client for adding CF/KS
patch by jbellis and Nate McCall for CASSANDRA-3288

Modified:
    cassandra/branches/cassandra-1.0.0/CHANGES.txt
    
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/thrift/CassandraServer.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1177887&r1=1177886&r2=1177887&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Sat Oct  1 02:46:51 2011
@@ -1,3 +1,7 @@
+1.0.0-final
+ * ignore any CF ids sent by client for adding CF/KS (CASSANDRA-3288)
+
+
 1.0.0-rc2
  * Log a meaningful warning when a node receives a message for a repair session
    that doesn't exist anymore (CASSANDRA-3256)

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1177887&r1=1177886&r2=1177887&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/thrift/CassandraServer.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/thrift/CassandraServer.java
 Sat Oct  1 02:46:51 2011
@@ -892,6 +892,7 @@ public class CassandraServer implements 
 
         try
         {
+            cf_def.unsetId(); // explicitly ignore any id set by client 
(Hector likes to set zero)
             applyMigrationOnStage(new 
AddColumnFamily(CFMetaData.fromThrift(cf_def)));
             return Schema.instance.getVersion().toString();
         }
@@ -957,6 +958,7 @@ public class CassandraServer implements 
             Collection<CFMetaData> cfDefs = new 
ArrayList<CFMetaData>(ks_def.cf_defs.size());
             for (CfDef cf_def : ks_def.cf_defs)
             {
+                cf_def.unsetId(); // explicitly ignore any id set by client 
(same as system_add_column_family)
                 CFMetaData.addDefaultIndexNames(cf_def);
                 ThriftValidation.validateCfDef(cf_def, null);
                 cfDefs.add(CFMetaData.fromThrift(cf_def));