cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 14 Oct 2015 16:21:42 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 25366f7d441358b8e25604e1831056470876b3b3
Parents: 8a94432 02f88e3
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Oct 14 11:19:35 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Oct 14 11:19:35 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25366f7d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4da4aab,b16acb5..c02e2fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -2.1.12
 +2.2.4
 +Merged from 2.1:
+  * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
   * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25366f7d/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/formatting.py
index c26e20c,79e661b..e95df9f
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -175,9 -156,9 +175,9 @@@ def format_floating_point_type(val, col
      if math.isnan(val):
          bval = 'NaN'
      elif math.isinf(val):
-         bval = 'Infinity'
+         bval = 'Infinity' if val > 0 else '-Infinity'
      else:
 -        exponent = int(math.log10(abs(val))) if abs(val) > sys.float_info.epsilon else
-sys.maxint - 1
 +        exponent = int(math.log10(abs(val))) if abs(val) > sys.float_info.epsilon else
-sys.maxsize - 1
          if -4 <= exponent < float_precision:
              # when this is true %g will not use scientific notation,
              # increasing precision should not change this decision


Mime
View raw message