Revert "Revert "Update cqlsh driver for new driver execution API""
This reverts commit 0fbf715916b48a8e8abad5911e2697791b49f824. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d340bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d340bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d340bef Branch: refs/heads/cassandra-3.0 Commit: 1d340befafa62e7d6fbe05fd7d0acb6cf1611c88 Parents: e3936ff Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 14:36:05 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 14:36:05 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 67 +++++++++---------- lib/cassandra-driver-internal-only-2.7.2.zip | Bin 229600 -> 0 bytes ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes 3 files changed, 30 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d340bef/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index e092d44..c92a6b9 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -111,13 +111,13 @@ except ImportError, e: 'Error: %s\n' % (sys.executable, sys.path, e)) from cassandra.auth import PlainTextAuthProvider -from cassandra.cluster import Cluster, PagedResult +from cassandra.cluster import Cluster from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata, TableMetadata, protect_name, protect_names, protect_value) from cassandra.policies import WhiteListRoundRobinPolicy from cassandra.protocol import QueryMessage, ResultMessage -from cassandra.query import SimpleStatement, ordered_dict_factory +from cassandra.query import SimpleStatement, ordered_dict_factory, TraceUnavailable # cqlsh should run correctly when run out of a Cassandra source tree, # out of an unpacked Cassandra tarball, and after a proper package install. @@ -680,6 +680,7 @@ class Shell(cmd.Cmd): self.session.default_timeout = client_timeout self.session.row_factory = ordered_dict_factory + self.session.default_consistency_level = cassandra.ConsistencyLevel.ONE self.get_connection_versions() self.current_keyspace = keyspace @@ -1143,8 +1144,8 @@ class Shell(cmd.Cmd): def do_use(self, parsed): ksname = parsed.get_binding('ksname') - result, future = self.perform_simple_statement(SimpleStatement(parsed.extract_orig())) - if result: + success, _ = self.perform_simple_statement(SimpleStatement(parsed.extract_orig())) + if success: if ksname[0] == '"' and ksname[-1] == '"': self.current_keyspace = self.cql_unprotect_name(ksname) else: @@ -1161,7 +1162,7 @@ class Shell(cmd.Cmd): def perform_statement(self, statement): stmt = SimpleStatement(statement, consistency_level=self.consistency_level, serial_consistency_level=self.serial_consistency_level, fetch_size=self.page_size if self.use_paging else None) - result, future = self.perform_simple_statement(stmt) + success, future = self.perform_simple_statement(stmt) if future: if future.warnings: @@ -1169,19 +1170,17 @@ class Shell(cmd.Cmd): if self.tracing_enabled: try: - trace = future.get_query_trace(self.max_trace_wait) - if trace: + for trace in future.get_all_query_traces(self.max_trace_wait): print_trace(self, trace) - elif stmt.trace_id: - self.writeresult("This statement trace may be incomplete", color=RED) - self.show_session(stmt.trace_id) - else: - msg = "Statement trace did not complete within %d seconds" % (self.session.max_trace_wait) - self.writeresult(msg, color=RED) + except TraceUnavailable: + msg = "Statement trace did not complete within %d seconds; trace data may be incomplete." % (self.session.max_trace_wait,) + self.writeresult(msg, color=RED) + for trace_id in future.get_query_trace_ids(): + self.show_session(trace_id) except Exception, err: self.printerr("Unable to fetch query trace: %s" % (str(err),)) - return result + return success def parse_for_select_meta(self, query_string): try: @@ -1214,7 +1213,7 @@ class Shell(cmd.Cmd): while True: try: future = self.session.execute_async(statement, trace=self.tracing_enabled) - rows = future.result(self.session.default_timeout) + result = future.result() break except cassandra.OperationTimedOut, err: self.refresh_schema_metadata_best_effort() @@ -1229,42 +1228,36 @@ class Shell(cmd.Cmd): return False, None if statement.query_string[:6].lower() == 'select': - self.print_result(rows, self.parse_for_select_meta(statement.query_string)) + self.print_result(result, self.parse_for_table_meta(statement.query_string)) elif statement.query_string.lower().startswith("list users") or statement.query_string.lower().startswith("list roles"): - self.print_result(rows, self.get_table_meta('system_auth', 'roles')) + self.print_result(result, self.get_table_meta('system_auth', 'roles')) elif statement.query_string.lower().startswith("list"): - self.print_result(rows, self.get_table_meta('system_auth', 'role_permissions')) + self.print_result(result, self.get_table_meta('system_auth', 'role_permissions')) elif rows: # CAS INSERT/UPDATE self.writeresult("") - self.print_static_result(rows, self.parse_for_update_meta(statement.query_string)) + self.print_static_result(list(result), self.parse_for_update_meta(statement.query_string)) self.flush_output() return True, future - def print_result(self, rows, table_meta): + def print_result(self, result, table_meta): self.decoding_errors = [] self.writeresult("") - if isinstance(rows, PagedResult) and self.tty: + if result.has_more_pages and self.tty: num_rows = 0 while True: - page = list(rows.current_response) - if not page: - break - num_rows += len(page) - self.print_static_result(page, table_meta) - if not rows.response_future.has_more_pages: - break - raw_input("---MORE---") - - rows.response_future.start_fetching_next_page() - result = rows.response_future.result() - if rows.response_future.has_more_pages: - rows.current_response = result.current_response - else: - rows.current_response = iter(result) + page = result.current_rows + if page: + num_rows += len(page) + self.print_static_result(page, table_meta) + if result.has_more_pages: + raw_input("---MORE---") + result.fetch_next_page() + else: + break else: - rows = list(rows or []) + rows = list(result) num_rows = len(rows) self.print_static_result(rows, table_meta) self.writeresult("(%d rows)" % num_rows) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d340bef/lib/cassandra-driver-internal-only-2.7.2.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-2.7.2.zip b/lib/cassandra-driver-internal-only-2.7.2.zip deleted file mode 100644 index f2e75f1..0000000 Binary files a/lib/cassandra-driver-internal-only-2.7.2.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d340bef/lib/cassandra-driver-internal-only-3.0.0a2.post0-95c6008.zip ---------------------------------------------------------------------- diff --git a/lib/cassandra-driver-internal-only-3.0.0a2.post0-95c6008.zip b/lib/cassandra-driver-internal-only-3.0.0a2.post0-95c6008.zip new file mode 100644 index 0000000..da7fa0d Binary files /dev/null and b/lib/cassandra-driver-internal-only-3.0.0a2.post0-95c6008.zip differ