cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/7] Add type information to new schema_ columnfamilies and remove thrift validation
Date Tue, 13 Mar 2012 13:10:29 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb00289/test/unit/org/apache/cassandra/config/DefsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/DefsTest.java b/test/unit/org/apache/cassandra/config/DefsTest.java
new file mode 100644
index 0000000..87e75cb
--- /dev/null
+++ b/test/unit/org/apache/cassandra/config/DefsTest.java
@@ -0,0 +1,590 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.cassandra.CleanupHelper;
+import org.apache.cassandra.Util;
+import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.filter.QueryFilter;
+import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
+import org.apache.cassandra.db.migration.AddColumnFamily;
+import org.apache.cassandra.db.migration.AddKeyspace;
+import org.apache.cassandra.db.migration.DropColumnFamily;
+import org.apache.cassandra.db.migration.DropKeyspace;
+import org.apache.cassandra.db.migration.Migration;
+import org.apache.cassandra.db.migration.UpdateColumnFamily;
+import org.apache.cassandra.db.migration.UpdateKeyspace;
+import org.apache.cassandra.gms.Gossiper;
+import org.apache.cassandra.io.sstable.Component;
+import org.apache.cassandra.io.sstable.Descriptor;
+import org.apache.cassandra.io.sstable.SSTableDeletingTask;
+import org.apache.cassandra.locator.OldNetworkTopologyStrategy;
+import org.apache.cassandra.locator.SimpleStrategy;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.ColumnDef;
+import org.apache.cassandra.thrift.IndexType;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class DefsTest extends CleanupHelper
+{
+    @BeforeClass
+    public static void startGossiper()
+    {
+        Gossiper.instance.start((int) (System.currentTimeMillis() / 1000));
+    }
+
+    @AfterClass
+    public static void stopGossiper()
+    {
+        Gossiper.instance.stop();
+    }
+
+    @Test
+    public void ensureStaticCFMIdsAreLessThan1000()
+    {
+        assert CFMetaData.StatusCf.cfId == 0;
+        assert CFMetaData.HintsCf.cfId == 1;
+        assert CFMetaData.MigrationsCf.cfId == 2;
+        assert CFMetaData.SchemaCf.cfId == 3;
+    }
+
+    @Test
+    public void testCFMetaDataApply() throws ConfigurationException
+    {
+        Map<ByteBuffer, ColumnDefinition> indexes = new HashMap<ByteBuffer, ColumnDefinition>();
+        for (int i = 0; i < 5; i++)
+        {
+            ByteBuffer name = ByteBuffer.wrap(new byte[] { (byte)i });
+            indexes.put(name, new ColumnDefinition(name, BytesType.instance, IndexType.KEYS, null, Integer.toString(i)));
+        }
+        CFMetaData cfm = new CFMetaData("Keyspace1",
+                                        "TestApplyCFM_CF",
+                                        ColumnFamilyType.Standard,
+                                        BytesType.instance,
+                                        null);
+
+        cfm.comment("No comment")
+           .readRepairChance(0.5)
+           .replicateOnWrite(false)
+           .gcGraceSeconds(100000)
+           .defaultValidator(null)
+           .minCompactionThreshold(500)
+           .maxCompactionThreshold(500)
+           .columnMetadata(indexes);
+
+        // we'll be adding this one later. make sure it's not already there.
+        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 5 })) == null;
+
+        CFMetaData cfNew = cfm.clone();
+
+        // add one.
+        ColumnDefinition addIndexDef = new ColumnDefinition(ByteBuffer.wrap(new byte[] { 5 }),
+                                                            BytesType.instance,
+                                                            IndexType.KEYS,
+                                                            null,
+                                                            "5");
+        cfNew.addColumnDefinition(addIndexDef);
+
+        // remove one.
+        ColumnDefinition removeIndexDef = new ColumnDefinition(ByteBuffer.wrap(new byte[] { 0 }),
+                                                               BytesType.instance,
+                                                               IndexType.KEYS,
+                                                               null,
+                                                               "0");
+        assert cfNew.removeColumnDefinition(removeIndexDef);
+
+        cfm.apply(cfNew);
+
+        for (int i = 1; i < indexes.size(); i++)
+            assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 1 })) != null;
+        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 0 })) == null;
+        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 5 })) != null;
+    }
+
+    @Test
+    public void testInvalidNames() throws IOException
+    {
+        String[] valid = {"1", "a", "_1", "b_", "__", "1_a"};
+        for (String s : valid)
+            assert Migration.isLegalName(s);
+
+        String[] invalid = {"b@t", "dash-y", "", " ", "dot.s", ".hidden"};
+        for (String s : invalid)
+            assert !Migration.isLegalName(s);
+    }
+
+    @Test
+    public void saveAndRestore() throws IOException
+    {
+        /*
+        // verify dump and reload.
+        UUID first = UUIDGen.makeType1UUIDFromHost(FBUtilities.getBroadcastAddress());
+        DefsTable.dumpToStorage(first);
+        List<KSMetaData> defs = new ArrayList<KSMetaData>(DefsTable.loadFromStorage(first));
+
+        assert defs.size() > 0;
+        assert defs.size() == Schema.instance.getNonSystemTables().size();
+        for (KSMetaData loaded : defs)
+        {
+            KSMetaData defined = Schema.instance.getTableDefinition(loaded.name);
+            assert defined.equals(loaded) : String.format("%s != %s", loaded, defined);
+        }
+        */
+    }
+
+    @Test
+    public void addNewCfToBogusTable() throws InterruptedException
+    {
+        CFMetaData newCf = addTestCF("MadeUpKeyspace", "NewCF", "new cf");
+        try
+        {
+            new AddColumnFamily(newCf).apply();
+            throw new AssertionError("You shouldn't be able to do anything to a keyspace that doesn't exist.");
+        }
+        catch (ConfigurationException expected)
+        {
+        }
+        catch (IOException unexpected)
+        {
+            throw new AssertionError("Unexpected exception.");
+        }
+    }
+
+    @Test
+    public void addNewCfWithNullComment() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        final String ks = "Keyspace1";
+        final String cf = "BrandNewCfWithNull";
+        KSMetaData original = Schema.instance.getTableDefinition(ks);
+
+        CFMetaData newCf = addTestCF(original.name, cf, null);
+
+        assert !Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
+        new AddColumnFamily(newCf).apply();
+
+        assert Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
+        assert Schema.instance.getTableDefinition(ks).cfMetaData().get(newCf.cfName).equals(newCf);
+    }
+
+    @Test
+    public void addNewCF() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        final String ks = "Keyspace1";
+        final String cf = "BrandNewCf";
+        KSMetaData original = Schema.instance.getTableDefinition(ks);
+
+        CFMetaData newCf = addTestCF(original.name, cf, "A New Column Family");
+
+        assert !Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
+        new AddColumnFamily(newCf).apply();
+
+        assert Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
+        assert Schema.instance.getTableDefinition(ks).cfMetaData().get(newCf.cfName).equals(newCf);
+
+        // now read and write to it.
+        DecoratedKey dk = Util.dk("key0");
+        RowMutation rm = new RowMutation(ks, dk.key);
+        rm.add(new QueryPath(cf, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
+        rm.apply();
+        ColumnFamilyStore store = Table.open(ks).getColumnFamilyStore(cf);
+        assert store != null;
+        store.forceBlockingFlush();
+
+        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(cf), ByteBufferUtil.bytes("col0")));
+        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
+        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
+        assert ByteBufferUtil.bytes("value0").equals(col.value());
+    }
+
+    @Test
+    public void dropCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        DecoratedKey dk = Util.dk("dropCf");
+        // sanity
+        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace1");
+        assert ks != null;
+        final CFMetaData cfm = ks.cfMetaData().get("Standard1");
+        assert cfm != null;
+
+        // write some data, force a flush, then verify that files exist on disk.
+        RowMutation rm = new RowMutation(ks.name, dk.key);
+        for (int i = 0; i < 100; i++)
+            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
+        rm.apply();
+        ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName);
+        assert store != null;
+        store.forceBlockingFlush();
+        store.getFlushPath(1024, Descriptor.CURRENT_VERSION);
+        assert store.directories.sstableLister().list().size() > 0;
+
+        new DropColumnFamily(ks.name, cfm.cfName).apply();
+
+        assert !Schema.instance.getTableDefinition(ks.name).cfMetaData().containsKey(cfm.cfName);
+
+        // any write should fail.
+        rm = new RowMutation(ks.name, dk.key);
+        boolean success = true;
+        try
+        {
+            rm.add(new QueryPath("Standard1", null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
+            rm.apply();
+        }
+        catch (Throwable th)
+        {
+            success = false;
+        }
+        assert !success : "This mutation should have failed since the CF no longer exists.";
+
+        // verify that the files are gone.
+        for (File file : store.directories.sstableLister().listFiles())
+        {
+            if (file.getPath().endsWith("Data.db") && !new File(file.getPath().replace("Data.db", "Compacted")).exists())
+                throw new AssertionError("undeleted file " + file);
+        }
+    }
+
+    @Test
+    public void addNewKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        DecoratedKey dk = Util.dk("key0");
+        CFMetaData newCf = addTestCF("NewKeyspace1", "AddedStandard1", "A new cf for a new ks");
+
+        KSMetaData newKs = KSMetaData.testMetadata(newCf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), newCf);
+
+        new AddKeyspace(newKs).apply();
+
+        assert Schema.instance.getTableDefinition(newCf.ksName) != null;
+        assert Schema.instance.getTableDefinition(newCf.ksName) == newKs;
+
+        // test reads and writes.
+        RowMutation rm = new RowMutation(newCf.ksName, dk.key);
+        rm.add(new QueryPath(newCf.cfName, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
+        rm.apply();
+        ColumnFamilyStore store = Table.open(newCf.ksName).getColumnFamilyStore(newCf.cfName);
+        assert store != null;
+        store.forceBlockingFlush();
+
+        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(newCf.cfName), ByteBufferUtil.bytes("col0")));
+        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
+        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
+        assert ByteBufferUtil.bytes("value0").equals(col.value());
+    }
+
+    @Test
+    public void dropKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        DecoratedKey dk = Util.dk("dropKs");
+        // sanity
+        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace1");
+        assert ks != null;
+        final CFMetaData cfm = ks.cfMetaData().get("Standard2");
+        assert cfm != null;
+
+        // write some data, force a flush, then verify that files exist on disk.
+        RowMutation rm = new RowMutation(ks.name, dk.key);
+        for (int i = 0; i < 100; i++)
+            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
+        rm.apply();
+        ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName);
+        assert store != null;
+        store.forceBlockingFlush();
+        assert store.directories.sstableLister().list().size() > 0;
+
+        new DropKeyspace(ks.name).apply();
+
+        assert Schema.instance.getTableDefinition(ks.name) == null;
+
+        // write should fail.
+        rm = new RowMutation(ks.name, dk.key);
+        boolean success = true;
+        try
+        {
+            rm.add(new QueryPath("Standard1", null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
+            rm.apply();
+        }
+        catch (Throwable th)
+        {
+            success = false;
+        }
+        assert !success : "This mutation should have failed since the CF no longer exists.";
+
+        // reads should fail too.
+        boolean threw = false;
+        try
+        {
+            Table.open(ks.name);
+        }
+        catch (Throwable th)
+        {
+            threw = true;
+        }
+        assert threw;
+    }
+
+    @Test
+    public void dropKSUnflushed() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        DecoratedKey dk = Util.dk("dropKs");
+        // sanity
+        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace3");
+        assert ks != null;
+        final CFMetaData cfm = ks.cfMetaData().get("Standard1");
+        assert cfm != null;
+
+        // write some data
+        RowMutation rm = new RowMutation(ks.name, dk.key);
+        for (int i = 0; i < 100; i++)
+            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
+        rm.apply();
+
+        new DropKeyspace(ks.name).apply();
+
+        assert Schema.instance.getTableDefinition(ks.name) == null;
+    }
+
+    @Test
+    public void createEmptyKsAddNewCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        assert Schema.instance.getTableDefinition("EmptyKeyspace") == null;
+
+        KSMetaData newKs = KSMetaData.testMetadata("EmptyKeyspace", SimpleStrategy.class, KSMetaData.optsWithRF(5));
+
+        new AddKeyspace(newKs).apply();
+        assert Schema.instance.getTableDefinition("EmptyKeyspace") != null;
+
+        CFMetaData newCf = addTestCF("EmptyKeyspace", "AddedLater", "A new CF to add to an empty KS");
+
+        //should not exist until apply
+        assert !Schema.instance.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
+
+        //add the new CF to the empty space
+        new AddColumnFamily(newCf).apply();
+
+        assert Schema.instance.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
+        assert Schema.instance.getTableDefinition(newKs.name).cfMetaData().get(newCf.cfName).equals(newCf);
+
+        // now read and write to it.
+        DecoratedKey dk = Util.dk("key0");
+        RowMutation rm = new RowMutation(newKs.name, dk.key);
+        rm.add(new QueryPath(newCf.cfName, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
+        rm.apply();
+        ColumnFamilyStore store = Table.open(newKs.name).getColumnFamilyStore(newCf.cfName);
+        assert store != null;
+        store.forceBlockingFlush();
+
+        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(newCf.cfName), ByteBufferUtil.bytes("col0")));
+        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
+        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
+        assert ByteBufferUtil.bytes("value0").equals(col.value());
+    }
+
+    @Test
+    public void testUpdateKeyspace() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        // create a keyspace to serve as existing.
+        CFMetaData cf = addTestCF("UpdatedKeyspace", "AddedStandard1", "A new cf for a new ks");
+        KSMetaData oldKs = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), cf);
+
+        new AddKeyspace(oldKs).apply();
+
+        assert Schema.instance.getTableDefinition(cf.ksName) != null;
+        assert Schema.instance.getTableDefinition(cf.ksName) == oldKs;
+
+        // anything with cf defs should fail.
+        CFMetaData cf2 = addTestCF(cf.ksName, "AddedStandard2", "A new cf for a new ks");
+        KSMetaData newBadKs = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(4), cf2);
+        try
+        {
+            new UpdateKeyspace(newBadKs).apply();
+            throw new AssertionError("Should not have been able to update a KS with a KS that described column families.");
+        }
+        catch (ConfigurationException ex)
+        {
+            // expected.
+        }
+
+        // names should match.
+        KSMetaData newBadKs2 = KSMetaData.testMetadata(cf.ksName + "trash", SimpleStrategy.class, KSMetaData.optsWithRF(4));
+        try
+        {
+            new UpdateKeyspace(newBadKs2).apply();
+            throw new AssertionError("Should not have been able to update a KS with an invalid KS name.");
+        }
+        catch (ConfigurationException ex)
+        {
+            // expected.
+        }
+
+        KSMetaData newKs = KSMetaData.testMetadata(cf.ksName, OldNetworkTopologyStrategy.class, KSMetaData.optsWithRF(1));
+        new UpdateKeyspace(newKs).apply();
+
+        KSMetaData newFetchedKs = Schema.instance.getKSMetaData(newKs.name);
+        assert newFetchedKs.strategyClass.equals(newKs.strategyClass);
+        assert !newFetchedKs.strategyClass.equals(oldKs.strategyClass);
+    }
+
+    @Test
+    public void testUpdateColumnFamilyNoIndexes() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    {
+        // create a keyspace with a cf to update.
+        CFMetaData cf = addTestCF("UpdatedCfKs", "Standard1added", "A new cf that will be updated");
+        KSMetaData ksm = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(1), cf);
+        new AddKeyspace(ksm).apply();
+
+        assert Schema.instance.getTableDefinition(cf.ksName) != null;
+        assert Schema.instance.getTableDefinition(cf.ksName) == ksm;
+        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName) != null;
+
+        // updating certain fields should fail.
+        CFMetaData newCfm = cf.clone();
+        newCfm.columnMetadata(new HashMap<ByteBuffer, ColumnDefinition>());
+        newCfm.defaultValidator(BytesType.instance);
+        newCfm.minCompactionThreshold(5);
+        newCfm.maxCompactionThreshold(31);
+
+        // test valid operations.
+        newCfm.comment("Modified comment");
+        new UpdateColumnFamily(newCfm).apply(); // doesn't get set back here.
+
+        newCfm.readRepairChance(0.23);
+        new UpdateColumnFamily(newCfm).apply();
+
+        newCfm.gcGraceSeconds(12);
+        new UpdateColumnFamily(newCfm).apply();
+
+        newCfm.defaultValidator(UTF8Type.instance);
+        new UpdateColumnFamily(newCfm).apply();
+
+        newCfm.minCompactionThreshold(3);
+        new UpdateColumnFamily(newCfm).apply();
+
+        newCfm.maxCompactionThreshold(33);
+        new UpdateColumnFamily(newCfm).apply();
+
+        // can't test changing the reconciler because there is only one impl.
+
+        // check the cumulative affect.
+        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getComment().equals(newCfm.getComment());
+        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getReadRepairChance() == newCfm.getReadRepairChance();
+        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getGcGraceSeconds() == newCfm.getGcGraceSeconds();
+        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getDefaultValidator() == UTF8Type.instance;
+
+        // Change cfId
+        newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType, cf.comparator, cf.subcolumnComparator, cf.cfId + 1);
+        CFMetaData.copyOpts(newCfm, cf);
+        try
+        {
+            cf.apply(newCfm);
+            throw new AssertionError("Should have blown up when you used a different id.");
+        }
+        catch (ConfigurationException expected) {}
+
+        // Change cfName
+        newCfm = new CFMetaData(cf.ksName, cf.cfName + "_renamed", cf.cfType, cf.comparator, cf.subcolumnComparator, cf.cfId);
+        CFMetaData.copyOpts(newCfm, cf);
+        try
+        {
+            cf.apply(newCfm);
+            throw new AssertionError("Should have blown up when you used a different name.");
+        }
+        catch (ConfigurationException expected) {}
+
+        // Change ksName
+        newCfm = new CFMetaData(cf.ksName + "_renamed", cf.cfName, cf.cfType, cf.comparator, cf.subcolumnComparator, cf.cfId);
+        CFMetaData.copyOpts(newCfm, cf);
+        try
+        {
+            cf.apply(newCfm);
+            throw new AssertionError("Should have blown up when you used a different keyspace.");
+        }
+        catch (ConfigurationException expected) {}
+
+        // Change cf type
+        newCfm = new CFMetaData(cf.ksName, cf.cfName, ColumnFamilyType.Super, cf.comparator, cf.subcolumnComparator, cf.cfId);
+        CFMetaData.copyOpts(newCfm, cf);
+        try
+        {
+            cf.apply(newCfm);
+            throw new AssertionError("Should have blwon up when you used a different cf type.");
+        }
+        catch (ConfigurationException expected) {}
+
+        // Change comparator
+        newCfm = new CFMetaData(cf.ksName, cf.cfName, cf.cfType, TimeUUIDType.instance, cf.subcolumnComparator, cf.cfId);
+        CFMetaData.copyOpts(newCfm, cf);
+        try
+        {
+            cf.apply(newCfm);
+            throw new AssertionError("Should have blown up when you used a different comparator.");
+        }
+        catch (ConfigurationException expected) {}
+    }
+
+    @Test
+    public void testDropIndex() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    {
+        // persist keyspace definition in the system table
+        Schema.instance.getKSMetaData("Keyspace6").toSchema(System.currentTimeMillis()).apply();
+
+        // insert some data.  save the sstable descriptor so we can make sure it's marked for delete after the drop
+        RowMutation rm = new RowMutation("Keyspace6", ByteBufferUtil.bytes("k1"));
+        rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("notbirthdate")), ByteBufferUtil.bytes(1L), 0);
+        rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 0);
+        rm.apply();
+        ColumnFamilyStore cfs = Table.open("Keyspace6").getColumnFamilyStore("Indexed1");
+        cfs.forceBlockingFlush();
+        ColumnFamilyStore indexedCfs = cfs.indexManager.getIndexForColumn(cfs.indexManager.getIndexedColumns().iterator().next()).getIndexCfs();
+        Descriptor desc = indexedCfs.getSSTables().iterator().next().descriptor;
+
+        // drop the index
+        CFMetaData meta = cfs.metadata.clone();
+        ColumnDefinition cdOld = meta.getColumn_metadata().values().iterator().next();
+        ColumnDefinition cdNew = new ColumnDefinition(cdOld.name, cdOld.getValidator(), null, null, null);
+        meta.columnMetadata(Collections.singletonMap(cdOld.name, cdNew));
+        UpdateColumnFamily update = new UpdateColumnFamily(meta);
+        update.apply();
+
+        // check
+        assert cfs.indexManager.getIndexedColumns().isEmpty();
+        SSTableDeletingTask.waitForDeletions();
+        assert !new File(desc.filenameFor(Component.DATA)).exists();
+    }
+
+    private CFMetaData addTestCF(String ks, String cf, String comment)
+    {
+        CFMetaData newCFMD = new CFMetaData(ks, cf, ColumnFamilyType.Standard, UTF8Type.instance, null);
+        newCFMD.comment(comment)
+               .readRepairChance(0.0);
+
+        return newCFMD;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb00289/test/unit/org/apache/cassandra/db/DefsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DefsTest.java b/test/unit/org/apache/cassandra/db/DefsTest.java
deleted file mode 100644
index 6fb8a01..0000000
--- a/test/unit/org/apache/cassandra/db/DefsTest.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.db;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-
-import org.apache.cassandra.CleanupHelper;
-import org.apache.cassandra.Util;
-import org.apache.cassandra.config.*;
-import org.apache.cassandra.db.filter.QueryFilter;
-import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.db.marshal.BytesType;
-import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.db.marshal.TimeUUIDType;
-import org.apache.cassandra.db.migration.AddColumnFamily;
-import org.apache.cassandra.db.migration.AddKeyspace;
-import org.apache.cassandra.db.migration.DropColumnFamily;
-import org.apache.cassandra.db.migration.DropKeyspace;
-import org.apache.cassandra.db.migration.Migration;
-import org.apache.cassandra.db.migration.UpdateColumnFamily;
-import org.apache.cassandra.db.migration.UpdateKeyspace;
-import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.io.sstable.Component;
-import org.apache.cassandra.io.sstable.Descriptor;
-import org.apache.cassandra.io.sstable.SSTableDeletingTask;
-import org.apache.cassandra.locator.OldNetworkTopologyStrategy;
-import org.apache.cassandra.locator.SimpleStrategy;
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.ColumnDef;
-import org.apache.cassandra.thrift.IndexType;
-import org.apache.cassandra.utils.ByteBufferUtil;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class DefsTest extends CleanupHelper
-{
-    @BeforeClass
-    public static void startGossiper()
-    {
-        Gossiper.instance.start((int) (System.currentTimeMillis() / 1000));
-    }
-
-    @AfterClass
-    public static void stopGossiper()
-    {
-        Gossiper.instance.stop();
-    }
-
-    @Test
-    public void ensureStaticCFMIdsAreLessThan1000()
-    {
-        assert CFMetaData.StatusCf.cfId == 0;
-        assert CFMetaData.HintsCf.cfId == 1;
-        assert CFMetaData.MigrationsCf.cfId == 2;
-        assert CFMetaData.SchemaCf.cfId == 3;
-    }
-
-    @Test
-    public void testCFMetaDataApply() throws ConfigurationException
-    {
-        Map<ByteBuffer, ColumnDefinition> indexes = new HashMap<ByteBuffer, ColumnDefinition>();
-        for (int i = 0; i < 5; i++)
-        {
-            ByteBuffer name = ByteBuffer.wrap(new byte[] { (byte)i });
-            indexes.put(name, new ColumnDefinition(name, BytesType.instance, IndexType.KEYS, null, Integer.toString(i)));
-        }
-        CFMetaData cfm = new CFMetaData("Keyspace1",
-                                        "TestApplyCFM_CF",
-                                        ColumnFamilyType.Standard,
-                                        BytesType.instance,
-                                        null);
-
-        cfm.comment("No comment")
-           .readRepairChance(0.5)
-           .replicateOnWrite(false)
-           .gcGraceSeconds(100000)
-           .defaultValidator(null)
-           .minCompactionThreshold(500)
-           .maxCompactionThreshold(500)
-           .columnMetadata(indexes);
-
-        // we'll be adding this one later. make sure it's not already there.
-        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 5 })) == null;
-        CfDef cfDef = cfm.toThrift();
-
-        // add one.
-        ColumnDef addIndexDef = new ColumnDef();
-        addIndexDef.index_name = "5";
-        addIndexDef.index_type = IndexType.KEYS;
-        addIndexDef.name = ByteBuffer.wrap(new byte[] { 5 });
-        addIndexDef.validation_class = BytesType.class.getName();
-        cfDef.column_metadata.add(addIndexDef);
-
-        // remove one.
-        ColumnDef removeIndexDef = new ColumnDef();
-        removeIndexDef.index_name = "0";
-        removeIndexDef.index_type = IndexType.KEYS;
-        removeIndexDef.name = ByteBuffer.wrap(new byte[] { 0 });
-        removeIndexDef.validation_class = BytesType.class.getName();
-        assert cfDef.column_metadata.remove(removeIndexDef);
-
-        cfm.apply(cfDef);
-
-        for (int i = 1; i < indexes.size(); i++)
-            assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 1 })) != null;
-        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 0 })) == null;
-        assert cfm.getColumn_metadata().get(ByteBuffer.wrap(new byte[] { 5 })) != null;
-    }
-
-    @Test
-    public void testInvalidNames() throws IOException
-    {
-        String[] valid = {"1", "a", "_1", "b_", "__", "1_a"};
-        for (String s : valid)
-            assert Migration.isLegalName(s);
-
-        String[] invalid = {"b@t", "dash-y", "", " ", "dot.s", ".hidden"};
-        for (String s : invalid)
-            assert !Migration.isLegalName(s);
-    }
-
-    @Test
-    public void saveAndRestore() throws IOException
-    {
-        /*
-        // verify dump and reload.
-        UUID first = UUIDGen.makeType1UUIDFromHost(FBUtilities.getBroadcastAddress());
-        DefsTable.dumpToStorage(first);
-        List<KSMetaData> defs = new ArrayList<KSMetaData>(DefsTable.loadFromStorage(first));
-
-        assert defs.size() > 0;
-        assert defs.size() == Schema.instance.getNonSystemTables().size();
-        for (KSMetaData loaded : defs)
-        {
-            KSMetaData defined = Schema.instance.getTableDefinition(loaded.name);
-            assert defined.equals(loaded) : String.format("%s != %s", loaded, defined);
-        }
-        */
-    }
-
-    @Test
-    public void addNewCfToBogusTable() throws InterruptedException
-    {
-        CFMetaData newCf = addTestCF("MadeUpKeyspace", "NewCF", "new cf");
-        try
-        {
-            new AddColumnFamily(newCf).apply();
-            throw new AssertionError("You shouldn't be able to do anything to a keyspace that doesn't exist.");
-        }
-        catch (ConfigurationException expected)
-        {
-        }
-        catch (IOException unexpected)
-        {
-            throw new AssertionError("Unexpected exception.");
-        }
-    }
-
-    @Test
-    public void addNewCfWithNullComment() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        final String ks = "Keyspace1";
-        final String cf = "BrandNewCfWithNull";
-        KSMetaData original = Schema.instance.getTableDefinition(ks);
-
-        CFMetaData newCf = addTestCF(original.name, cf, null);
-
-        assert !Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
-        new AddColumnFamily(newCf).apply();
-
-        assert Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
-        assert Schema.instance.getTableDefinition(ks).cfMetaData().get(newCf.cfName).equals(newCf);
-    }
-
-    @Test
-    public void addNewCF() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        final String ks = "Keyspace1";
-        final String cf = "BrandNewCf";
-        KSMetaData original = Schema.instance.getTableDefinition(ks);
-
-        CFMetaData newCf = addTestCF(original.name, cf, "A New Column Family");
-
-        assert !Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
-        new AddColumnFamily(newCf).apply();
-
-        assert Schema.instance.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
-        assert Schema.instance.getTableDefinition(ks).cfMetaData().get(newCf.cfName).equals(newCf);
-
-        // now read and write to it.
-        DecoratedKey dk = Util.dk("key0");
-        RowMutation rm = new RowMutation(ks, dk.key);
-        rm.add(new QueryPath(cf, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
-        rm.apply();
-        ColumnFamilyStore store = Table.open(ks).getColumnFamilyStore(cf);
-        assert store != null;
-        store.forceBlockingFlush();
-
-        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(cf), ByteBufferUtil.bytes("col0")));
-        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
-        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
-        assert ByteBufferUtil.bytes("value0").equals(col.value());
-    }
-
-    @Test
-    public void dropCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        DecoratedKey dk = Util.dk("dropCf");
-        // sanity
-        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace1");
-        assert ks != null;
-        final CFMetaData cfm = ks.cfMetaData().get("Standard1");
-        assert cfm != null;
-
-        // write some data, force a flush, then verify that files exist on disk.
-        RowMutation rm = new RowMutation(ks.name, dk.key);
-        for (int i = 0; i < 100; i++)
-            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
-        rm.apply();
-        ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName);
-        assert store != null;
-        store.forceBlockingFlush();
-        store.getFlushPath(1024, Descriptor.CURRENT_VERSION);
-        assert store.directories.sstableLister().list().size() > 0;
-
-        new DropColumnFamily(ks.name, cfm.cfName).apply();
-
-        assert !Schema.instance.getTableDefinition(ks.name).cfMetaData().containsKey(cfm.cfName);
-
-        // any write should fail.
-        rm = new RowMutation(ks.name, dk.key);
-        boolean success = true;
-        try
-        {
-            rm.add(new QueryPath("Standard1", null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
-            rm.apply();
-        }
-        catch (Throwable th)
-        {
-            success = false;
-        }
-        assert !success : "This mutation should have failed since the CF no longer exists.";
-
-        // verify that the files are gone.
-        for (File file : store.directories.sstableLister().listFiles())
-        {
-            if (file.getPath().endsWith("Data.db") && !new File(file.getPath().replace("Data.db", "Compacted")).exists())
-                throw new AssertionError("undeleted file " + file);
-        }
-    }
-
-    @Test
-    public void addNewKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        DecoratedKey dk = Util.dk("key0");
-        CFMetaData newCf = addTestCF("NewKeyspace1", "AddedStandard1", "A new cf for a new ks");
-
-        KSMetaData newKs = KSMetaData.testMetadata(newCf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), newCf);
-
-        new AddKeyspace(newKs).apply();
-
-        assert Schema.instance.getTableDefinition(newCf.ksName) != null;
-        assert Schema.instance.getTableDefinition(newCf.ksName) == newKs;
-
-        // test reads and writes.
-        RowMutation rm = new RowMutation(newCf.ksName, dk.key);
-        rm.add(new QueryPath(newCf.cfName, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
-        rm.apply();
-        ColumnFamilyStore store = Table.open(newCf.ksName).getColumnFamilyStore(newCf.cfName);
-        assert store != null;
-        store.forceBlockingFlush();
-
-        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(newCf.cfName), ByteBufferUtil.bytes("col0")));
-        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
-        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
-        assert ByteBufferUtil.bytes("value0").equals(col.value());
-    }
-
-    @Test
-    public void dropKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        DecoratedKey dk = Util.dk("dropKs");
-        // sanity
-        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace1");
-        assert ks != null;
-        final CFMetaData cfm = ks.cfMetaData().get("Standard2");
-        assert cfm != null;
-
-        // write some data, force a flush, then verify that files exist on disk.
-        RowMutation rm = new RowMutation(ks.name, dk.key);
-        for (int i = 0; i < 100; i++)
-            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
-        rm.apply();
-        ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName);
-        assert store != null;
-        store.forceBlockingFlush();
-        assert store.directories.sstableLister().list().size() > 0;
-
-        new DropKeyspace(ks.name).apply();
-
-        assert Schema.instance.getTableDefinition(ks.name) == null;
-
-        // write should fail.
-        rm = new RowMutation(ks.name, dk.key);
-        boolean success = true;
-        try
-        {
-            rm.add(new QueryPath("Standard1", null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
-            rm.apply();
-        }
-        catch (Throwable th)
-        {
-            success = false;
-        }
-        assert !success : "This mutation should have failed since the CF no longer exists.";
-
-        // reads should fail too.
-        boolean threw = false;
-        try
-        {
-            Table.open(ks.name);
-        }
-        catch (Throwable th)
-        {
-            threw = true;
-        }
-        assert threw;
-    }
-
-    @Test
-    public void dropKSUnflushed() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        DecoratedKey dk = Util.dk("dropKs");
-        // sanity
-        final KSMetaData ks = Schema.instance.getTableDefinition("Keyspace3");
-        assert ks != null;
-        final CFMetaData cfm = ks.cfMetaData().get("Standard1");
-        assert cfm != null;
-
-        // write some data
-        RowMutation rm = new RowMutation(ks.name, dk.key);
-        for (int i = 0; i < 100; i++)
-            rm.add(new QueryPath(cfm.cfName, null, ByteBufferUtil.bytes(("col" + i))), ByteBufferUtil.bytes("anyvalue"), 1L);
-        rm.apply();
-
-        new DropKeyspace(ks.name).apply();
-
-        assert Schema.instance.getTableDefinition(ks.name) == null;
-    }
-
-    @Test
-    public void createEmptyKsAddNewCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        assert Schema.instance.getTableDefinition("EmptyKeyspace") == null;
-
-        KSMetaData newKs = KSMetaData.testMetadata("EmptyKeyspace", SimpleStrategy.class, KSMetaData.optsWithRF(5));
-
-        new AddKeyspace(newKs).apply();
-        assert Schema.instance.getTableDefinition("EmptyKeyspace") != null;
-
-        CFMetaData newCf = addTestCF("EmptyKeyspace", "AddedLater", "A new CF to add to an empty KS");
-
-        //should not exist until apply
-        assert !Schema.instance.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
-
-        //add the new CF to the empty space
-        new AddColumnFamily(newCf).apply();
-
-        assert Schema.instance.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
-        assert Schema.instance.getTableDefinition(newKs.name).cfMetaData().get(newCf.cfName).equals(newCf);
-
-        // now read and write to it.
-        DecoratedKey dk = Util.dk("key0");
-        RowMutation rm = new RowMutation(newKs.name, dk.key);
-        rm.add(new QueryPath(newCf.cfName, null, ByteBufferUtil.bytes("col0")), ByteBufferUtil.bytes("value0"), 1L);
-        rm.apply();
-        ColumnFamilyStore store = Table.open(newKs.name).getColumnFamilyStore(newCf.cfName);
-        assert store != null;
-        store.forceBlockingFlush();
-
-        ColumnFamily cfam = store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(newCf.cfName), ByteBufferUtil.bytes("col0")));
-        assert cfam.getColumn(ByteBufferUtil.bytes("col0")) != null;
-        IColumn col = cfam.getColumn(ByteBufferUtil.bytes("col0"));
-        assert ByteBufferUtil.bytes("value0").equals(col.value());
-    }
-
-    @Test
-    public void testUpdateKeyspace() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        // create a keyspace to serve as existing.
-        CFMetaData cf = addTestCF("UpdatedKeyspace", "AddedStandard1", "A new cf for a new ks");
-        KSMetaData oldKs = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(5), cf);
-
-        new AddKeyspace(oldKs).apply();
-
-        assert Schema.instance.getTableDefinition(cf.ksName) != null;
-        assert Schema.instance.getTableDefinition(cf.ksName) == oldKs;
-
-        // anything with cf defs should fail.
-        CFMetaData cf2 = addTestCF(cf.ksName, "AddedStandard2", "A new cf for a new ks");
-        KSMetaData newBadKs = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(4), cf2);
-        try
-        {
-            new UpdateKeyspace(newBadKs.toThrift()).apply();
-            throw new AssertionError("Should not have been able to update a KS with a KS that described column families.");
-        }
-        catch (ConfigurationException ex)
-        {
-            // expected.
-        }
-
-        // names should match.
-        KSMetaData newBadKs2 = KSMetaData.testMetadata(cf.ksName + "trash", SimpleStrategy.class, KSMetaData.optsWithRF(4));
-        try
-        {
-            new UpdateKeyspace(newBadKs2.toThrift()).apply();
-            throw new AssertionError("Should not have been able to update a KS with an invalid KS name.");
-        }
-        catch (ConfigurationException ex)
-        {
-            // expected.
-        }
-
-        KSMetaData newKs = KSMetaData.testMetadata(cf.ksName, OldNetworkTopologyStrategy.class, KSMetaData.optsWithRF(1));
-        new UpdateKeyspace(newKs.toThrift()).apply();
-
-        KSMetaData newFetchedKs = Schema.instance.getKSMetaData(newKs.name);
-        assert newFetchedKs.strategyClass.equals(newKs.strategyClass);
-        assert !newFetchedKs.strategyClass.equals(oldKs.strategyClass);
-    }
-
-    @Test
-    public void testUpdateColumnFamilyNoIndexes() throws ConfigurationException, IOException, ExecutionException, InterruptedException
-    {
-        // create a keyspace with a cf to update.
-        CFMetaData cf = addTestCF("UpdatedCfKs", "Standard1added", "A new cf that will be updated");
-        KSMetaData ksm = KSMetaData.testMetadata(cf.ksName, SimpleStrategy.class, KSMetaData.optsWithRF(1), cf);
-        new AddKeyspace(ksm).apply();
-
-        assert Schema.instance.getTableDefinition(cf.ksName) != null;
-        assert Schema.instance.getTableDefinition(cf.ksName) == ksm;
-        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName) != null;
-
-        // updating certain fields should fail.
-        CfDef cf_def = cf.toThrift();
-        cf_def.column_metadata = new ArrayList<ColumnDef>();
-        cf_def.default_validation_class ="BytesType";
-        cf_def.min_compaction_threshold = 5;
-        cf_def.max_compaction_threshold = 31;
-
-        // test valid operations.
-        cf_def.comment = "Modified comment";
-        new UpdateColumnFamily(cf_def).apply(); // doesn't get set back here.
-
-        cf_def.read_repair_chance = 0.23;
-        new UpdateColumnFamily(cf_def).apply();
-
-        cf_def.gc_grace_seconds = 12;
-        new UpdateColumnFamily(cf_def).apply();
-
-        cf_def.default_validation_class = "UTF8Type";
-        new UpdateColumnFamily(cf_def).apply();
-
-        cf_def.min_compaction_threshold = 3;
-        new UpdateColumnFamily(cf_def).apply();
-
-        cf_def.max_compaction_threshold = 33;
-        new UpdateColumnFamily(cf_def).apply();
-
-        // can't test changing the reconciler because there is only one impl.
-
-        // check the cumulative affect.
-        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getComment().equals(cf_def.comment);
-        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getReadRepairChance() == cf_def.read_repair_chance;
-        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getGcGraceSeconds() == cf_def.gc_grace_seconds;
-        assert Schema.instance.getCFMetaData(cf.ksName, cf.cfName).getDefaultValidator() == UTF8Type.instance;
-
-        // todo: we probably don't need to reset old values in the catches anymore.
-        // make sure some invalid operations fail.
-        int oldId = cf_def.id;
-        try
-        {
-            cf_def.id++;
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when you used a different id.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.id = oldId;
-        }
-
-        String oldStr = cf_def.name;
-        try
-        {
-            cf_def.name = cf_def.name + "_renamed";
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when you used a different name.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.name = oldStr;
-        }
-
-        oldStr = cf_def.keyspace;
-        try
-        {
-            cf_def.keyspace = oldStr + "_renamed";
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when you used a different keyspace.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.keyspace = oldStr;
-        }
-
-        try
-        {
-            cf_def.column_type = ColumnFamilyType.Super.name();
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blwon up when you used a different cf type.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.column_type = ColumnFamilyType.Standard.name();
-        }
-
-        oldStr = cf_def.comparator_type;
-        try
-        {
-            cf_def.comparator_type = TimeUUIDType.class.getSimpleName();
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when you used a different comparator.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.comparator_type = UTF8Type.class.getSimpleName();
-        }
-
-        try
-        {
-            cf_def.min_compaction_threshold = 34;
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when min > max.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.min_compaction_threshold = 3;
-        }
-
-        try
-        {
-            cf_def.max_compaction_threshold = 2;
-            cf.apply(cf_def);
-            throw new AssertionError("Should have blown up when max > min.");
-        }
-        catch (ConfigurationException expected)
-        {
-            cf_def.max_compaction_threshold = 33;
-        }
-    }
-
-    @Test
-    public void testDropIndex() throws IOException, ExecutionException, InterruptedException, ConfigurationException
-    {
-        // persist keyspace definition in the system table
-        Schema.instance.getKSMetaData("Keyspace6").toSchema(System.currentTimeMillis()).apply();
-
-        // insert some data.  save the sstable descriptor so we can make sure it's marked for delete after the drop
-        RowMutation rm = new RowMutation("Keyspace6", ByteBufferUtil.bytes("k1"));
-        rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("notbirthdate")), ByteBufferUtil.bytes(1L), 0);
-        rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(1L), 0);
-        rm.apply();
-        ColumnFamilyStore cfs = Table.open("Keyspace6").getColumnFamilyStore("Indexed1");
-        cfs.forceBlockingFlush();
-        ColumnFamilyStore indexedCfs = cfs.indexManager.getIndexForColumn(cfs.indexManager.getIndexedColumns().iterator().next()).getIndexCfs();
-        Descriptor desc = indexedCfs.getSSTables().iterator().next().descriptor;
-
-        // drop the index
-        CFMetaData meta = CFMetaData.rename(cfs.metadata, cfs.metadata.cfName); // abusing rename to clone
-        ColumnDefinition cdOld = meta.getColumn_metadata().values().iterator().next();
-        ColumnDefinition cdNew = new ColumnDefinition(cdOld.name, cdOld.getValidator(), null, null, null);
-        meta.columnMetadata(Collections.singletonMap(cdOld.name, cdNew));
-        UpdateColumnFamily update = new UpdateColumnFamily(meta.toThrift());
-        update.apply();
-
-        // check
-        assert cfs.indexManager.getIndexedColumns().isEmpty();
-        SSTableDeletingTask.waitForDeletions();
-        assert !new File(desc.filenameFor(Component.DATA)).exists();
-    }
-
-    private CFMetaData addTestCF(String ks, String cf, String comment)
-    {
-        CFMetaData newCFMD = new CFMetaData(ks, cf, ColumnFamilyType.Standard, UTF8Type.instance, null);
-        newCFMD.comment(comment)
-               .readRepairChance(0.0);
-
-        return newCFMD;
-    }
-}


Mime
View raw message