This is an automated email from the ASF dual-hosted git repository.
stefania pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c8081c2467cfa34efec5e44c7dd31b7a99db5945
Merge: 3940a9e f3568c0
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
AuthorDate: Thu Apr 9 08:56:38 2020 -0400
Merge branch 'cassandra-2.1' into cassandra-2.2
CHANGES.txt | 2 ++
pylib/cqlshlib/copyutil.py | 4 ++--
pylib/cqlshlib/formatting.py | 9 ++++++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 885d33e,d0d0993..56dd315
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,7 +1,57 @@@
-2.1.21
- * Fix parse error in cqlsh COPY FROM and formatting for map of blobs
(CASSANDRA-15679)
+2.2.18
+ * Disable JMX rebinding (CASSANDRA-15653)
++Merged from 2.1:
++ * Fix parse error in cqlsh COPY FROM and formatting for map of blobs
(CASSANDRA-15679)
+
+2.2.17
+ * Fix Commit log replays when static column clustering keys are collections
(CASSANDRA-14365)
+ * Fix Red Hat init script on newer systemd versions (CASSANDRA-15273)
+ * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567)
+
+2.2.16
+ * Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
+ * In-JVM DTest: Set correct internode message version for upgrade test
(CASSANDRA-15371)
+ * In-JVM DTest: Support NodeTool in dtest
+
+2.2.15
+ * Catch non-IOException in FileUtils.close to make sure that all resources
are closed (CASSANDRA-15225)
+ * Handle exceptions during authentication/authorization (CASSANDRA-15041)
+ * Fix JDK7 compatibility broken in cassandra-2.2 (CASSANDRA-15050)
+ * Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078)
+ * Fix index summary redistribution cancellation (CASSANDRA-15045)
+ * Refactor Circle CI configuration (CASSANDRA-14806)
+ * Fixing invalid CQL in security documentation (CASSANDRA-15020)
+ * Make tools/bin/token-generator py2/3 compatible (CASSANDRA-15012)
+ * Multi-version in-JVM dtests (CASSANDRA-14937)
+ * Allow instance class loaders to be garbage collected for inJVM dtest
(CASSANDRA-15170)
+ * Add support for network topology and query tracing for inJVM dtest
(CASSANDRA-15319)
+
+
+2.2.14
+ * CircleCI docker image should bake in more dependencies (CASSANDRA-14985)
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
+ * MigrationManager attempts to pull schema from different major version
nodes (CASSANDRA-14928)
+ * Don't skip entire sstables when reading backwards with mixed clustering
column order
+ (CASSANDRA-14910)
+ * Cannot perform slice reads in reverse direction against tables with
clustering columns
+ in mixed order (CASSANDRA-14899)
+ * Fix incorrect cqlsh results when selecting same columns multiple times
(CASSANDRA-13262)
+ * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
+Merged from 2.1:
* Paged Range Slice queries with DISTINCT can drop rows from results
(CASSANDRA-14956)
* Update release checksum algorithms to SHA-256, SHA-512 (CASSANDRA-14970)
+
+
+2.2.13
+ * Fix bug that prevented compaction of SSTables after full repairs
(CASSANDRA-14423)
+ * Incorrect counting of pending messages in OutboundTcpConnection
(CASSANDRA-11551)
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
+ * Use Bounds instead of Range for sstables in anticompaction
(CASSANDRA-14411)
+ * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
+ * Fix query pager DEBUG log leak causing hit in paged reads throughput
(CASSANDRA-14318)
+ * Backport circleci yaml (CASSANDRA-14240)
+Merged from 2.1:
* Check checksum before decompressing data (CASSANDRA-14284)
* CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt
(CASSANDRA-14183)
diff --cc pylib/cqlshlib/copyutil.py
index c9c5829,a8bd0a2..b28d96d
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -52,7 -52,7 +52,7 @@@ from cassandra.util import Date, Tim
from cql3handling import CqlRuleSet
from displaying import NO_COLOR_MAP
- from formatting import format_value_default, DateTimeFormat, EMPTY,
get_formatter
-from formatting import format_value_default, EMPTY, get_formatter, BlobType
++from formatting import format_value_default, DateTimeFormat, EMPTY,
get_formatter, BlobType
from sslhandling import ssl_settings
PROFILE_ON = False
@@@ -1810,7 -1726,7 +1810,7 @@@ class ImportConversion(object)
return converters.get(t.typename, convert_unknown)(v, ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
- return BlobType(unicode(v[2:]).decode("hex"))
++ return BlobType(v[2:].decode("hex"))
def convert_text(v, **_):
return v
diff --cc pylib/cqlshlib/formatting.py
index f88fc5d,436404a..f95bfff
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -147,10 -126,16 +147,16 @@@ def formatter_for(typname)
return f
return registrator
+ class BlobType(object):
+ def __init__(self, val):
+ self.val = val
- @formatter_for('bytearray')
+ def __str__(self):
+ return str(self.val)
+
+ @formatter_for('BlobType')
def format_value_blob(val, colormap, **_):
- bval = '0x' + binascii.hexlify(str(val))
+ bval = '0x' + binascii.hexlify(val)
return colorme(bval, colormap, 'blob')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
