Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08FAE180A4 for ; Wed, 2 Dec 2015 10:30:14 +0000 (UTC) Received: (qmail 88206 invoked by uid 500); 2 Dec 2015 10:30:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 88166 invoked by uid 500); 2 Dec 2015 10:30:13 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 88154 invoked by uid 99); 2 Dec 2015 10:30:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 10:30:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6A16DFB02; Wed, 2 Dec 2015 10:30:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Dec 2015 10:30:13 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Normalize cqlsh DESC output Repository: cassandra Updated Branches: refs/heads/trunk ca70561f2 -> 244ba1998 Normalize cqlsh DESC output patch by Adam Holmberg; reviewed by Benjamin Lerer for CASSANDRA-10431 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcdbb0eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcdbb0eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcdbb0eb Branch: refs/heads/trunk Commit: bcdbb0eb940d7c8b2cb32431cc856c53ed379cff Parents: ad84add Author: Adam Holmberg Authored: Wed Dec 2 11:23:50 2015 +0100 Committer: Benjamin Lerer Committed: Wed Dec 2 11:23:50 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcdbb0eb/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1b3838d..1b7f3a2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.1 + * Normalize cqlsh DESC output (CASSANDRA-10431) * Rejects partition range deletions when columns are specified (CASSANDRA-10739) * Fix error when saving cached key for old format sstable (CASSANDRA-10778) * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcdbb0eb/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 7435f00..2206427 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -1546,7 +1546,7 @@ class Shell(cmd.Cmd): functions = filter(lambda f: f.name == functionname, ksmeta.functions.values()) if len(functions) == 0: raise FunctionNotFound("User defined function %r not found" % functionname) - print "\n\n".join(func.as_cql_query(formatted=True) for func in functions) + print "\n\n".join(func.export_as_string() for func in functions) print def describe_aggregates(self, ksname): @@ -1573,7 +1573,7 @@ class Shell(cmd.Cmd): aggregates = filter(lambda f: f.name == aggregatename, ksmeta.aggregates.values()) if len(aggregates) == 0: raise FunctionNotFound("User defined aggregate %r not found" % aggregatename) - print "\n\n".join(aggr.as_cql_query(formatted=True) for aggr in aggregates) + print "\n\n".join(aggr.export_as_string() for aggr in aggregates) print def describe_usertypes(self, ksname): @@ -1601,7 +1601,7 @@ class Shell(cmd.Cmd): usertype = ksmeta.user_types[typename] except KeyError: raise UserTypeNotFound("User type %r not found" % typename) - print usertype.as_cql_query(formatted=True) + print usertype.export_as_string() print def describe_cluster(self):