clqsh: COPY FROM throws TypeError with Cython extensions enabled patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11574
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/666bee61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/666bee61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/666bee61 Branch: refs/heads/trunk Commit: 666bee6125af04602a61d4781435598085a503d5 Parents: c8914c0 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Apr 21 17:33:53 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Apr 22 09:42:06 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/666bee61/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 73780de..2a93e9a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.15 + * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574) * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549) 2.1.14 http://git-wip-us.apache.org/repos/asf/cassandra/blob/666bee61/pylib/cqlshlib/copyutil.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py index b6e0cff..16bdf02 100644 --- a/pylib/cqlshlib/copyutil.py +++ b/pylib/cqlshlib/copyutil.py @@ -315,7 +315,7 @@ class CopyTask(object): copy_options['decimalsep'] = opts.pop('decimalsep', '.') copy_options['thousandssep'] = opts.pop('thousandssep', '') copy_options['boolstyle'] = [s.strip() for s in opts.pop('boolstyle', 'True, False').split(',')] - copy_options['numprocesses'] = int(opts.pop('numprocesses', self.get_num_processes(cap=16))) + copy_options['numprocesses'] = int(opts.pop('numprocesses', self.get_num_processes(16))) copy_options['begintoken'] = opts.pop('begintoken', '') copy_options['endtoken'] = opts.pop('endtoken', '') copy_options['maxrows'] = int(opts.pop('maxrows', '-1'))
