natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow null CF comments. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-2351 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082701 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2011-03-17 21:14:37 +00:00
parent a05f951a6c
commit feb4f034fa
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -152,7 +152,7 @@ public final class CFMetaData
private Map<ByteBuffer, ColumnDefinition> column_metadata;
public CFMetaData comment(String prop) {comment = prop; return this;}
public CFMetaData comment(String prop) { comment = enforceCommentNotNull(prop); return this;}
public CFMetaData rowCacheSize(double prop) {rowCacheSize = prop; return this;}
public CFMetaData keyCacheSize(double prop) {keyCacheSize = prop; return this;}
public CFMetaData readRepairChance(double prop) {readRepairChance = prop; return this;}
@ -195,6 +195,11 @@ public final class CFMetaData
return (subcc == null) && (cftype == ColumnFamilyType.Super) ? BytesType.instance : subcc;
}
private static String enforceCommentNotNull (CharSequence comment)
{
return (comment == null) ? "" : comment.toString();
}
private void init()
{
// Set a bunch of defaults
@ -532,29 +537,6 @@ public final class CFMetaData
return validator;
}
/** applies implicit defaults to cf definition. useful in updates */
public static void applyImplicitDefaults(org.apache.cassandra.db.migration.avro.CfDef cf_def)
{
if (cf_def.comment == null)
cf_def.comment = "";
if (cf_def.min_compaction_threshold == null)
cf_def.min_compaction_threshold = CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD;
if (cf_def.max_compaction_threshold == null)
cf_def.max_compaction_threshold = CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD;
if (cf_def.row_cache_save_period_in_seconds == null)
cf_def.row_cache_save_period_in_seconds = CFMetaData.DEFAULT_ROW_CACHE_SAVE_PERIOD_IN_SECONDS;
if (cf_def.key_cache_save_period_in_seconds == null)
cf_def.key_cache_save_period_in_seconds = CFMetaData.DEFAULT_KEY_CACHE_SAVE_PERIOD_IN_SECONDS;
if (cf_def.memtable_flush_after_mins == null)
cf_def.memtable_flush_after_mins = CFMetaData.DEFAULT_MEMTABLE_LIFETIME_IN_MINS;
if (cf_def.memtable_throughput_in_mb == null)
cf_def.memtable_throughput_in_mb = CFMetaData.DEFAULT_MEMTABLE_THROUGHPUT_IN_MB;
if (cf_def.memtable_operations_in_millions == null)
cf_def.memtable_operations_in_millions = CFMetaData.DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS;
if (cf_def.merge_shards_chance == null)
cf_def.merge_shards_chance = CFMetaData.DEFAULT_MERGE_SHARDS_CHANCE;
}
/** applies implicit defaults to cf definition. useful in updates */
public static void applyImplicitDefaults(org.apache.cassandra.thrift.CfDef cf_def)
{
@ -604,7 +586,7 @@ public final class CFMetaData
validateMinMaxCompactionThresholds(cf_def);
validateMemtableSettings(cf_def);
comment = cf_def.comment == null ? "" : cf_def.comment.toString();
comment = enforceCommentNotNull(cf_def.comment);
rowCacheSize = cf_def.row_cache_size;
keyCacheSize = cf_def.key_cache_size;
readRepairChance = cf_def.read_repair_chance;
@ -669,7 +651,7 @@ public final class CFMetaData
def.setSubcomparator_type(cfm.subcolumnComparator.getClass().getName());
def.setColumn_type("Super");
}
def.setComment(cfm.comment == null ? "" : cfm.comment);
def.setComment(enforceCommentNotNull(cfm.comment));
def.setRow_cache_size(cfm.rowCacheSize);
def.setKey_cache_size(cfm.keyCacheSize);
def.setRead_repair_chance(cfm.readRepairChance);
@ -712,7 +694,7 @@ public final class CFMetaData
def.subcomparator_type = cfm.subcolumnComparator.getClass().getName();
def.column_type = "Super";
}
def.comment = cfm.comment == null ? "" : cfm.comment;
def.comment = enforceCommentNotNull(cfm.comment);
def.row_cache_size = cfm.rowCacheSize;
def.key_cache_size = cfm.keyCacheSize;
def.read_repair_chance = cfm.readRepairChance;

16
test/unit/org/apache/cassandra/db/DefsTest.java
View File

@ -254,6 +254,22 @@ public class DefsTest extends CleanupHelper
assert m2.serialize().equals(reconstituded[1].serialize());
assert m3.serialize().equals(reconstituded[2].serialize());
}
@Test
public void addNewCfWithNullComment() throws ConfigurationException, IOException, ExecutionException, InterruptedException
{
final String ks = "Keyspace1";
final String cf = "BrandNewCfWithNull";
KSMetaData original = DatabaseDescriptor.getTableDefinition(ks);
CFMetaData newCf = addTestCF(original.name, cf, null);
assert !DatabaseDescriptor.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
new AddColumnFamily(newCf).apply();
assert DatabaseDescriptor.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
assert DatabaseDescriptor.getTableDefinition(ks).cfMetaData().get(newCf.cfName).equals(newCf);
}
@Test
public void addNewCF() throws ConfigurationException, IOException, ExecutionException, InterruptedException