You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/08 22:45:40 UTC
[2/6] git commit: CQLSH: adjusted compaction_strategy_options with
the latest docs
CQLSH: adjusted compaction_strategy_options with the latest docs
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7185
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a626c6dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a626c6dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a626c6dc
Branch: refs/heads/cassandra-2.1
Commit: a626c6dcbcfa4692167e57e3217d46642e26ff53
Parents: 51f9e98
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 8 13:00:03 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 8 13:43:42 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a626c6dc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f7d68e..ce30239 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
* fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
* Fix disabling autocompaction (CASSANDRA-7187)
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
+ * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
2.0.8
* Correctly delete scheduled range xfers (CASSANDRA-7143)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a626c6dc/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index af3067a..9b78638 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -79,7 +79,7 @@ class Cql3ParsingRuleSet(CqlParsingRuleSet):
# (CQL3 option name, schema_columnfamilies column name (or None if same),
# list of known map keys)
('compaction', 'compaction_strategy_options',
- ('class', 'min_threshold', 'max_threshold')),
+ ('class', 'max_threshold', 'tombstone_compaction_interval', 'tombstone_threshold', 'enabled')),
('compression', 'compression_parameters',
('sstable_compression', 'chunk_length_kb', 'crc_check_chance')),
)
@@ -473,6 +473,10 @@ def cf_prop_val_mapkey_completer(ctxt, cass):
csc = csc.split('.')[-1]
if csc == 'SizeTieredCompactionStrategy':
opts.add('min_sstable_size')
+ opts.add('min_threshold')
+ opts.add('bucket_high')
+ opts.add('bucket_low')
+ opts.add('cold_reads_to_omit')
elif csc == 'LeveledCompactionStrategy':
opts.add('sstable_size_in_mb')
return map(escape_value, opts)