Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 2d825a181 -> 89596682e
Update cqlsh COPY for new driver conn interface Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10507 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85afbc7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85afbc7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a85afbc7 Branch: refs/heads/cassandra-2.2 Commit: a85afbc7a83709da8d96d92fc4154675794ca7fb Parents: c3ba6c8 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Oct 13 11:18:55 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Oct 13 11:18:55 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- bin/cqlsh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85afbc7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 20529e8..ff70045 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,7 @@ * Fix mmap file segment seeking to EOF (CASSANDRA-10478) * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) * Mark nodes as dead even if they've already left (CASSANDRA-10205) - * Update internal python driver used by cqlsh (CASSANDRA-10161) + * Update internal python driver used by cqlsh (CASSANDRA-10161, CASSANDRA-10507) 2.1.10 * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85afbc7/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index b649ab7..4a0a41b 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -1775,14 +1775,10 @@ class Shell(cmd.Cmd): fetch_size=None, paging_state=None, timestamp=insert_timestamp) request_id = conn.get_request_id() - binary_message = query_message.to_binary( - stream_id=request_id, protocol_version=DEFAULT_PROTOCOL_VERSION, compression=None) + conn.send_msg(query_message, request_id=request_id, cb=partial(callback, current_record)) - # add the message directly to the connection's queue with conn.lock: conn.in_flight += 1 - conn._callbacks[request_id] = partial(callback, current_record) - conn.deque.append(binary_message) # every 50 records, clear the pending writes queue and read # any responses we have
