Author: jbellis Date: Thu Oct 20 01:08:23 2011 New Revision: 1186591 URL: http://svn.apache.org/viewvc?rev=1186591&view=rev Log: fix merge
Modified: cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java Modified: cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1186591&r1=1186590&r2=1186591&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java Thu Oct 20 01:08:23 2011 @@ -731,16 +731,6 @@ public class ThriftValidation max_compaction_threshold)); } - public static void validateMemtableSettings(org.apache.cassandra.thrift.CfDef cf_def) throws ConfigurationException - { - if (cf_def.isSetMemtable_flush_after_mins()) - DatabaseDescriptor.validateMemtableFlushPeriod(cf_def.memtable_flush_after_mins); - if (cf_def.isSetMemtable_throughput_in_mb()) - DatabaseDescriptor.validateMemtableThroughput(cf_def.memtable_throughput_in_mb); - if (cf_def.isSetMemtable_operations_in_millions()) - DatabaseDescriptor.validateMemtableOperations(cf_def.memtable_operations_in_millions); - } - public static void validateKeyspaceNotYetExisting(String newKsName) throws InvalidRequestException { // keyspace names must be unique case-insensitively because the keyspace name becomes the directory