Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B638D10406 for ; Fri, 9 Aug 2013 15:53:19 +0000 (UTC) Received: (qmail 11480 invoked by uid 500); 9 Aug 2013 15:53:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11309 invoked by uid 500); 9 Aug 2013 15:53:19 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 11184 invoked by uid 99); 9 Aug 2013 15:53:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Aug 2013 15:53:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 777BA8BAF53; Fri, 9 Aug 2013 15:53:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 09 Aug 2013 15:53:17 -0000 Message-Id: <0695a64c77ac49118add9e13cd5d8d3e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Drop CQL3 obsolete keywords support in CREATE Updated Branches: refs/heads/trunk 70c0d30df -> 1b750ad4c Drop CQL3 obsolete keywords support in CREATE Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bcfab03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bcfab03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bcfab03 Branch: refs/heads/trunk Commit: 2bcfab03c6621114178cd3c248667373bc6a970a Parents: d044fe6 Author: Aleksey Yeschenko Authored: Fri Aug 9 17:51:53 2013 +0200 Committer: Aleksey Yeschenko Committed: Fri Aug 9 17:51:53 2013 +0200 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 17 +------------- .../org/apache/cassandra/cql3/CFPropDefs.java | 24 +++++--------------- .../org/apache/cassandra/cql3/KSPropDefs.java | 8 +++---- 3 files changed, 10 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bcfab03/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index c370363..ce8f9c6 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -84,22 +84,7 @@ class Cql3ParsingRuleSet(CqlParsingRuleSet): ('sstable_compression', 'chunk_length_kb', 'crc_check_chance')), ) - obsolete_cf_options = ( - 'compaction_parameters', - 'compaction_strategy_class', - 'compaction_strategy_options', - 'compression_parameters', - 'key_cache_save_period_in_seconds', - 'key_cache_size', - 'max_compaction_threshold', - 'memtable_flush_after_mins', - 'memtable_operations_in_millions', - 'memtable_throughput_in_mb', - 'min_compaction_threshold', - 'row_cache_provider', - 'row_cache_save_period_in_seconds', - 'row_cache_size', - ) + obsolete_cf_options = () consistency_levels = ( 'ANY', http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bcfab03/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 94b22ff..d369617 100644 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@ -19,9 +19,6 @@ package org.apache.cassandra.cql3; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.CFMetaData.SpeculativeRetry; import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; @@ -31,8 +28,6 @@ import org.apache.cassandra.io.compress.CompressionParameters; public class CFPropDefs extends PropertyDefinitions { - private static final Logger logger = LoggerFactory.getLogger(CFPropDefs.class); - public static final String KW_COMMENT = "comment"; public static final String KW_READREPAIRCHANCE = "read_repair_chance"; public static final String KW_DCLOCALREADREPAIRCHANCE = "dclocal_read_repair_chance"; @@ -53,8 +48,8 @@ public class CFPropDefs extends PropertyDefinitions public static final String COMPACTION_STRATEGY_CLASS_KEY = "class"; - public static final Set keywords = new HashSet(); - public static final Set obsoleteKeywords = new HashSet(); + public static final Set keywords = new HashSet<>(); + public static final Set obsoleteKeywords = new HashSet<>(); static { @@ -72,13 +67,6 @@ public class CFPropDefs extends PropertyDefinitions keywords.add(KW_COMPACTION); keywords.add(KW_COMPRESSION); keywords.add(KW_MEMTABLE_FLUSH_PERIOD); - - obsoleteKeywords.add("compaction_strategy_class"); - obsoleteKeywords.add("compaction_strategy_options"); - obsoleteKeywords.add("min_compaction_threshold"); - obsoleteKeywords.add("max_compaction_threshold"); - obsoleteKeywords.add("compaction_parameters"); - obsoleteKeywords.add("compression_parameters"); } private Class compactionStrategyClass = null; @@ -111,7 +99,7 @@ public class CFPropDefs extends PropertyDefinitions if (compressionOptions.containsKey(CompressionParameters.CHUNK_LENGTH_KB)) chunkLength = CompressionParameters.parseChunkLength(compressionOptions.get(CompressionParameters.CHUNK_LENGTH_KB)); - Map remainingOptions = new HashMap(compressionOptions); + Map remainingOptions = new HashMap<>(compressionOptions); remainingOptions.remove(CompressionParameters.SSTABLE_COMPRESSION); remainingOptions.remove(CompressionParameters.CHUNK_LENGTH_KB); CompressionParameters cp = new CompressionParameters(sstableCompressionClass, chunkLength, remainingOptions); @@ -133,7 +121,7 @@ public class CFPropDefs extends PropertyDefinitions { Map compactionOptions = getMap(KW_COMPACTION); if (compactionOptions == null) - return Collections.emptyMap(); + return new HashMap<>(); return compactionOptions; } @@ -141,7 +129,7 @@ public class CFPropDefs extends PropertyDefinitions { Map compressionOptions = getMap(KW_COMPRESSION); if (compressionOptions == null) - return new HashMap(); + return new HashMap<>(); return compressionOptions; } @@ -170,7 +158,7 @@ public class CFPropDefs extends PropertyDefinitions if (compactionStrategyClass != null) { cfm.compactionStrategyClass(compactionStrategyClass); - cfm.compactionStrategyOptions(new HashMap(getCompactionOptions())); + cfm.compactionStrategyOptions(new HashMap<>(getCompactionOptions())); } cfm.bloomFilterFpChance(getDouble(KW_BF_FP_CHANCE, cfm.getBloomFilterFpChance())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bcfab03/src/java/org/apache/cassandra/cql3/KSPropDefs.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/KSPropDefs.java b/src/java/org/apache/cassandra/cql3/KSPropDefs.java index 9bf4070..c10a79b 100644 --- a/src/java/org/apache/cassandra/cql3/KSPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/KSPropDefs.java @@ -29,15 +29,13 @@ public class KSPropDefs extends PropertyDefinitions public static final String REPLICATION_STRATEGY_CLASS_KEY = "class"; - public static final Set keywords = new HashSet(); - public static final Set obsoleteKeywords = new HashSet(); + public static final Set keywords = new HashSet<>(); + public static final Set obsoleteKeywords = new HashSet<>(); static { keywords.add(KW_DURABLE_WRITES); keywords.add(KW_REPLICATION); - - obsoleteKeywords.add("strategy_class"); } private String strategyClass; @@ -58,7 +56,7 @@ public class KSPropDefs extends PropertyDefinitions { Map replicationOptions = getMap(KW_REPLICATION); if (replicationOptions == null) - return Collections.emptyMap(); + return Collections.emptyMap(); return replicationOptions; }