Author: gdusbabek
Date: Tue Aug 17 21:43:20 2010
New Revision: 986499
URL: http://svn.apache.org/viewvc?rev=986499&view=rev
Log:
fix max id after adding a column family. patch by gdusbabek, reviewed by
stuhood. CASSANDRA-1403
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=986499&r1=986498&r2=986499&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Aug 17 21:43:20 2010
@@ -14,6 +14,7 @@ dev
* fix race condition leaving to FileNotFoundException (CASSANDRA-1382)
* fix sharded lock hash on index write path (CASSANDRA-1402)
* add support for GT/E, LT/E in subordinate index clauses (CASSANDRA-1401)
+ * cfId counter got out of sync when CFs were added (CASSANDRA-1403)
0.7-beta1
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java?rev=986499&r1=986498&r2=986499&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
Tue Aug 17 21:43:20 2010
@@ -83,6 +83,8 @@ public class AddColumnFamily extends Mig
}
Table.open(cfm.tableName); // make sure it's init-ed w/ the old
definitions first, since we're going to call initCf on the new one manually
DatabaseDescriptor.setTableDefinition(ksm, newVersion);
+ // these definitions could have come from somewhere else.
+ CFMetaData.fixMaxId();
if (!clientMode)
Table.open(ksm.name).initCf(cfm.cfId, cfm.cfName);
