cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] git commit: cqlsh: handle disabled compression in DESCRIBE output
Date Thu, 18 Jul 2013 20:44:15 GMT
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 <aleksey@apache.org>
Authored: Thu Jul 18 23:42:14 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
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")


Mime
View raw message