cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Date Mon, 28 Mar 2016 18:03:01 GMT
Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 8602918722c96f3ffa6b970597d4ff6927b24707
Parents: 5beedbc c7ef7c9
Author: Josh McKenzie <josh.mckenzie@datastax.com>
Authored: Mon Mar 28 13:56:13 2016 -0400
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Mon Mar 28 13:56:13 2016 -0400

----------------------------------------------------------------------
 pylib/cqlshlib/copyutil.py | 98 +++++++++++++++++++++++++++++------------
 1 file changed, 69 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86029187/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/copyutil.py
index 1da5d14,0cae396..f03a1a3
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1496,10 -1529,10 +1536,10 @@@ class ExportProcess(ChildProcess)
          def result_callback(rows):
              if future.has_more_pages:
                  future.start_fetching_next_page()
 -                self.write_rows_to_csv(token_range, rows)
 +                self.write_rows_to_csv(token_range, rows, cql_types)
              else:
 -                self.write_rows_to_csv(token_range, rows)
 +                self.write_rows_to_csv(token_range, rows, cql_types)
-                 self.outmsg.send((None, None))
+                 self.send((None, None))
                  session.complete_request()
  
          def err_callback(err):
@@@ -1517,10 -1550,10 +1557,10 @@@
              writer = csv.writer(output, **self.options.dialect)
  
              for row in rows:
 -                writer.writerow(map(self.format_value, row))
 +                writer.writerow(map(self.format_value, row, cql_types))
  
              data = (output.getvalue(), len(rows))
-             self.outmsg.send((token_range, data))
+             self.send((token_range, data))
              output.close()
  
          except Exception, e:


Mime
View raw message