From 476ef487cbd6b664fd3562a6d3c7f890b216e2ce Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 20 Apr 2012 17:33:37 +0200 Subject: [PATCH] Throw invalid exception in CQL3 on obsolete options patch by slebresne; reviewed by jbellis for CASSANDRA-4171 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9392d3d18c..6986234606 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java index 8546080966..593352abdf 100644 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@ -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); }