cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [19/25] git commit: Throw invalid exception in CQL3 on obsolete options
Date Tue, 24 Apr 2012 18:12:37 GMT
Throw invalid exception in CQL3 on obsolete options

patch by slebresne; reviewed by jbellis for CASSANDRA-4171


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/476ef487
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/476ef487
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/476ef487

Branch: refs/heads/cassandra-1.1
Commit: 476ef487cbd6b664fd3562a6d3c7f890b216e2ce
Parents: 15f12e6
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Apr 20 17:33:37 2012 +0200
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 24 13:11:26 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |   11 -----------
 2 files changed, 1 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/476ef487/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9392d3d..6986234 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/476ef487/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 8546080..593352a 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);
     }


Mime
View raw message