Updated Branches: refs/heads/trunk 4df6c2875 -> 62b90340d
cqlsh: add missing table options to DESCRIBE output patch by Aleksey Yeschenko; reviewed by Brandon Williams for CASSANDRA-5749 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62b90340 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62b90340 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62b90340 Branch: refs/heads/trunk Commit: 62b90340d6f3a538acb33f693c4177e5c7870d9b Parents: 4df6c28 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Jul 15 13:48:09 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Jul 15 13:48:09 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 3 +++ pylib/cqlshlib/test/test_cqlsh_output.py | 3 +++ 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b90340/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 21f8e3a..a0d6793 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,7 @@ * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) * Support range tombstones in thrift (CASSANDRA-5435) * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) 2.0.0-beta1 * Removed on-heap row cache (CASSANDRA-5348) http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b90340/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py index aa68984..5fcca6f 100644 --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@ -70,6 +70,9 @@ class Cql3ParsingRuleSet(CqlParsingRuleSet): ('read_repair_chance', None), ('replicate_on_write', None), ('populate_io_cache_on_flush', None), + ('default_time_to_live', None), + ('speculative_retry', None), + ('memtable_flush_period_in_ms', None), ) columnfamily_layout_map_options = ( http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b90340/pylib/cqlshlib/test/test_cqlsh_output.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py b/pylib/cqlshlib/test/test_cqlsh_output.py index aa92a7f..8aef154 100644 --- a/pylib/cqlshlib/test/test_cqlsh_output.py +++ b/pylib/cqlshlib/test/test_cqlsh_output.py @@ -662,6 +662,9 @@ class TestCqlshOutput(BaseTestCase): read_repair_chance=0.100000 AND replicate_on_write='true' AND populate_io_cache_on_flush='false' AND + default_time_to_live=0 AND + speculative_retry='NONE' AND + memtable_flush_period_in_ms=0 AND compaction={'class': 'SizeTieredCompactionStrategy'} AND compression={'sstable_compression': 'LZ4Compressor'};
