natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.1' into trunk

This commit is contained in:
Brandon Williams 2012-09-26 10:08:32 -05:00
parent c1724dd8a2 83b6f2229a
commit 2edeeeba2d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cqlsh
View File

@ -1770,7 +1770,7 @@ class Shell(cmd.Cmd):
return names
def columnize(self, slist, *a, **kw):
return cmd.Cmd.columnize(self, [u.upper() for u in slist], *a, **kw)
return cmd.Cmd.columnize(self, sorted([u.upper() for u in slist]), *a, **kw)
def do_help(self, parsed):
"""

5
pylib/cqlshlib/cql3handling.py
View File

@ -498,7 +498,10 @@ def create_ks_opt_completer(ctxt, cass):
return ['strategy_class =']
vals = ctxt.get_binding('optval')
stratclass = dequote_value(vals[stratopt])
if stratclass in ('SimpleStrategy', 'OldNetworkTopologyStrategy'):
if stratclass in ('SimpleStrategy',
'org.apache.cassandra.locator.SimpleStrategy',
'OldNetworkTopologyStrategy',
'org.apache.cassandra.locator.OldNetworkTopologyStrategy'):
return ['strategy_options:replication_factor =']
return [Hint('<strategy_option_name>')]

9
pylib/cqlshlib/cqlhandling.py
View File

@ -260,7 +260,9 @@ class CqlParsingRuleSet(pylexotron.ParsingRuleSet):
candidates = newcandidates
# append a space for single, complete identifiers
if len(candidates) == 1 and candidates[0][-1].isalnum():
if len(candidates) == 1 and candidates[0][-1].isalnum() \
and lasttype != 'unclosedString' \
and lasttype != 'unclosedName':
candidates[0] += ' '
return candidates, hints
@ -734,7 +736,10 @@ def create_ks_opt_completer(ctxt, cass):
return ['strategy_class =']
vals = ctxt.get_binding('optval')
stratclass = dequote_value(vals[stratopt])
if stratclass in ('SimpleStrategy', 'OldNetworkTopologyStrategy'):
if stratclass in ('SimpleStrategy',
'org.apache.cassandra.locator.SimpleStrategy',
'OldNetworkTopologyStrategy',
'org.apache.cassandra.locator.OldNetworkTopologyStrategy'):
return ['strategy_options:replication_factor =']
return [Hint('<strategy_option_name>')]