Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 d3e00ef86 -> 24a1a5d71
cqlsh: Fix using COPY through SOURCE or -f Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for CASSANDRA-9083 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d26943f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d26943f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d26943f Branch: refs/heads/cassandra-2.2 Commit: 5d26943fdabcaa3c11619fea629f086212819f0d Parents: f1b22df Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Jun 4 11:39:00 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Jun 4 11:39:00 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cqlhandling.py | 18 +++++++++++++++++- pylib/cqlshlib/pylexotron.py | 12 +++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d26943f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ac3fc53..928eb55 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.6 + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083) * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487) * Use ProtocolError code instead of ServerError code for native protocol error responses to unsupported protocol versions (CASSANDRA-9451) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d26943f/pylib/cqlshlib/cqlhandling.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/cqlhandling.py b/pylib/cqlshlib/cqlhandling.py index 6e61ac1..1836961 100644 --- a/pylib/cqlshlib/cqlhandling.py +++ b/pylib/cqlshlib/cqlhandling.py @@ -22,6 +22,7 @@ from . import pylexotron, util Hint = pylexotron.Hint + class CqlParsingRuleSet(pylexotron.ParsingRuleSet): keywords = set() @@ -72,9 +73,11 @@ class CqlParsingRuleSet(pylexotron.ParsingRuleSet): def explain_completion(self, rulename, symname, explanation=None): if explanation is None: explanation = '<%s>' % (symname,) + @self.completer_for(rulename, symname) def explainer(ctxt, cass): return [Hint(explanation)] + return explainer def set_keywords_as_syntax(self): @@ -96,6 +99,19 @@ class CqlParsingRuleSet(pylexotron.ParsingRuleSet): else: # don't put any 'endline' tokens in output continue + + # Convert all unicode tokens to ascii, where possible. This + # helps avoid problems with performing unicode-incompatible + # operations on tokens (like .lower()). See CASSANDRA-9083 + # for one example of this. + str_token = t[1] + if isinstance(str_token, unicode): + try: + str_token = str_token.encode('ascii') + t = (t[0], str_token) + t[2:] + except UnicodeEncodeError: + pass + curstmt.append(t) if t[0] == 'endtoken': term_on_nl = False @@ -191,7 +207,7 @@ class CqlParsingRuleSet(pylexotron.ParsingRuleSet): # for completion. the opening quote is already there on the command # line and not part of the word under completion, and readline # fills in the closing quote for us. - candidates = [requoter(dequoter(c))[len(prefix)+1:-1] for c in candidates] + candidates = [requoter(dequoter(c))[len(prefix) + 1:-1] for c in candidates] # the above process can result in an empty string; this doesn't help for # completions http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d26943f/pylib/cqlshlib/pylexotron.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/pylexotron.py b/pylib/cqlshlib/pylexotron.py index b4ac36f..b7558f5 100644 --- a/pylib/cqlshlib/pylexotron.py +++ b/pylib/cqlshlib/pylexotron.py @@ -100,7 +100,17 @@ class ParseContext: # pretty much just guess return ' '.join([t[1] for t in tokens]) # low end of span for first token, to high end of span for last token - return orig[tokens[0][2][0]:tokens[-1][2][1]] + orig_text = orig[tokens[0][2][0]:tokens[-1][2][1]] + + # Convert all unicode tokens to ascii, where possible. This + # helps avoid problems with performing unicode-incompatible + # operations on tokens (like .lower()). See CASSANDRA-9083 + # for one example of this. + try: + orig_text = orig_text.encode('ascii') + except UnicodeEncodeError: + pass + return orig_text def __repr__(self): return '<%s matched=%r remainder=%r prodname=%r bindings=%r>' \
