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 950A410217 for ; Thu, 18 Jul 2013 20:44:15 +0000 (UTC) Received: (qmail 19020 invoked by uid 500); 18 Jul 2013 20:44:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 18995 invoked by uid 500); 18 Jul 2013 20:44:15 -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 18987 invoked by uid 99); 18 Jul 2013 20:44:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 20:44:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 219638ADD98; Thu, 18 Jul 2013 20:44:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Thu, 18 Jul 2013 20:44:15 -0000 Message-Id: <6c6f14fbb4ba4db1b4ff5c71e7f210ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: cqlsh: handle disabled compression in DESCRIBE output Updated Branches: refs/heads/trunk 30b324d59 -> c4c04e780 cqlsh: handle disabled compression in DESCRIBE output patch by Aleksey Yeschenko; reviewed by Brandon Williams for CASSANDRA-5766 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01b881cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01b881cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01b881cb Branch: refs/heads/trunk Commit: 01b881cb22d328511637b422d0a9e283e0ed2eb7 Parents: 2188d64 Author: Aleksey Yeschenko Authored: Thu Jul 18 23:42:14 2013 +0300 Committer: Aleksey Yeschenko Committed: Thu Jul 18 23:42:14 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b881cb/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 15966cc..c0dda21 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,7 @@ * Fix querying with an empty (impossible) range (CASSANDRA-5573) * cqlsh: handle CUSTOM 2i in DESCRIBE output (CASSANDRA-5760) * Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771) + * cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766) 1.2.6 http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b881cb/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index 62b5500..643324c 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.1.3" +version = "3.1.4" from StringIO import StringIO from itertools import groupby @@ -1439,8 +1439,6 @@ class Shell(cmd.Cmd): optval = '{%s}' % ', '.join(['%s: %s' % (self.cql_protect_value(k), self.cql_protect_value(v)) for (k, v) in optval.items()]) - if optval == '{}': - continue out.write(" %s\n %s=%s" % (joiner, optname, optval)) joiner = 'AND' out.write(";\n")