From b4544846def2bdd00ff841c7e3d9f2559620827b Mon Sep 17 00:00:00 2001 From: Stefania Alborghetti Date: Tue, 15 Sep 2015 12:11:09 +0800 Subject: [PATCH] Update cqlsh COPY for new internal driver serialization interface Patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-10318 --- CHANGES.txt | 1 + bin/cqlsh.py | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 54d4ddf26a..36ae689c36 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.0-rc1 + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) * Give index implementations more control over rebuild operations (CASSANDRA-10312) * Update index file format (CASSANDRA-10314) * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 2636a596a7..df16371f1c 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -2388,16 +2388,11 @@ class ImportProcess(multiprocessing.Process): 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 if insert_num % 50 == 0: