You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/10/14 18:21:41 UTC
[1/3] cassandra git commit: cqlsh: Fix display of -infinity
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 dea36bd68 -> ebb2b1bed
cqlsh: Fix display of -infinity
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-10523
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02f88e38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02f88e38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02f88e38
Branch: refs/heads/cassandra-3.0
Commit: 02f88e38e1f148286cf2f6383d65d9d0f3697a08
Parents: bc1058f
Author: Adam Holmberg <ad...@datastax.com>
Authored: Wed Oct 14 11:17:50 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Oct 14 11:17:50 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/02f88e38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1338c6f..b16acb5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (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/02f88e38/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index 1049f00..79e661b 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -156,7 +156,7 @@ def format_floating_point_type(val, colormap, float_precision, **_):
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
if -4 <= exponent < float_precision:
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
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 <ty...@gmail.com>
Authored: Wed Oct 14 11:19:35 2015 -0500
Committer: Tyler Hobbs <ty...@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
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebb2b1be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebb2b1be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebb2b1be
Branch: refs/heads/cassandra-3.0
Commit: ebb2b1bedaf86195b144d519a3826adafe1327b5
Parents: dea36bd 25366f7
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Oct 14 11:21:28 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Oct 14 11:21:28 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/ebb2b1be/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 49a3c57,c02e2fa..54b505a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,22 @@@
-2.2.4
+3.0-rc2
+ * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
+ * Allow EACH_QUORUM for reads (CASSANDRA-9602)
+ * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
+ * Fix NPE in MVs on update (CASSANDRA-10503)
+ * Only include modified cell data in indexing deltas (CASSANDRA-10438)
+ * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
+ * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
+ * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
+ * Provide additional metrics for materialized views (CASSANDRA-10323)
+ * Flush system schema tables after local schema changes (CASSANDRA-10429)
+Merged from 2.2:
+ * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
+ * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
+ * Preserve case of quoted Role & User names (CASSANDRA-10394)
+ * cqlsh pg-style-strings broken (CASSANDRA-10484)
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
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)