cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/4] git commit: cqlsh: force CL.ONE for tracing and system.schema* queries; patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for CASSANDRA-5070
Date Mon, 17 Dec 2012 15:42:01 GMT
cqlsh: force CL.ONE for tracing and system.schema* queries;
patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for
CASSANDRA-5070


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

Branch: refs/heads/trunk
Commit: 63902c6d824a059d2f8901c7b3ca3bf727fb5641
Parents: 706612e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Dec 17 18:39:18 2012 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Dec 17 18:39:18 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt               |    1 +
 bin/cqlsh                 |   12 +++++++++---
 pylib/cqlshlib/tracing.py |    6 ++++--
 3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63902c6d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 520cf08..26097f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Merged from 1.1:
  * Fix ALTER TABLE overriding compression options with defaults
    (CASSANDRA-4996, CASSANDRA-5066)
  * Fix SimpleAuthorizer example (CASSANDRA-5072)
+ * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 
 
 1.2-rc1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63902c6d/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index f74dc42..e234e10 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -743,7 +743,9 @@ class Shell(cmd.Cmd):
         else:
             cf_q = """select "columnfamily" from system.schema_columnfamilies
                        where "keyspace"=:ks"""
-        self.cursor.execute(cf_q, {'ks': self.cql_unprotect_name(ksname)})
+        self.cursor.execute(cf_q,
+                            {'ks': self.cql_unprotect_name(ksname)},
+                            consistency_level='ONE')
         return [str(row[0]) for row in self.cursor.fetchall()]
 
     def get_columnfamily_layout(self, ksname, cfname):
@@ -759,11 +761,15 @@ class Shell(cmd.Cmd):
                        where "keyspace"=:ks and "columnfamily"=:cf"""
             col_q = """select * from system.schema_columns
                         where "keyspace"=:ks and "columnfamily"=:cf"""
-        self.cursor.execute(cf_q, {'ks': ksname, 'cf': cfname})
+        self.cursor.execute(cf_q,
+                            {'ks': ksname, 'cf': cfname},
+                            consistency_level='ONE')
         layout = self.fetchdict()
         if layout is None:
             raise ColumnFamilyNotFound("Column family %r not found" % cfname)
-        self.cursor.execute(col_q, {'ks': ksname, 'cf': cfname})
+        self.cursor.execute(col_q,
+                            {'ks': ksname, 'cf': cfname},
+                            consistency_level='ONE')
         cols = self.fetchdict_all()
         return cql3handling.CqlTableDef.from_layout(layout, cols)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63902c6d/pylib/cqlshlib/tracing.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tracing.py b/pylib/cqlshlib/tracing.py
index 5897c27..9cbea92 100644
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@ -40,12 +40,14 @@ def print_trace_session(shell, cursor, session_id):
 def fetch_trace_session(cursor, session_id):
     cursor.execute("SELECT request, coordinator, started_at, duration "
                    "FROM %s.%s "
-                   "WHERE session_id = '%s'" % (TRACING_KS, SESSIONS_CF, session_id))
+                   "WHERE session_id = '%s'" % (TRACING_KS, SESSIONS_CF, session_id),
+                   consistency_level='ONE')
     (request, coordinator, started_at, duration) = cursor.fetchone()
 
     cursor.execute("SELECT activity, event_id, source, source_elapsed "
                    "FROM %s.%s "
-                   "WHERE session_id = '%s'" % (TRACING_KS, EVENTS_CF, session_id))
+                   "WHERE session_id = '%s'" % (TRACING_KS, EVENTS_CF, session_id),
+                   consistency_level='ONE')
     events = cursor.fetchall()
 
     rows = []


Mime
View raw message