natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix formatting of duration columns in CQLSH 

patch by Akhil Mehra; reviewed by Benjamin Lerer for CASSANDRA-13549
This commit is contained in:
Akhil Mehra 2017-05-29 17:31:57 +02:00 committed by Benjamin Lerer
parent 60c2004963
commit 5a860a70f2
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.11.0
* Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
* Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
* Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
* Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)

BIN
lib/cassandra-driver-internal-only-3.10.zip Normal file
View File

Binary file not shown.

BIN
lib/cassandra-driver-internal-only-3.7.1.post0-19c1603.zip
View File

Binary file not shown.

6
pylib/cqlshlib/formatting.py
View File

@ -396,11 +396,7 @@ def format_value_time(val, colormap, **_):
@formatter_for('Duration')
def format_value_duration(val, colormap, **_):
buf = six.iterbytes(val)
months = decode_vint(buf)
days = decode_vint(buf)
nanoseconds = decode_vint(buf)
return format_python_formatted_type(duration_as_str(months, days, nanoseconds), colormap, 'duration')
return format_python_formatted_type(duration_as_str(val.months, val.days, val.nanoseconds), colormap, 'duration')
def duration_as_str(months, days, nanoseconds):