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:39 UTC
[1/6] git commit: CQLSH: adjusted compaction_strategy_options with
the latest docs
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 51f9e9804 -> a626c6dcb
refs/heads/cassandra-2.1 a0d096b03 -> 355e69b7f
refs/heads/trunk 310d6e4ef -> 677df414d
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.0
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)
[2/6] git commit: CQLSH: adjusted compaction_strategy_options with
the latest docs
Posted by mi...@apache.org.
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)
[3/6] git commit: CQLSH: adjusted compaction_strategy_options with
the latest docs
Posted by mi...@apache.org.
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/trunk
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)
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/677df414
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/677df414
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/677df414
Branch: refs/heads/trunk
Commit: 677df414dc1d1f776af1be604810258039287139
Parents: 310d6e4 355e69b
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 8 13:45:32 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 8 13:45:32 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/677df414/CHANGES.txt
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/355e69b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/355e69b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/355e69b7
Branch: refs/heads/cassandra-2.1
Commit: 355e69b7ff36d52c87522cd037ad10a85c62da13
Parents: a0d096b a626c6d
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 8 13:45:22 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 8 13:45:22 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/355e69b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2d9ce55,ce30239..6d80937
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,6 -5,24 +16,7 @@@ Merged from 2.0
* 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)
- * Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
- * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/355e69b7/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 230fa91,9b78638..14b3dba
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -74,11 -79,9 +74,11 @@@ class Cql3ParsingRuleSet(CqlParsingRule
# (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')),
+ ('caching', None,
+ ('rows_per_partition', 'keys')),
)
obsolete_cf_options = ()
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/355e69b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/355e69b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/355e69b7
Branch: refs/heads/trunk
Commit: 355e69b7ff36d52c87522cd037ad10a85c62da13
Parents: a0d096b a626c6d
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 8 13:45:22 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 8 13:45:22 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/355e69b7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2d9ce55,ce30239..6d80937
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,6 -5,24 +16,7 @@@ Merged from 2.0
* 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)
- * Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
- * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/355e69b7/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 230fa91,9b78638..14b3dba
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -74,11 -79,9 +74,11 @@@ class Cql3ParsingRuleSet(CqlParsingRule
# (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')),
+ ('caching', None,
+ ('rows_per_partition', 'keys')),
)
obsolete_cf_options = ()