cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [12/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Tue, 29 Nov 2016 21:36:11 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8de24ca6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8de24ca6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8de24ca6

Branch: refs/heads/cassandra-3.11
Commit: 8de24ca68adbee4078ea0d1cf18bd82d7bf050bb
Parents: c4cb915 d70b336
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Nov 29 15:34:26 2016 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Nov 29 15:34:26 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9579781,32bd821..72d6a1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -156,8 -44,6 +156,9 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
   * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
++ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
 + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
 + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using prepared statements
(CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8de24ca6/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index 0358c83,c132592..2387342
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1391,7 -1642,18 +1385,17 @@@ class Shell(cmd.Cmd)
          except KeyError:
              raise UserTypeNotFound("User type %r not found" % typename)
          print usertype.export_as_string()
 -        print
  
+     def _columnize_unicode(self, name_list, quote=False):
+         """
+         Used when columnizing identifiers that may contain unicode
+         """
+         names = [n.encode('utf-8') for n in name_list]
+         if quote:
+             names = protect_names(names)
+         cmd.Cmd.columnize(self, names)
+         print
+ 
      def describe_cluster(self):
          print '\nCluster: %s' % self.get_cluster_name()
          p = trim_if_present(self.get_partitioner(), 'org.apache.cassandra.dht.')


Mime
View raw message