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

cqlsh: handle 'null' as session duration 

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6317
This commit is contained in:
Aleksey Yeschenko 2013-11-09 03:03:49 +03:00
parent eb577459df
commit 310276555e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -13,6 +13,7 @@
* Remove blocking flushes in gossip thread (CASSANDRA-6297) * Remove blocking flushes in gossip thread (CASSANDRA-6297)
* Fix potential socket leak in connectionpool creation (CASSANDRA-6308) * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
* Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238) * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
* cqlsh: handle 'null' as session duration (CASSANDRA-6317)
1.2.11 1.2.11

9
pylib/cqlshlib/tracing.py
View File

@ -43,7 +43,6 @@ def fetch_trace_session(cursor, session_id):
"WHERE session_id = %s" % (TRACING_KS, SESSIONS_CF, session_id), "WHERE session_id = %s" % (TRACING_KS, SESSIONS_CF, session_id),
consistency_level='ONE') consistency_level='ONE')
(request, coordinator, started_at, duration) = cursor.fetchone() (request, coordinator, started_at, duration) = cursor.fetchone()
cursor.execute("SELECT activity, event_id, source, source_elapsed " cursor.execute("SELECT activity, event_id, source, source_elapsed "
"FROM %s.%s " "FROM %s.%s "
"WHERE session_id = %s" % (TRACING_KS, EVENTS_CF, session_id), "WHERE session_id = %s" % (TRACING_KS, EVENTS_CF, session_id),
@ -57,8 +56,12 @@ def fetch_trace_session(cursor, session_id):
for activity, event_id, source, source_elapsed in events: for activity, event_id, source, source_elapsed in events:
rows.append([activity, format_timeuuid(event_id), source, source_elapsed]) rows.append([activity, format_timeuuid(event_id), source, source_elapsed])
# append footer row (from sessions table). # append footer row (from sessions table).
finished_at = started_at + (duration / 1000000.) if duration:
rows.append(['Request complete', format_timestamp(finished_at), coordinator, duration]) finished_at = format_timestamp(started_at + (duration / 1000000.))
else:
finished_at = duration = "--"
rows.append(['Request complete', finished_at, coordinator, duration])
return rows return rows