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

Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/10/02 17:31:13 UTC

svn commit: r1003814 - /cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java

Author: jbellis
Date: Sat Oct  2 15:31:13 2010
New Revision: 1003814

URL: http://svn.apache.org/viewvc?rev=1003814&view=rev
Log:
revert code intended for 1532 committed prematurely

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java?rev=1003814&r1=1003813&r2=1003814&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java Sat Oct  2 15:31:13 2010
@@ -51,6 +51,10 @@ public class UpdateColumnFamily extends 
         this.oldCfm = oldCfm;
         this.newCfm = newCfm;
         
+        // we'll allow this eventually.
+        if (!oldCfm.column_metadata.equals(newCfm.column_metadata))
+            throw new ConfigurationException("Column meta information is not identical.");
+        
         // clone ksm but include the new cf def.
         KSMetaData newKsm = makeNewKeyspaceDefinition(ksm);
         rm = Migration.makeDefinitionMutation(newKsm, null, newVersion);