cassandra-commits mailing list archives

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


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

Branch: refs/heads/cassandra-3.11
Commit: d70b336de3f70e29858f7368e37bf7333fa1222c
Parents: 820e7a8 d38bf9f
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Nov 29 15:30:35 2016 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Nov 29 15:30:35 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/d70b336d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b77d84a,d951b07..32bd821
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,7 +1,49 @@@
 -2.2.9
 +3.0.11
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 +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)
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes AssertionError
(CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time (CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column (CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL value for LWTs
on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that generated the
byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499)
 + * 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:
   * 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/d70b336d/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index f722236,a9c5ff1..c132592
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1647,9 -1563,19 +1641,19 @@@ 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 _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