Updated Branches:
refs/heads/trunk 51947d9ea -> 125a8c9c7
Merge branch 'cassandra-1.2' into trunk
Conflicts:
pylib/cqlshlib/cql3handling.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/125a8c9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/125a8c9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/125a8c9c
Branch: refs/heads/trunk
Commit: 125a8c9c79f605c1dcfe45e772441cdd0438dc74
Parents: 51947d9 6b093b4
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Dec 28 02:45:32 2012 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Dec 28 02:45:32 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 86 ++-
pylib/cqlshlib/cql3handling.py | 36 +-
pylib/cqlshlib/displaying.py | 8 +-
pylib/cqlshlib/formatting.py | 27 +-
pylib/cqlshlib/test/__init__.py | 20 +
pylib/cqlshlib/test/ansi_colors.py | 191 ++++
pylib/cqlshlib/test/basecase.py | 71 ++
pylib/cqlshlib/test/cassconnect.py | 159 ++++
pylib/cqlshlib/test/run_cqlsh.py | 271 ++++++
pylib/cqlshlib/test/table_arrangements.cql | 114 +++
pylib/cqlshlib/test/test_cql_parsing.py | 87 ++
pylib/cqlshlib/test/test_cqlsh_commands.py | 42 +
pylib/cqlshlib/test/test_cqlsh_completion.py | 243 ++++++
pylib/cqlshlib/test/test_cqlsh_invocation.py | 78 ++
pylib/cqlshlib/test/test_cqlsh_output.py | 965 +++++++++++++++++++++
pylib/cqlshlib/test/test_keyspace_init2.cql | 180 ++++
pylib/cqlshlib/test/test_keyspace_init3.cql | 36 +
18 files changed, 2562 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/125a8c9c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/125a8c9c/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/cql3handling.py
index 5b4d8fe,5293857..36e34e8
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -38,7 -38,7 +38,7 @@@ class UnexpectedTableStructure(UserWarn
def __str__(self):
return 'Unexpected table structure; may not translate correctly to
CQL. ' + self.msg
--SYSTEM_KEYSPACES = ('system', 'system_traces')
++SYSTEM_KEYSPACES = ('system', 'system_auth', 'system_traces')
class Cql3ParsingRuleSet(CqlParsingRuleSet):
keywords = set((
@@@ -58,39 -58,34 +58,37 @@@
columnfamily_options = (
# (CQL option name, Thrift option name (or None if same))
('comment', None),
+ ('compaction_strategy_class', 'compaction_strategy'),
('comparator', 'comparator_type'),
- ('read_repair_chance', None),
- ('gc_grace_seconds', None),
('default_validation', 'default_validation_class'),
- ('replicate_on_write', None),
- ('compaction_strategy_class', 'compaction_strategy'),
+ ('gc_grace_seconds', None),
+ ('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
old_columnfamily_layout_options = (
# (CQL3 option name, schema_columnfamilies column name (or None if
same))
- ('comment', None),
('bloom_filter_fp_chance', None),
('caching', None),
- ('read_repair_chance', None),
+ ('comment', None),
+ ('compaction_strategy_class', None),
('dclocal_read_repair_chance', 'local_read_repair_chance'),
('gc_grace_seconds', None),
- ('replicate_on_write', None),
- ('compaction_strategy_class', None),
+ ('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
new_columnfamily_layout_options = (
- ('comment', None),
('bloom_filter_fp_chance', None),
('caching', None),
- ('read_repair_chance', None),
+ ('comment', None),
('dclocal_read_repair_chance', 'local_read_repair_chance'),
('gc_grace_seconds', None),
- ('replicate_on_write', None),
- ('default_read_consistency', None),
- ('default_write_consistency', None),
+ ('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
old_columnfamily_layout_map_options = (
