Fix formatting of duration columns in CQLSH patch by Akhil Mehra; reviewed by Benjamin Lerer for CASSANDRA-13549
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a860a70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a860a70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a860a70 Branch: refs/heads/trunk Commit: 5a860a70f28b7756e0073d2d5d239b5e748a0b73 Parents: 60c2004 Author: Akhil Mehra <akhilme...@gmail.com> Authored: Mon May 29 17:31:57 2017 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon May 29 17:42:29 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + lib/cassandra-driver-internal-only-3.10.zip | Bin 0 -> 256997 bytes ...a-driver-internal-only-3.7.1.post0-19c1603.zip | Bin 252027 -> 0 bytes pylib/cqlshlib/formatting.py | 6 +----- 4 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a860a70/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a8e172e..c006b50 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a860a70/lib/cassandra-driver-internal-only-3.10.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-3.10.zip b/lib/cassandra-driver-internal-only-3.10.zip new file mode 100644 index 0000000..22b877c Binary files /dev/null and b/lib/cassandra-driver-internal-only-3.10.zip differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a860a70/lib/cassandra-driver-internal-only-3.7.1.post0-19c1603.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-3.7.1.post0-19c1603.zip b/lib/cassandra-driver-internal-only-3.7.1.post0-19c1603.zip deleted file mode 100644 index 900d64d..0000000 Binary files a/lib/cassandra-driver-internal-only-3.7.1.post0-19c1603.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a860a70/pylib/cqlshlib/formatting.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 08665fd..cf3b32d 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -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): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
