You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/05/18 01:03:15 UTC
[01/10] cassandra git commit: Add seconds to cqlsh tracing session
duration
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 330d7d40b -> e8e917ff9
refs/heads/cassandra-3.0 ca5bf64bf -> 54b743825
refs/heads/cassandra-3.7 3e7a2c8f1 -> 33ddb6798
refs/heads/trunk fb466f99f -> f2443618f
Add seconds to cqlsh tracing session duration
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11753
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8e917ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8e917ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8e917ff
Branch: refs/heads/cassandra-2.2
Commit: e8e917ff9fa47fd48b85f4cc767a61bf297b3225
Parents: 330d7d4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon May 16 11:00:29 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:52:43 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfcad10..befb520 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
* Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
2.2.7
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
* Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tracing.py b/pylib/cqlshlib/tracing.py
index 2ded259..c30965c 100644
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@ -15,7 +15,7 @@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
-from datetime import datetime
+from datetime import datetime, timedelta
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@ -66,17 +66,24 @@ def make_trace_rows(trace):
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--"])
+ total_micro_seconds(event.source_elapsed)])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds])
+ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
else:
finished_at = trace.duration = "--"
return rows
+def total_micro_seconds(td):
+ """
+ Convert a timedelta into total microseconds
+ """
+ return int((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)) if td else "--"
+
+
def datetime_from_utc_to_local(utc_datetime):
now_timestamp = time.time()
offset = datetime.fromtimestamp(now_timestamp) - datetime.utcfromtimestamp(now_timestamp)
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b74382
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b74382
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b74382
Branch: refs/heads/trunk
Commit: 54b74382527eb796c9b69b6ead64873530137918
Parents: ca5bf64 e8e917f
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:55:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:55:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b74382/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4361ab4,befb520..b3e7d5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,8 +1,33 @@@
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
-
-2.2.7
+3.0.7
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
[10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2443618
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2443618
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2443618
Branch: refs/heads/trunk
Commit: f2443618f22521a9b75a52536f2f2a9e328badc6
Parents: fb466f9 33ddb67
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:59:11 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:59:11 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2443618/CHANGES.txt
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33ddb679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ddb679
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ddb679
Branch: refs/heads/cassandra-3.7
Commit: 33ddb6798498995888c8882ac5502ddb65d94555
Parents: 3e7a2c8 54b7438
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:56:54 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:58:51 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33ddb679/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ea212c,b3e7d5e..26c2939
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,79 -3,10 +4,80 @@@ Merged from 3.0
* Refactor Materialized View code (CASSANDRA-11475)
* Update Java Driver (CASSANDRA-11615)
Merged from 2.2:
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
-3.0.6
+3.6
+ * Allow server startup if JMX is configured directly (CASSANDRA-11725)
+ * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710)
+ * Enhanced Compaction Logging (CASSANDRA-10805)
+ * Make prepared statement cache size configurable (CASSANDRA-11555)
+ * Integrated JMX authentication and authorization (CASSANDRA-10091)
+ * Add units to stress ouput (CASSANDRA-11352)
+ * Fix PER PARTITION LIMIT for single and multi partitions queries (CASSANDRA-11603)
+ * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
+ * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
+ * Always perform collision check before joining ring (CASSANDRA-10134)
+ * SSTableWriter output discrepancy (CASSANDRA-11646)
+ * Fix potential timeout in NativeTransportService.testConcurrentDestroys (CASSANDRA-10756)
+ * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
+ * Add support to rebuild from specific range (CASSANDRA-10406)
+ * Optimize the overlapping lookup by calculating all the
+ bounds in advance (CASSANDRA-11571)
+ * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
+ * (stress) Add datacenter option to -node options (CASSANDRA-11591)
+ * Fix handling of empty slices (CASSANDRA-11513)
+ * Make number of cores used by cqlsh COPY visible to testing code (CASSANDRA-11437)
+ * Allow filtering on clustering columns for queries without secondary indexes (CASSANDRA-11310)
+ * Refactor Restriction hierarchy (CASSANDRA-11354)
+ * Eliminate allocations in R/W path (CASSANDRA-11421)
+ * Update Netty to 4.0.36 (CASSANDRA-11567)
+ * Fix PER PARTITION LIMIT for queries requiring post-query ordering (CASSANDRA-11556)
+ * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
+ * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
+ * Support for non-frozen user-defined types, updating
+ individual fields of user-defined types (CASSANDRA-7423)
+ * Make LZ4 compression level configurable (CASSANDRA-11051)
+ * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
+ * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
+ * Improve field-checking and error reporting in cassandra.yaml (CASSANDRA-10649)
+ * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
+ * More user friendly error when providing an invalid token to nodetool (CASSANDRA-9348)
+ * Add static column support to SASI index (CASSANDRA-11183)
+ * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization (CASSANDRA-11434)
+ * Support LIKE operator in prepared statements (CASSANDRA-11456)
+ * Add a command to see if a Materialized View has finished building (CASSANDRA-9967)
+ * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
+ * Print sensible units for all log messages (CASSANDRA-9692)
+ * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
+ * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
+ * Compress only inter-dc traffic by default (CASSANDRA-8888)
+ * Add metrics to track write amplification (CASSANDRA-11420)
+ * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
+ * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
+ * Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220)
+ * Add auto import java.util for UDF code block (CASSANDRA-11392)
+ * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
+ * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
+ * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
+ * COPY TO should have higher double precision (CASSANDRA-11255)
+ * Stress should exit with non-zero status after failure (CASSANDRA-10340)
+ * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
+ * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
+ * Store repair options in parent_repair_history (CASSANDRA-11244)
+ * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
+ * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
+ * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
+ * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
+ * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
+ * Refuse to start and print txn log information in case of disk
+ corruption (CASSANDRA-10112)
+ * Resolve some eclipse-warnings (CASSANDRA-11086)
+ * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
+ * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
+Merged from 3.0:
* Disallow creating view with a static column (CASSANDRA-11602)
* Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
* Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33ddb679/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/tracing.py
index 0a11206,c30965c..b957c63
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@@ -15,8 -15,7 +15,8 @@@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
- from datetime import datetime
+ from datetime import datetime, timedelta
+from formatting import CqlType
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@@ -67,12 -66,11 +67,12 @@@ def make_trace_rows(trace)
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--",
- total_micro_seconds(event.source_elapsed)])
++ total_micro_seconds(event.source_elapsed),
+ trace.client])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds, trace.client])
- rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
++ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration), trace.client])
else:
finished_at = trace.duration = "--"
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33ddb679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ddb679
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ddb679
Branch: refs/heads/trunk
Commit: 33ddb6798498995888c8882ac5502ddb65d94555
Parents: 3e7a2c8 54b7438
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:56:54 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:58:51 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33ddb679/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ea212c,b3e7d5e..26c2939
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,79 -3,10 +4,80 @@@ Merged from 3.0
* Refactor Materialized View code (CASSANDRA-11475)
* Update Java Driver (CASSANDRA-11615)
Merged from 2.2:
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
-3.0.6
+3.6
+ * Allow server startup if JMX is configured directly (CASSANDRA-11725)
+ * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710)
+ * Enhanced Compaction Logging (CASSANDRA-10805)
+ * Make prepared statement cache size configurable (CASSANDRA-11555)
+ * Integrated JMX authentication and authorization (CASSANDRA-10091)
+ * Add units to stress ouput (CASSANDRA-11352)
+ * Fix PER PARTITION LIMIT for single and multi partitions queries (CASSANDRA-11603)
+ * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
+ * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
+ * Always perform collision check before joining ring (CASSANDRA-10134)
+ * SSTableWriter output discrepancy (CASSANDRA-11646)
+ * Fix potential timeout in NativeTransportService.testConcurrentDestroys (CASSANDRA-10756)
+ * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
+ * Add support to rebuild from specific range (CASSANDRA-10406)
+ * Optimize the overlapping lookup by calculating all the
+ bounds in advance (CASSANDRA-11571)
+ * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
+ * (stress) Add datacenter option to -node options (CASSANDRA-11591)
+ * Fix handling of empty slices (CASSANDRA-11513)
+ * Make number of cores used by cqlsh COPY visible to testing code (CASSANDRA-11437)
+ * Allow filtering on clustering columns for queries without secondary indexes (CASSANDRA-11310)
+ * Refactor Restriction hierarchy (CASSANDRA-11354)
+ * Eliminate allocations in R/W path (CASSANDRA-11421)
+ * Update Netty to 4.0.36 (CASSANDRA-11567)
+ * Fix PER PARTITION LIMIT for queries requiring post-query ordering (CASSANDRA-11556)
+ * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
+ * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
+ * Support for non-frozen user-defined types, updating
+ individual fields of user-defined types (CASSANDRA-7423)
+ * Make LZ4 compression level configurable (CASSANDRA-11051)
+ * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
+ * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
+ * Improve field-checking and error reporting in cassandra.yaml (CASSANDRA-10649)
+ * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
+ * More user friendly error when providing an invalid token to nodetool (CASSANDRA-9348)
+ * Add static column support to SASI index (CASSANDRA-11183)
+ * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization (CASSANDRA-11434)
+ * Support LIKE operator in prepared statements (CASSANDRA-11456)
+ * Add a command to see if a Materialized View has finished building (CASSANDRA-9967)
+ * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
+ * Print sensible units for all log messages (CASSANDRA-9692)
+ * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
+ * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
+ * Compress only inter-dc traffic by default (CASSANDRA-8888)
+ * Add metrics to track write amplification (CASSANDRA-11420)
+ * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
+ * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
+ * Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220)
+ * Add auto import java.util for UDF code block (CASSANDRA-11392)
+ * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
+ * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
+ * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
+ * COPY TO should have higher double precision (CASSANDRA-11255)
+ * Stress should exit with non-zero status after failure (CASSANDRA-10340)
+ * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
+ * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
+ * Store repair options in parent_repair_history (CASSANDRA-11244)
+ * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
+ * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
+ * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
+ * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
+ * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
+ * Refuse to start and print txn log information in case of disk
+ corruption (CASSANDRA-10112)
+ * Resolve some eclipse-warnings (CASSANDRA-11086)
+ * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
+ * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
+Merged from 3.0:
* Disallow creating view with a static column (CASSANDRA-11602)
* Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
* Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33ddb679/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/tracing.py
index 0a11206,c30965c..b957c63
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@@ -15,8 -15,7 +15,8 @@@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
- from datetime import datetime
+ from datetime import datetime, timedelta
+from formatting import CqlType
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@@ -67,12 -66,11 +67,12 @@@ def make_trace_rows(trace)
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--",
- total_micro_seconds(event.source_elapsed)])
++ total_micro_seconds(event.source_elapsed),
+ trace.client])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds, trace.client])
- rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
++ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration), trace.client])
else:
finished_at = trace.duration = "--"
[03/10] cassandra git commit: Add seconds to cqlsh tracing session
duration
Posted by st...@apache.org.
Add seconds to cqlsh tracing session duration
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11753
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8e917ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8e917ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8e917ff
Branch: refs/heads/cassandra-3.7
Commit: e8e917ff9fa47fd48b85f4cc767a61bf297b3225
Parents: 330d7d4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon May 16 11:00:29 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:52:43 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfcad10..befb520 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
* Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
2.2.7
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
* Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tracing.py b/pylib/cqlshlib/tracing.py
index 2ded259..c30965c 100644
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@ -15,7 +15,7 @@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
-from datetime import datetime
+from datetime import datetime, timedelta
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@ -66,17 +66,24 @@ def make_trace_rows(trace):
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--"])
+ total_micro_seconds(event.source_elapsed)])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds])
+ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
else:
finished_at = trace.duration = "--"
return rows
+def total_micro_seconds(td):
+ """
+ Convert a timedelta into total microseconds
+ """
+ return int((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)) if td else "--"
+
+
def datetime_from_utc_to_local(utc_datetime):
now_timestamp = time.time()
offset = datetime.fromtimestamp(now_timestamp) - datetime.utcfromtimestamp(now_timestamp)
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b74382
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b74382
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b74382
Branch: refs/heads/cassandra-3.0
Commit: 54b74382527eb796c9b69b6ead64873530137918
Parents: ca5bf64 e8e917f
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:55:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:55:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b74382/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4361ab4,befb520..b3e7d5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,8 +1,33 @@@
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
-
-2.2.7
+3.0.7
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54b74382
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54b74382
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54b74382
Branch: refs/heads/cassandra-3.7
Commit: 54b74382527eb796c9b69b6ead64873530137918
Parents: ca5bf64 e8e917f
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed May 18 08:55:36 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:55:36 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/54b74382/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4361ab4,befb520..b3e7d5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,8 +1,33 @@@
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
-
-2.2.7
+3.0.7
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
[04/10] cassandra git commit: Add seconds to cqlsh tracing session
duration
Posted by st...@apache.org.
Add seconds to cqlsh tracing session duration
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11753
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8e917ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8e917ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8e917ff
Branch: refs/heads/trunk
Commit: e8e917ff9fa47fd48b85f4cc767a61bf297b3225
Parents: 330d7d4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon May 16 11:00:29 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:52:43 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfcad10..befb520 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
* Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
2.2.7
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
* Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tracing.py b/pylib/cqlshlib/tracing.py
index 2ded259..c30965c 100644
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@ -15,7 +15,7 @@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
-from datetime import datetime
+from datetime import datetime, timedelta
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@ -66,17 +66,24 @@ def make_trace_rows(trace):
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--"])
+ total_micro_seconds(event.source_elapsed)])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds])
+ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
else:
finished_at = trace.duration = "--"
return rows
+def total_micro_seconds(td):
+ """
+ Convert a timedelta into total microseconds
+ """
+ return int((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)) if td else "--"
+
+
def datetime_from_utc_to_local(utc_datetime):
now_timestamp = time.time()
offset = datetime.fromtimestamp(now_timestamp) - datetime.utcfromtimestamp(now_timestamp)
[02/10] cassandra git commit: Add seconds to cqlsh tracing session
duration
Posted by st...@apache.org.
Add seconds to cqlsh tracing session duration
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11753
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8e917ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8e917ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8e917ff
Branch: refs/heads/cassandra-3.0
Commit: e8e917ff9fa47fd48b85f4cc767a61bf297b3225
Parents: 330d7d4
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon May 16 11:00:29 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed May 18 08:52:43 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/tracing.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfcad10..befb520 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
* Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
2.2.7
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
* Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8e917ff/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tracing.py b/pylib/cqlshlib/tracing.py
index 2ded259..c30965c 100644
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@ -15,7 +15,7 @@
# limitations under the License.
from cqlshlib.displaying import MAGENTA
-from datetime import datetime
+from datetime import datetime, timedelta
import time
from cassandra.query import QueryTrace, TraceUnavailable
@@ -66,17 +66,24 @@ def make_trace_rows(trace):
rows.append(["%s [%s]" % (event.description, event.thread_name),
str(datetime_from_utc_to_local(event.datetime)),
event.source,
- event.source_elapsed.microseconds if event.source_elapsed else "--"])
+ total_micro_seconds(event.source_elapsed)])
# append footer row (from sessions table).
if trace.duration:
finished_at = (datetime_from_utc_to_local(trace.started_at) + trace.duration)
- rows.append(['Request complete', str(finished_at), trace.coordinator, trace.duration.microseconds])
+ rows.append(['Request complete', str(finished_at), trace.coordinator, total_micro_seconds(trace.duration)])
else:
finished_at = trace.duration = "--"
return rows
+def total_micro_seconds(td):
+ """
+ Convert a timedelta into total microseconds
+ """
+ return int((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)) if td else "--"
+
+
def datetime_from_utc_to_local(utc_datetime):
now_timestamp = time.time()
offset = datetime.fromtimestamp(now_timestamp) - datetime.utcfromtimestamp(now_timestamp)