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

Throw invalid exception in CQL3 on obsolete options 

patch by slebresne; reviewed by jbellis for CASSANDRA-4171
This commit is contained in:
Sylvain Lebresne 2012-04-20 17:33:37 +02:00 committed by Jonathan Ellis
parent 15f12e6581
commit 476ef487cb
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -24,6 +24,7 @@
* Allow KS and CF names up to 48 characters (CASSANDRA-4157)
* Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
* Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170)
* Throw invalid exception from CQL3 on obsolete options (CASSANDRA-4171)
Merged from 1.0:
* avoid streaming empty files with bulk loader if sstablewriter errors out
(CASSANDRA-3946)

11
src/java/org/apache/cassandra/cql3/CFPropDefs.java
View File

@ -86,17 +86,6 @@ public class CFPropDefs
keywords.add(KW_CACHING);
keywords.add(KW_BF_FP_CHANCE);
obsoleteKeywords.add("row_cache_size");
obsoleteKeywords.add("key_cache_size");
obsoleteKeywords.add("row_cache_save_period_in_seconds");
obsoleteKeywords.add("key_cache_save_period_in_seconds");
obsoleteKeywords.add("memtable_throughput_in_mb");
obsoleteKeywords.add("memtable_operations_in_millions");
obsoleteKeywords.add("memtable_flush_after_mins");
obsoleteKeywords.add("row_cache_provider");
obsoleteKeywords.add("comparator");
obsoleteKeywords.add("default_validation");
allowedKeywords.addAll(keywords);
allowedKeywords.addAll(obsoleteKeywords);
}