You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/05/15 15:08:13 UTC
[1/2] git commit: cqlsh: fix DESCRIBE after case insensitive USE
Updated Branches:
refs/heads/trunk 793d58a19 -> c70740fbc
cqlsh: fix DESCRIBE after case insensitive USE
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5567
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/384c27c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/384c27c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/384c27c3
Branch: refs/heads/trunk
Commit: 384c27c356ce57f59f36096a31ebb6fd267cb664
Parents: 1413945
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 15 16:06:31 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 15 16:06:31 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/384c27c3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 498f447..2182768 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@
* Fix repair hanging silently on unexpected error (CASSANDRA-5229)
* Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
* Add nodetool enablebackup/disablebackup (CASSANDRA-5556)
+ * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567)
Merged from 1.1
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
* Use allocator information to improve memtable memory usage estimate
http://git-wip-us.apache.org/repos/asf/cassandra/blob/384c27c3/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index a29eee4..974c916 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -32,7 +32,7 @@ exit 1
from __future__ import with_statement
description = "CQL Shell for Apache Cassandra"
-version = "3.0.1"
+version = "3.0.2"
from StringIO import StringIO
from itertools import groupby
@@ -962,7 +962,10 @@ class Shell(cmd.Cmd):
def do_use(self, parsed):
ksname = parsed.get_binding('ksname')
if self.perform_statement_untraced(parsed.extract_orig()):
- self.current_keyspace = self.cql_unprotect_name(ksname)
+ if ksname[0] == '"' and ksname[-1] == '"':
+ self.current_keyspace = self.cql_unprotect_name(ksname)
+ else:
+ self.current_keyspace = ksname.lower()
def do_select(self, parsed):
ksname = parsed.get_binding('ksname')
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70740fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70740fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70740fb
Branch: refs/heads/trunk
Commit: c70740fbc41e562fac21baec4ece32449fe3443b
Parents: 793d58a 384c27c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 15 16:07:46 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 15 16:07:46 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70740fb/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70740fb/bin/cqlsh
----------------------------------------------------------------------