You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/04/20 18:02:20 UTC

svn commit: r935972 - in /cassandra/trunk: src/java/org/apache/cassandra/db/migration/Migration.java test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java

Author: gdusbabek
Date: Tue Apr 20 16:02:20 2010
New Revision: 935972

URL: http://svn.apache.org/viewvc?rev=935972&view=rev
Log:
include all keyspaces when creating the schema migration. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-995

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java
    cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java?rev=935972&r1=935971&r2=935972&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java Tue Apr 20 16:02:20 2010
@@ -18,12 +18,14 @@
 
 package org.apache.cassandra.db.migration;
 
+import org.apache.cassandra.concurrent.StageManager;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.CompactionManager;
 import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.db.DefsTable;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.RowMutation;
 import org.apache.cassandra.db.Table;
@@ -38,6 +40,8 @@ import org.apache.cassandra.service.Migr
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.UUIDGen;
 import static org.apache.cassandra.utils.FBUtilities.UTF8;
+
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -189,6 +193,15 @@ public abstract class Migration
             rm.delete(new QueryPath(SCHEMA_CF, null, remove.name.getBytes()), System.currentTimeMillis());
         if (add != null)
             rm.add(new QueryPath(SCHEMA_CF, null, add.name.getBytes()), KSMetaData.serialize(add), now);
+        
+        // include all other key spaces.
+        for (String tableName : DatabaseDescriptor.getNonSystemTables())
+        {
+            if (add != null && add.name.equals(tableName) || remove != null && remove.name.equals(tableName))
+                continue;
+            KSMetaData ksm = DatabaseDescriptor.getTableDefinition(tableName);
+            rm.add(new QueryPath(SCHEMA_CF, null, ksm.name.getBytes()), KSMetaData.serialize(ksm), now);
+        }
         return rm;
     }
     

Modified: cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java?rev=935972&r1=935971&r2=935972&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java Tue Apr 20 16:02:20 2010
@@ -19,10 +19,16 @@
 package org.apache.cassandra.config;
 
 import static org.junit.Assert.assertNotNull;
+
+import org.apache.cassandra.db.DefsTable;
+import org.apache.cassandra.db.migration.AddKeyspace;
+import org.apache.cassandra.db.migration.Migration;
+import org.apache.cassandra.locator.RackAwareStrategy;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.UUID;
 
 public class DatabaseDescriptorTest
 {
@@ -60,4 +66,32 @@ public class DatabaseDescriptorTest
             assert ksmDupe.equals(ksm);
         }
     }
+    
+    // this came as a result of CASSANDRA-995
+    @Test
+    public void testTransKsMigration() throws IOException, ConfigurationException
+    {
+        DatabaseDescriptor.loadSchemas();
+        assert DatabaseDescriptor.getNonSystemTables().size() == 0;
+        
+        // add a few.
+        AddKeyspace ks0 = new AddKeyspace(new KSMetaData("ks0", RackAwareStrategy.class, 3));
+        ks0.apply();
+        AddKeyspace ks1 = new AddKeyspace(new KSMetaData("ks1", RackAwareStrategy.class, 3));
+        ks1.apply();
+        
+        assert DatabaseDescriptor.getTableDefinition("ks0") != null;
+        assert DatabaseDescriptor.getTableDefinition("ks1") != null;
+        
+        DatabaseDescriptor.clearTableDefinition(DatabaseDescriptor.getTableDefinition("ks0"), new UUID(4096, 0));
+        DatabaseDescriptor.clearTableDefinition(DatabaseDescriptor.getTableDefinition("ks1"), new UUID(4096, 0));
+        
+        assert DatabaseDescriptor.getTableDefinition("ks0") == null;
+        assert DatabaseDescriptor.getTableDefinition("ks1") == null;
+        
+        DatabaseDescriptor.loadSchemas();
+        
+        assert DatabaseDescriptor.getTableDefinition("ks0") != null;
+        assert DatabaseDescriptor.getTableDefinition("ks1") != null;
+    }
 }