cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [1/2] cassandra git commit: Update cqlsh COPY for new internal driver serialization interface
Date Tue, 15 Sep 2015 17:27:26 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 7a0698ee1 -> 6d3617dd5


Update cqlsh COPY for new internal driver serialization interface

Patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-10318


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

Branch: refs/heads/trunk
Commit: b4544846def2bdd00ff841c7e3d9f2559620827b
Parents: 0633637
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue Sep 15 12:11:09 2015 +0800
Committer: T Jake Luciani <jake@apache.org>
Committed: Tue Sep 15 13:26:47 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4544846/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 54d4ddf..36ae689 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4544846/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 2636a59..df16371 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:


Mime
View raw message