cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/4] git commit: Remove the vestiges of default_{read, write}_consistency
Date Mon, 12 Aug 2013 10:40:46 GMT
Updated Branches:
  refs/heads/trunk e718467ec -> 92cfea550


Remove the vestiges of default_{read,write}_consistency


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

Branch: refs/heads/trunk
Commit: cb0a0cd2f8295a526068b7f6c52860e707e7665a
Parents: 2a83793
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Aug 12 12:36:43 2013 +0200
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Aug 12 12:36:43 2013 +0200

----------------------------------------------------------------------
 pylib/cqlshlib/cql3handling.py                       | 4 ----
 src/java/org/apache/cassandra/config/CFMetaData.java | 2 --
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb0a0cd2/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index c83c94d..ca95766 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -503,10 +503,6 @@ def cf_new_prop_val_completer(ctxt, cass):
     if this_opt in ('min_compaction_threshold', 'max_compaction_threshold',
                     'gc_grace_seconds'):
         return [Hint('<integer>')]
-    if this_opt == 'default_read_consistency':
-        return [cl for cl in CqlRuleSet.consistency_levels if cl != 'ANY']
-    if this_opt == 'default_write_consistency':
-        return CqlRuleSet.consistency_levels
     return [Hint('<option_value>')]
 
 def cf_new_prop_val_mapkey_completer(ctxt, cass):

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb0a0cd2/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index f3b235d..33e3f00 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -136,8 +136,6 @@ public final class CFMetaData
                                                                        + "value_alias text,"
                                                                        + "column_aliases
text,"
                                                                        + "compaction_strategy_options
text,"
-                                                                       + "default_read_consistency
text,"
-                                                                       + "default_write_consistency
text,"
                                                                        + "PRIMARY KEY (keyspace_name,
columnfamily_name)"
                                                                        + ") WITH COMMENT='ColumnFamily
definitions' AND gc_grace_seconds=8640");
 


Mime
View raw message