git commit: Minor tweaks for 'caching' option

[mishail]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e3443145c - fab550989


Minor tweaks for 'caching' option


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

Branch: refs/heads/cassandra-2.1
Commit: fab5509898152072ba1f6ecb3d208e2bbe234495
Parents: e344314
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Mar 12 19:56:28 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 10:06:56 2014 -0700

--
 pylib/cqlshlib/cql3handling.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fab55098/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index ae03cde..8e9f987 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -419,6 +419,8 @@ def cf_prop_val_completer(ctxt, cass):
 return [{'sstable_compression': ']
 if this_opt == 'compaction':
 return [{'class': ']
+if this_opt == 'caching':
+return [{'keys': ']
 if any(this_opt == opt[0] for opt in CqlRuleSet.obsolete_cf_options):
 return ['obsolete_option']
 if this_opt in ('read_repair_chance', 'bloom_filter_fp_chance',
@@ -472,9 +474,9 @@ def cf_prop_val_mapval_completer(ctxt, cass):
 return [Hint('option_value')]
 elif opt == 'caching':
 if key == 'rows_per_partition':
-return [Hint('ALL'), Hint('NONE'), Hint('#rows_per_partition')]
+return ['ALL', 'NONE', Hint('#rows_per_partition')]
 elif key == 'keys':
-return [Hint('ALL'), Hint('NONE')]
+return ['ALL', 'NONE']
 return ()
 
 def cf_prop_val_mapender_completer(ctxt, cass):

[07/15] git commit: Minor tweaks for 'caching' option

[xedin]

Minor tweaks for 'caching' option


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

Branch: refs/heads/trunk
Commit: fab5509898152072ba1f6ecb3d208e2bbe234495
Parents: e344314
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Mar 12 19:56:28 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 10:06:56 2014 -0700

--
 pylib/cqlshlib/cql3handling.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fab55098/pylib/cqlshlib/cql3handling.py
--
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index ae03cde..8e9f987 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -419,6 +419,8 @@ def cf_prop_val_completer(ctxt, cass):
 return [{'sstable_compression': ']
 if this_opt == 'compaction':
 return [{'class': ']
+if this_opt == 'caching':
+return [{'keys': ']
 if any(this_opt == opt[0] for opt in CqlRuleSet.obsolete_cf_options):
 return ['obsolete_option']
 if this_opt in ('read_repair_chance', 'bloom_filter_fp_chance',
@@ -472,9 +474,9 @@ def cf_prop_val_mapval_completer(ctxt, cass):
 return [Hint('option_value')]
 elif opt == 'caching':
 if key == 'rows_per_partition':
-return [Hint('ALL'), Hint('NONE'), Hint('#rows_per_partition')]
+return ['ALL', 'NONE', Hint('#rows_per_partition')]
 elif key == 'keys':
-return [Hint('ALL'), Hint('NONE')]
+return ['ALL', 'NONE']
 return ()
 
 def cf_prop_val_mapender_completer(ctxt, cass):