You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/09/18 20:48:23 UTC
git commit: Missing commit from 4594 merge.
Updated Branches:
refs/heads/trunk 60bf68caa -> 09d3e7f7f
Missing commit from 4594 merge.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09d3e7f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09d3e7f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09d3e7f7
Branch: refs/heads/trunk
Commit: 09d3e7f7f7f795fb14b4193b89db399f79c82990
Parents: 60bf68c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 18 13:47:56 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 18 13:47:56 2012 -0500
----------------------------------------------------------------------
bin/cqlsh | 2 ++
pylib/cqlshlib/cql3handling.py | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09d3e7f7/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 21cce89..f15b02c 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1081,6 +1081,8 @@ class Shell(cmd.Cmd):
self.prompt = prompt
def cql_protect_name(self, name):
+ if isinstance(name, unicode):
+ name = name.encode('utf8')
return cqlruleset.maybe_escape_name(name)
def cql_protect_value(self, value):
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09d3e7f7/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 9c5f337..27cec89 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -884,6 +884,7 @@ class CqlTableDef:
value_cols = [self.column_class(self.value_alias, self.default_validator)]
else:
value_cols = map(self.column_class.from_layout, self.coldefs)
+ value_cols.sort(key=lambda c: c.name)
return partkey_cols + colalias_cols + value_cols
@@ -918,6 +919,7 @@ class CqlTableDef:
warn(UnexpectedTableStructure("Dynamic storage CF has a value_alias (%r)"
% (self.value_alias,)))
value_cols = map(self.column_class.from_layout, self.coldefs)
+ value_cols.sort(key=lambda c: c.name)
return partkey_cols + colalias_cols + value_cols