Modified: cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java?rev=1082510&r1=1082509&r2=1082510&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java Thu Mar 17 14:50:32 2011 @@ -18,22 +18,30 @@ package org.apache.cassandra; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; +import java.nio.ByteBuffer; +import java.util.*; + +import org.apache.commons.lang.NotImplementedException; + +import com.google.common.base.Charsets; +import org.apache.cassandra.config.*; +import org.apache.cassandra.db.ColumnFamilyType; +import org.apache.cassandra.db.KeyspaceNotDefinedException; +import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.locator.AbstractReplicationStrategy; +import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.thrift.IndexType; + import org.junit.BeforeClass; public class SchemaLoader { - // todo: when xml is fully deprecated, this method should be changed to manually load a few table definitions into - // the definitions keyspace. @BeforeClass - public static void loadSchemaFromYaml() + public static void loadSchema() { try { - for (KSMetaData ksm : DatabaseDescriptor.readTablesFromYaml()) + for (KSMetaData ksm : schemaDefinition()) { for (CFMetaData cfm : ksm.cfMetaData().values()) CFMetaData.map(cfm); @@ -45,4 +53,170 @@ public class SchemaLoader throw new RuntimeException(e); } } + + public static Collection<KSMetaData> schemaDefinition() + { + List<KSMetaData> schema = new ArrayList<KSMetaData>(); + + // A whole bucket of shorthand + String ks1 = "Keyspace1"; + String ks2 = "Keyspace2"; + String ks3 = "Keyspace3"; + String ks4 = "Keyspace4"; + String ks5 = "Keyspace5"; + String ks_kcs = "KeyCacheSpace"; + String ks_rcs = "RowCacheSpace"; + + Class<? extends AbstractReplicationStrategy> simple = SimpleStrategy.class; + Map<String, String> no_opts = Collections.<String, String>emptyMap(); + int rep_factor1 = 1; + int rep_factor2 = 2; + int rep_factor3 = 3; + int rep_factor5 = 5; + + ColumnFamilyType st = ColumnFamilyType.Standard; + ColumnFamilyType su = ColumnFamilyType.Super; + AbstractType bytes = BytesType.instance; + + // Keyspace 1 + schema.add(new KSMetaData(ks1, + simple, + no_opts, + rep_factor1, + + // Column Families + standardCFMD(ks1, "Standard1"), + standardCFMD(ks1, "Standard2"), + standardCFMD(ks1, "Standard3"), + standardCFMD(ks1, "Standard4"), + standardCFMD(ks1, "StandardLong1"), + standardCFMD(ks1, "StandardLong2"), + superCFMD(ks1, "Super1", LongType.instance), + superCFMD(ks1, "Super2", LongType.instance), + superCFMD(ks1, "Super3", LongType.instance), + superCFMD(ks1, "Super4", UTF8Type.instance), + superCFMD(ks1, "Super5", bytes), + indexCFMD(ks1, "Indexed1", true), + indexCFMD(ks1, "Indexed2", false), + new CFMetaData(ks1, + "StandardInteger1", + st, + IntegerType.instance, + null) + .keyCacheSize(0), + new CFMetaData(ks1, + "Counter1", + st, + bytes, + null) + .defaultValidator(CounterColumnType.instance), + new CFMetaData(ks1, + "SuperCounter1", + su, + bytes, + bytes) + .defaultValidator(CounterColumnType.instance), + jdbcCFMD(ks1, "JdbcInteger", IntegerType.instance), + jdbcCFMD(ks1, "JdbcUtf8", UTF8Type.instance), + jdbcCFMD(ks1, "JdbcLong", LongType.instance), + jdbcCFMD(ks1, "JdbcBytes", bytes), + jdbcCFMD(ks1, "JdbcAscii", AsciiType.instance))); + + // Keyspace 2 + schema.add(new KSMetaData(ks2, + simple, + no_opts, + rep_factor1, + + // Column Families + standardCFMD(ks2, "Standard1"), + standardCFMD(ks2, "Standard3"), + superCFMD(ks2, "Super3", bytes), + superCFMD(ks2, "Super4", TimeUUIDType.instance), + indexCFMD(ks2, "Indexed1", true))); + + // Keyspace 3 + schema.add(new KSMetaData(ks3, + simple, + no_opts, + rep_factor5, + + // Column Families + standardCFMD(ks3, "Standard1"), + indexCFMD(ks3, "Indexed1", true))); + + // Keyspace 4 + schema.add(new KSMetaData(ks4, + simple, + no_opts, + rep_factor3, + + // Column Families + standardCFMD(ks4, "Standard1"), + standardCFMD(ks4, "Standard3"), + superCFMD(ks4, "Super3", bytes), + superCFMD(ks4, "Super4", TimeUUIDType.instance), + new CFMetaData(ks4, + "Super5", + su, + TimeUUIDType.instance, + bytes) + .keyCacheSize(0))); + + // Keyspace 5 + schema.add(new KSMetaData(ks5, + simple, + no_opts, + rep_factor2, + + // Column Families + standardCFMD(ks5, "Standard1"), + standardCFMD(ks5, "Counter1") + .defaultValidator(CounterColumnType.instance))); + + // KeyCacheSpace + schema.add(new KSMetaData(ks_kcs, + simple, + no_opts, + rep_factor1, + standardCFMD(ks_kcs, "Standard1") + .keyCacheSize(0.5), + standardCFMD(ks_kcs, "Standard2") + .keyCacheSize(1.0))); + + // RowCacheSpace + schema.add(new KSMetaData(ks_rcs, + simple, + no_opts, + rep_factor1, + standardCFMD(ks_rcs, "CFWithoutCache"), + standardCFMD(ks_rcs, "CachedCF") + .rowCacheSize(100))); + + return schema; + } + + private static CFMetaData standardCFMD(String ksName, String cfName) + { + return new CFMetaData(ksName, cfName, ColumnFamilyType.Standard, BytesType.instance, null).keyCacheSize(0); + } + private static CFMetaData superCFMD(String ksName, String cfName, AbstractType subcc) + { + return new CFMetaData(ksName, cfName, ColumnFamilyType.Super, BytesType.instance, subcc).keyCacheSize(0); + } + private static CFMetaData indexCFMD(String ksName, String cfName, final Boolean withIdxType) + { + return standardCFMD(ksName, cfName) + .columnMetadata(Collections.unmodifiableMap(new HashMap<ByteBuffer, ColumnDefinition>() + {{ + ByteBuffer cName = ByteBuffer.wrap("birthdate".getBytes(Charsets.UTF_8)); + IndexType keys = withIdxType ? IndexType.KEYS : null; + put(cName, + new ColumnDefinition(cName, LongType.instance, keys, null)); + }})); + } + private static CFMetaData jdbcCFMD(String ksName, String cfName, AbstractType comp) + { + return new CFMetaData(ksName, cfName, ColumnFamilyType.Standard, comp, comp); + } }
Modified: cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java?rev=1082510&r1=1082509&r2=1082510&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java Thu Mar 17 14:50:32 2011 @@ -21,8 +21,10 @@ package org.apache.cassandra.config; */ -import java.nio.ByteBuffer; import org.junit.Test; + +import org.apache.cassandra.db.marshal.BytesType; +import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.thrift.IndexType; import org.apache.cassandra.utils.ByteBufferUtil; @@ -32,12 +34,12 @@ public class ColumnDefinitionTest public void testSerializeDeserialize() throws Exception { ColumnDefinition cd0 = new ColumnDefinition(ByteBufferUtil.bytes("TestColumnDefinitionName0"), - "BytesType", + BytesType.instance, IndexType.KEYS, "random index name 0"); ColumnDefinition cd1 = new ColumnDefinition(ByteBufferUtil.bytes("TestColumnDefinition1"), - "LongType", + LongType.instance, null, null); Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=1082510&r1=1082509&r2=1082510&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Thu Mar 17 14:50:32 2011 @@ -314,7 +314,7 @@ public class ColumnFamilyStoreTest exten ColumnFamilyStore cfs = table.getColumnFamilyStore("Indexed2"); ColumnDefinition old = cfs.metadata.getColumn_metadata().get(ByteBufferUtil.bytes("birthdate")); - ColumnDefinition cd = new ColumnDefinition(old.name, old.validator.getClass().getName(), IndexType.KEYS, "birthdate_index"); + ColumnDefinition cd = new ColumnDefinition(old.name, old.validator, IndexType.KEYS, "birthdate_index"); Future<?> future = cfs.addIndex(cd); future.get(); // we had a bug (CASSANDRA-2244) where index would get created but not flushed -- check for that Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java?rev=1082510&r1=1082509&r2=1082510&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java Thu Mar 17 14:50:32 2011 @@ -22,8 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.TreeMap; +import java.util.*; import org.apache.cassandra.SchemaLoader; import org.junit.Test; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java?rev=1082510&r1=1082509&r2=1082510&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Thu Mar 17 14:50:32 2011 @@ -25,7 +25,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -102,30 +101,31 @@ public class DefsTest extends CleanupHel for (int i = 0; i < 5; i++) { ByteBuffer name = ByteBuffer.wrap(new byte[] { (byte)i }); - indexes.put(name, new ColumnDefinition(name, null, IndexType.KEYS, Integer.toString(i))); + indexes.put(name, new ColumnDefinition(name, BytesType.instance, IndexType.KEYS, Integer.toString(i))); } CFMetaData cfm = new CFMetaData("Keyspace1", - "TestApplyCFM_CF", - ColumnFamilyType.Standard, - BytesType.instance, - null, - "No comment", - 1.0, - 1.0, - 0.5, - false, - 100000, - null, - 500, - 500, - 500, - 500, - 500, - 500, - 500.0, - 0, - indexes); - + "TestApplyCFM_CF", + ColumnFamilyType.Standard, + BytesType.instance, + null); + + cfm.comment("No comment") + .rowCacheSize(1.0) + .keyCacheSize(1.0) + .readRepairChance(0.5) + .replicateOnWrite(false) + .gcGraceSeconds(100000) + .defaultValidator(null) + .minCompactionThreshold(500) + .maxCompactionThreshold(500) + .rowCacheSavePeriod(500) + .keyCacheSavePeriod(500) + .memTime(500) + .memSize(500) + .memOps(500.0) + .mergeShardsChance(0.0) + .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; org.apache.cassandra.db.migration.avro.CfDef cfDef = CFMetaData.convertToAvro(cfm); @@ -300,11 +300,11 @@ public class DefsTest extends CleanupHel for (int i = 0; i < 100; i++) rm.add(new QueryPath(cfm.cfName, null, ByteBuffer.wrap(("col" + i).getBytes())), ByteBufferUtil.bytes("anyvalue"), 1L); rm.apply(); - ColumnFamilyStore store = Table.open(cfm.tableName).getColumnFamilyStore(cfm.cfName); + ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName); assert store != null; store.forceBlockingFlush(); store.getFlushPath(); - assert DefsTable.getFiles(cfm.tableName, cfm.cfName).size() > 0; + assert DefsTable.getFiles(cfm.ksName, cfm.cfName).size() > 0; new DropColumnFamily(ks.name, cfm.cfName).apply(); @@ -325,7 +325,7 @@ public class DefsTest extends CleanupHel assert !success : "This mutation should have failed since the CF no longer exists."; // verify that the files are gone. - for (File file : DefsTable.getFiles(cfm.tableName, cfm.cfName)) + for (File file : DefsTable.getFiles(cfm.ksName, cfm.cfName)) { if (file.getPath().endsWith("Data.db") && !new File(file.getPath().replace("Data.db", "Compacted")).exists()) throw new AssertionError("undeleted file " + file); @@ -346,23 +346,23 @@ public class DefsTest extends CleanupHel for (int i = 0; i < 100; i++) rm.add(new QueryPath(oldCfm.cfName, null, ByteBuffer.wrap(("col" + i).getBytes())), ByteBufferUtil.bytes("anyvalue"), 1L); rm.apply(); - ColumnFamilyStore store = Table.open(oldCfm.tableName).getColumnFamilyStore(oldCfm.cfName); + ColumnFamilyStore store = Table.open(oldCfm.ksName).getColumnFamilyStore(oldCfm.cfName); assert store != null; store.forceBlockingFlush(); - int fileCount = DefsTable.getFiles(oldCfm.tableName, oldCfm.cfName).size(); + int fileCount = DefsTable.getFiles(oldCfm.ksName, oldCfm.cfName).size(); assert fileCount > 0; final String cfName = "St4ndard1Replacement"; - new RenameColumnFamily(oldCfm.tableName, oldCfm.cfName, cfName).apply(); + new RenameColumnFamily(oldCfm.ksName, oldCfm.cfName, cfName).apply(); assert !DatabaseDescriptor.getTableDefinition(ks.name).cfMetaData().containsKey(oldCfm.cfName); assert DatabaseDescriptor.getTableDefinition(ks.name).cfMetaData().containsKey(cfName); // verify that new files are there. - assert DefsTable.getFiles(oldCfm.tableName, cfName).size() == fileCount; + assert DefsTable.getFiles(oldCfm.ksName, cfName).size() == fileCount; // do some reads. - store = Table.open(oldCfm.tableName).getColumnFamilyStore(cfName); + store = Table.open(oldCfm.ksName).getColumnFamilyStore(cfName); assert store != null; ColumnFamily cfam = store.getColumnFamily(QueryFilter.getSliceFilter(dk, new QueryPath(cfName), ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 1000)); assert cfam.getSortedColumns().size() == 100; // should be good enough? @@ -384,18 +384,18 @@ public class DefsTest extends CleanupHel DecoratedKey dk = Util.dk("key0"); CFMetaData newCf = addTestCF("NewKeyspace1", "AddedStandard1", "A new cf for a new ks"); - KSMetaData newKs = new KSMetaData(newCf.tableName, SimpleStrategy.class, null, 5, newCf); + KSMetaData newKs = new KSMetaData(newCf.ksName, SimpleStrategy.class, null, 5, newCf); new AddKeyspace(newKs).apply(); - assert DatabaseDescriptor.getTableDefinition(newCf.tableName) != null; - assert DatabaseDescriptor.getTableDefinition(newCf.tableName) == newKs; + assert DatabaseDescriptor.getTableDefinition(newCf.ksName) != null; + assert DatabaseDescriptor.getTableDefinition(newCf.ksName) == newKs; // test reads and writes. - RowMutation rm = new RowMutation(newCf.tableName, dk.key); + 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.tableName).getColumnFamilyStore(newCf.cfName); + ColumnFamilyStore store = Table.open(newCf.ksName).getColumnFamilyStore(newCf.cfName); assert store != null; store.forceBlockingFlush(); @@ -420,10 +420,10 @@ public class DefsTest extends CleanupHel for (int i = 0; i < 100; i++) rm.add(new QueryPath(cfm.cfName, null, ByteBuffer.wrap(("col" + i).getBytes())), ByteBufferUtil.bytes("anyvalue"), 1L); rm.apply(); - ColumnFamilyStore store = Table.open(cfm.tableName).getColumnFamilyStore(cfm.cfName); + ColumnFamilyStore store = Table.open(cfm.ksName).getColumnFamilyStore(cfm.cfName); assert store != null; store.forceBlockingFlush(); - assert DefsTable.getFiles(cfm.tableName, cfm.cfName).size() > 0; + assert DefsTable.getFiles(cfm.ksName, cfm.cfName).size() > 0; new DropKeyspace(ks.name).apply(); @@ -464,7 +464,7 @@ public class DefsTest extends CleanupHel assert oldKs != null; final String cfName = "Standard3"; assert oldKs.cfMetaData().containsKey(cfName); - assert oldKs.cfMetaData().get(cfName).tableName.equals(oldKs.name); + assert oldKs.cfMetaData().get(cfName).ksName.equals(oldKs.name); // write some data that we hope to read back later. RowMutation rm = new RowMutation(oldKs.name, dk.key); @@ -484,7 +484,7 @@ public class DefsTest extends CleanupHel assert newKs != null; assert newKs.name.equals(newKsName); assert newKs.cfMetaData().containsKey(cfName); - assert newKs.cfMetaData().get(cfName).tableName.equals(newKsName); + assert newKs.cfMetaData().get(cfName).ksName.equals(newKsName); assert DefsTable.getFiles(newKs.name, cfName).size() > 0; // read on old should fail. @@ -578,16 +578,16 @@ public class DefsTest extends CleanupHel { // create a keyspace to serve as existing. CFMetaData cf = addTestCF("UpdatedKeyspace", "AddedStandard1", "A new cf for a new ks"); - KSMetaData oldKs = new KSMetaData(cf.tableName, SimpleStrategy.class, null, 5, cf); + KSMetaData oldKs = new KSMetaData(cf.ksName, SimpleStrategy.class, null, 5, cf); new AddKeyspace(oldKs).apply(); - assert DatabaseDescriptor.getTableDefinition(cf.tableName) != null; - assert DatabaseDescriptor.getTableDefinition(cf.tableName) == oldKs; + assert DatabaseDescriptor.getTableDefinition(cf.ksName) != null; + assert DatabaseDescriptor.getTableDefinition(cf.ksName) == oldKs; // anything with cf defs should fail. - CFMetaData cf2 = addTestCF(cf.tableName, "AddedStandard2", "A new cf for a new ks"); - KSMetaData newBadKs = new KSMetaData(cf.tableName, SimpleStrategy.class, null, 4, cf2); + CFMetaData cf2 = addTestCF(cf.ksName, "AddedStandard2", "A new cf for a new ks"); + KSMetaData newBadKs = new KSMetaData(cf.ksName, SimpleStrategy.class, null, 4, cf2); try { new UpdateKeyspace(newBadKs).apply(); @@ -599,7 +599,7 @@ public class DefsTest extends CleanupHel } // names should match. - KSMetaData newBadKs2 = new KSMetaData(cf.tableName + "trash", SimpleStrategy.class, null, 4); + KSMetaData newBadKs2 = new KSMetaData(cf.ksName + "trash", SimpleStrategy.class, null, 4); try { new UpdateKeyspace(newBadKs2).apply(); @@ -610,7 +610,7 @@ public class DefsTest extends CleanupHel // expected. } - KSMetaData newKs = new KSMetaData(cf.tableName, OldNetworkTopologyStrategy.class, null, 1); + KSMetaData newKs = new KSMetaData(cf.ksName, OldNetworkTopologyStrategy.class, null, 1); new UpdateKeyspace(newKs).apply(); KSMetaData newFetchedKs = DatabaseDescriptor.getKSMetaData(newKs.name); @@ -625,12 +625,12 @@ public class DefsTest extends CleanupHel { // create a keyspace with a cf to update. CFMetaData cf = addTestCF("UpdatedCfKs", "Standard1added", "A new cf that will be updated"); - KSMetaData ksm = new KSMetaData(cf.tableName, SimpleStrategy.class, null, 1, cf); + KSMetaData ksm = new KSMetaData(cf.ksName, SimpleStrategy.class, null, 1, cf); new AddKeyspace(ksm).apply(); - assert DatabaseDescriptor.getTableDefinition(cf.tableName) != null; - assert DatabaseDescriptor.getTableDefinition(cf.tableName) == ksm; - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName) != null; + assert DatabaseDescriptor.getTableDefinition(cf.ksName) != null; + assert DatabaseDescriptor.getTableDefinition(cf.ksName) == ksm; + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName) != null; // updating certain fields should fail. org.apache.cassandra.db.migration.avro.CfDef cf_def = CFMetaData.convertToAvro(cf); @@ -668,12 +668,12 @@ public class DefsTest extends CleanupHel // can't test changing the reconciler because there is only one impl. // check the cumulative affect. - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getComment().equals(cf_def.comment); - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getRowCacheSize() == cf_def.row_cache_size; - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getKeyCacheSize() == cf_def.key_cache_size; - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getReadRepairChance() == cf_def.read_repair_chance; - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getGcGraceSeconds() == cf_def.gc_grace_seconds; - assert DatabaseDescriptor.getCFMetaData(cf.tableName, cf.cfName).getDefaultValidator() == UTF8Type.instance; + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName).getComment().equals(cf_def.comment); + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName).getRowCacheSize() == cf_def.row_cache_size; + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName).getKeyCacheSize() == cf_def.key_cache_size; + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName).getReadRepairChance() == cf_def.read_repair_chance; + assert DatabaseDescriptor.getCFMetaData(cf.ksName, cf.cfName).getGcGraceSeconds() == cf_def.gc_grace_seconds; + assert DatabaseDescriptor.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. @@ -761,26 +761,12 @@ public class DefsTest extends CleanupHel private CFMetaData addTestCF(String ks, String cf, String comment) { - return new CFMetaData(ks, - cf, - ColumnFamilyType.Standard, - UTF8Type.instance, - null, - comment, - 0, - 1.0, - 0, - false, - CFMetaData.DEFAULT_GC_GRACE_SECONDS, - BytesType.instance, - CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD, - CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD, - CFMetaData.DEFAULT_ROW_CACHE_SAVE_PERIOD_IN_SECONDS, - CFMetaData.DEFAULT_KEY_CACHE_SAVE_PERIOD_IN_SECONDS, - CFMetaData.DEFAULT_MEMTABLE_LIFETIME_IN_MINS, - CFMetaData.DEFAULT_MEMTABLE_THROUGHPUT_IN_MB, - CFMetaData.DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS, - 0, - Collections.<ByteBuffer, ColumnDefinition>emptyMap()); + CFMetaData newCFMD = new CFMetaData(ks, cf, ColumnFamilyType.Standard, UTF8Type.instance, null); + newCFMD.comment(comment) + .keyCacheSize(1.0) + .readRepairChance(0.0) + .mergeShardsChance(0.0); + + return newCFMD; } }
